diff options
61 files changed, 2522 insertions, 2278 deletions
@@ -1,6 +1,19 @@ ChangeLog ========= +version 2.5.1 (2018-??-??) + +* OAuth2: Fix migration from BasicAuth when the server uses LDAP +* Linux: FolderWatcher: fix paths after dir renames (#6808) +* Mac: Do not select ownCloud in Finder after installation (#6781) +* Sync: always recurse within touched directory (#6804) +* Sync: Fixed crash when aborting sync of large files with older servers +* Sync: Don't error out if X-OC-MTime header is missing (#6797) +* Virtual Files: Renaming a virtual files also rename the file on the server (#6718) +* Virtual Files: Disable the 'choose what to sync' in the new folder wizard when virtual files are selected +* Windows Shell Integration: no limit on the amount of selected files (#6780) +* GUI: Plug a few leaks + version 2.5.0 (2018-09-18) * Local discovery: Speed up by skipping directories without changes reported by the file system watcher. * Experimental option to create virtual files (e.g. my_document.txt.owncloud) and download contents on demand ("placeholders") diff --git a/admin/osx/macdeployqt.py b/admin/osx/macdeployqt.py index 378afcc87..7294dc02a 100755 --- a/admin/osx/macdeployqt.py +++ b/admin/osx/macdeployqt.py @@ -24,6 +24,9 @@ import sys from glob import glob from distutils.version import LooseVersion +bundle_dir = sys.argv[1] +qmake_path = sys.argv[2] + def QueryQMake(attrib): return subprocess.check_output([qmake_path, '-query', attrib]).rstrip('\n') @@ -32,7 +35,9 @@ FRAMEWORK_SEARCH_PATH=[ os.path.join(os.environ['HOME'], 'Library/Frameworks') ] -LIBRARY_SEARCH_PATH=['/usr/local/lib', '.'] +LIBRARY_SEARCH_PATH=[ + '.' +] QT_PLUGINS = [ 'sqldrivers/libqsqlite.dylib', @@ -44,10 +49,12 @@ QT_PLUGINS = [ ] QT_PLUGINS_SEARCH_PATH=[ -# os.path.join(os.environ['QTDIR'], 'plugins'), - '/usr/local/Cellar/qt/5.2.1/plugins', ] +# Package libraries from these paths even if they are also a system library +SYSTEM_LIBRARY_BLACKLIST = [ + QueryQMake('QT_INSTALL_LIBS') +] class Error(Exception): pass @@ -78,8 +85,6 @@ if len(sys.argv) < 3: def is_exe(fpath): return os.path.isfile(fpath) and os.access(fpath, os.X_OK) -bundle_dir = sys.argv[1] -qmake_path = sys.argv[2] bundle_name = os.path.basename(bundle_dir).split('.')[0] @@ -198,7 +203,7 @@ def FixFramework(path): FixLibraryInstallPath(library, new_path) def FixLibrary(path): - if path in fixed_libraries or FindSystemLibrary(os.path.basename(path)) is not None: + if path in fixed_libraries or FindSystemLibrary(path) is not None: return else: fixed_libraries.append(path) @@ -235,6 +240,7 @@ def FixBinary(path): FixLibraryInstallPath(library, path) def CopyLibrary(path): + print "CopyLibrary:", path new_path = os.path.join(binary_dir, os.path.basename(path)) args = ['ditto', '--arch=x86_64', path, new_path] commands.append(args) @@ -243,6 +249,7 @@ def CopyLibrary(path): return new_path def CopyPlugin(path, subdir): + print "CopyPlugin:", path, subdir new_path = os.path.join(plugins_dir, subdir, os.path.basename(path)) args = ['mkdir', '-p', os.path.dirname(new_path)] commands.append(args) @@ -253,8 +260,8 @@ def CopyPlugin(path, subdir): return new_path def CopyFramework(source_dylib): - parts = source_dylib.split(os.sep) print "CopyFramework:", source_dylib + parts = source_dylib.split(os.sep) for i, part in enumerate(parts): matchObj = re.match(r'(\w+\.framework)', part) if matchObj: @@ -301,7 +308,12 @@ def FixInstallPath(library_path, library, new_path): args = ['install_name_tool', '-change', library_path, new_path, library] commands.append(args) -def FindSystemLibrary(library_name): +def FindSystemLibrary(library_path): + for item in SYSTEM_LIBRARY_BLACKLIST: + if os.path.realpath(library_path).startswith(os.path.realpath(item)): + return None + + library_name = os.path.basename(library_path) for path in ['/lib', '/usr/lib']: full_path = os.path.join(path, library_name) if os.path.exists(full_path): @@ -309,7 +321,7 @@ def FindSystemLibrary(library_name): return None def FixLibraryInstallPath(library_path, library): - system_library = FindSystemLibrary(os.path.basename(library_path)) + system_library = FindSystemLibrary(library_path) if system_library is None: new_path = '@executable_path/../MacOS/%s' % os.path.basename(library_path) FixInstallPath(library_path, library, new_path) diff --git a/admin/osx/post_install.sh.cmake b/admin/osx/post_install.sh.cmake index 0cbbee2ff..55d5e1c1d 100644 --- a/admin/osx/post_install.sh.cmake +++ b/admin/osx/post_install.sh.cmake @@ -1,17 +1,5 @@ #!/bin/sh -# Check if Finder is running (for systems with Finder disabled) -finder_status=`ps aux | grep "/System/Library/CoreServices/Finder.app/Contents/MacOS/Finder" | grep -v "grep"` -if ! [ "$finder_status" == "" ] ; then # Finder is running - osascript << EOF -tell application "Finder" - activate - select the last Finder window - reveal POSIX file "/Applications/@APPLICATION_EXECUTABLE@.app" -end tell -EOF -fi - # Always enable the new 10.10 finder plugin if available if [ -x "$(command -v pluginkit)" ]; then # add it to DB. This happens automatically too but we try to push it a bit harder for issue #3463 diff --git a/appveyor.ini b/appveyor.ini index 72d655966..b5dd4b232 100644 --- a/appveyor.ini +++ b/appveyor.ini @@ -42,6 +42,7 @@ ContinuousIntegration/Enabled = True # don't try to pip install on the ci python-modules.ignored = True binary/mysql.ignored = True +libs/llvm-meta.ignored = True libs/qt5.version = ${Variables:QtVersion} win32libs/openssl.version = ${Variables:OpenSslVersion} diff --git a/cmake/modules/FindSparkle.cmake b/cmake/modules/FindSparkle.cmake index 2c1e1944d..2b0c75b95 100644 --- a/cmake/modules/FindSparkle.cmake +++ b/cmake/modules/FindSparkle.cmake @@ -2,8 +2,7 @@ # # Once done this will define # SPARKLE_FOUND - system has Sparkle -# SPARKLE_INCLUDE_DIR - the Sparkle include directory -# SPARKLE_LIBRARY - The library needed to use Sparkle +# SPARKLE_LIBRARY - The framework needed to use Sparkle # Copyright (c) 2009, Vittorio Giovara <vittorio.giovara@gmail.com> # # Distributed under the OSI-approved BSD License (the "License"); @@ -15,9 +14,8 @@ include(FindPackageHandleStandardArgs) -find_path(SPARKLE_INCLUDE_DIR Sparkle.h) find_library(SPARKLE_LIBRARY NAMES Sparkle) -find_package_handle_standard_args(Sparkle DEFAULT_MSG SPARKLE_INCLUDE_DIR SPARKLE_LIBRARY) -mark_as_advanced(SPARKLE_INCLUDE_DIR SPARKLE_LIBRARY) +find_package_handle_standard_args(Sparkle DEFAULT_MSG SPARKLE_LIBRARY) +mark_as_advanced(SPARKLE_LIBRARY) diff --git a/mirall.desktop.in b/mirall.desktop.in index 4d2434e01..6376d888f 100644 --- a/mirall.desktop.in +++ b/mirall.desktop.in @@ -38,195 +38,6 @@ MimeType=application/vnd.@APPLICATION_EXECUTABLE@; # Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations - - -# Translations Comment[oc]=@APPLICATION_NAME@ sincronizacion del client Icon[oc]=@APPLICATION_EXECUTABLE@ Name[oc]=@APPLICATION_NAME@ sincronizacion del client diff --git a/src/csync/csync_update.cpp b/src/csync/csync_update.cpp index 706d3ae2a..df17ca63c 100644 --- a/src/csync/csync_update.cpp +++ b/src/csync/csync_update.cpp @@ -38,6 +38,7 @@ #include "csync_update.h" #include "csync_util.h" #include "csync_misc.h" +#include "common/utility.h" #include "vio/csync_vio.h" @@ -147,9 +148,10 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f } auto localCodec = QTextCodec::codecForLocale(); - if (ctx->current == REMOTE_REPLICA && localCodec->mibEnum() != 106) { + if (!OCC::Utility::isWindows() && ctx->current == REMOTE_REPLICA && localCodec->mibEnum() != 106) { /* If the locale codec is not UTF-8, we must check that the filename from the server can * be encoded in the local file system. + * (Note: on windows, the FS is always UTF-16, so we don't need to check) * * We cannot use QTextCodec::canEncode() since that can incorrectly return true, see * https://bugreports.qt.io/browse/QTBUG-6925. diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 3648981e3..3bda87951 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -137,9 +137,16 @@ IF( APPLE ) list(APPEND client_SRCS systray.mm) if(SPARKLE_FOUND) - # Define this, we need to check in updater.cpp - add_definitions( -DHAVE_SPARKLE ) - list(APPEND updater_SRCS updater/sparkleupdater_mac.mm updater/sparkleupdater.h) + # Define this, we need to check in updater.cpp + add_definitions(-DHAVE_SPARKLE) + list(APPEND updater_SRCS updater/sparkleupdater_mac.mm updater/sparkleupdater.h) + list(APPEND updater_DEPS ${SPARKLE_LIBRARY}) + + # Sparkle.framework is installed from here because macdeployqt's CopyFramework breaks on this bundle + # as its logic is tightly tailored around Qt5 frameworks + install(DIRECTORY "${SPARKLE_LIBRARY}" + DESTINATION "${OWNCLOUD_OSX_BUNDLE}/Contents/Frameworks" USE_SOURCE_PERMISSIONS) + endif() ENDIF() @@ -268,7 +275,7 @@ else() endif() add_library(updater STATIC ${updater_SRCS}) -target_link_libraries(updater ${synclib_NAME} Qt5::Widgets Qt5::Network Qt5::Xml) +target_link_libraries(updater ${synclib_NAME} ${updater_DEPS} Qt5::Widgets Qt5::Network Qt5::Xml) target_include_directories(updater PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp index 1933d794c..ed51c7855 100644 --- a/src/gui/accountmanager.cpp +++ b/src/gui/accountmanager.cpp @@ -29,6 +29,7 @@ static const char urlC[] = "url"; static const char authTypeC[] = "authType"; static const char userC[] = "user"; static const char httpUserC[] = "http_user"; +static const char davUserC[] = "dav_user"; static const char caCertsKeyC[] = "CaCertificates"; static const char accountsC[] = "Accounts"; static const char versionC[] = "version"; @@ -212,6 +213,7 @@ void AccountManager::saveAccountHelper(Account *acc, QSettings &settings, bool s { settings.setValue(QLatin1String(versionC), maxAccountVersion); settings.setValue(QLatin1String(urlC), acc->_url.toString()); + settings.setValue(QLatin1String(davUserC), acc->_davUser); settings.setValue(QLatin1String(serverVersionC), acc->_serverVersion); if (acc->_credentials) { if (saveCredentials) { @@ -290,6 +292,7 @@ AccountPtr AccountManager::loadAccountHelper(QSettings &settings) qCInfo(lcAccountManager) << "Account for" << acc->url() << "using auth type" << authType; acc->_serverVersion = settings.value(QLatin1String(serverVersionC)).toString(); + acc->_davUser = settings.value(QLatin1String(davUserC)).toString(); // We want to only restore settings for that auth type and the user value acc->_settingsMap.insert(QLatin1String(userC), settings.value(userC)); diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index 6bee0c935..14bd7a7d1 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -33,6 +33,7 @@ #include "creds/httpcredentialsgui.h" #include "tooltipupdater.h" #include "filesystem.h" +#include "wizard/owncloudwizard.h" #include <math.h> @@ -306,7 +307,7 @@ void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos) if (!folderPaused) { ac = menu->addAction(tr("Force sync now")); - if (folderMan->currentSyncFolder() == folderMan->folder(alias)) { + if (folderMan->currentSyncFolder() == folder) { ac->setText(tr("Restart sync")); } ac->setEnabled(folderConnected); @@ -318,6 +319,39 @@ void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos) ac = menu->addAction(tr("Remove folder sync connection")); connect(ac, &QAction::triggered, this, &AccountSettings::slotRemoveCurrentFolder); + + if (Theme::instance()->showVirtualFilesOption() || folder->useVirtualFiles()) { + ac = menu->addAction(tr("Create virtual files for new files (Experimental)")); + ac->setCheckable(true); + ac->setChecked(folder->useVirtualFiles()); + connect(ac, &QAction::toggled, this, [folder, this](bool checked) { + if (!checked) { + if (folder) + folder->setUseVirtualFiles(false); + // Make sure the size is recomputed as the virtual file indicator changes + ui->_folderList->doItemsLayout(); + return; + } + OwncloudWizard::askExperimentalVirtualFilesFeature([folder, this](bool enable) { + if (enable && folder) + folder->setUseVirtualFiles(enable); + + // Also wipe selective sync settings + bool ok = false; + auto oldBlacklist = folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, &ok); + folder->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, {}); + for (const auto &entry : oldBlacklist) { + folder->journalDb()->avoidReadFromDbOnNextSync(entry); + } + FolderMan::instance()->scheduleFolder(folder); + + // Make sure the size is recomputed as the virtual file indicator changes + ui->_folderList->doItemsLayout(); + }); + }); + } + + menu->popup(tv->mapToGlobal(pos)); } diff --git a/src/gui/creds/httpcredentialsgui.cpp b/src/gui/creds/httpcredentialsgui.cpp index 3c25c886a..f6f2a9f53 100644 --- a/src/gui/creds/httpcredentialsgui.cpp +++ b/src/gui/creds/httpcredentialsgui.cpp @@ -48,7 +48,7 @@ void HttpCredentialsGui::askFromUserAsync() QObject::connect(job, &DetermineAuthTypeJob::authType, this, [this](DetermineAuthTypeJob::AuthType type) { if (type == DetermineAuthTypeJob::OAuth) { _asyncAuth.reset(new OAuth(_account, this)); - _asyncAuth->_expectedUser = _user; + _asyncAuth->_expectedUser = _account->davUser(); connect(_asyncAuth.data(), &OAuth::result, this, &HttpCredentialsGui::asyncAuthResult); connect(_asyncAuth.data(), &OAuth::destroyed, diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp index 178285957..f13de9b44 100644 --- a/src/gui/folder.cpp +++ b/src/gui/folder.cpp @@ -534,6 +534,13 @@ void Folder::downloadVirtualFile(const QString &_relativepath) slotScheduleThisFolder(); } + +void Folder::setUseVirtualFiles(bool enabled) +{ + _definition.useVirtualFiles = enabled; + saveToSettings(); +} + void Folder::saveToSettings() const { // Remove first to make sure we don't get duplicates diff --git a/src/gui/folder.h b/src/gui/folder.h index 892165e10..1ea815feb 100644 --- a/src/gui/folder.h +++ b/src/gui/folder.h @@ -244,6 +244,7 @@ public: /** new files are downloaded as virtual files */ bool useVirtualFiles() { return _definition.useVirtualFiles; } + void setUseVirtualFiles(bool enabled); signals: void syncStateChange(); diff --git a/src/gui/folderstatusdelegate.cpp b/src/gui/folderstatusdelegate.cpp index 68aac0cd4..59ccc6ee4 100644 --- a/src/gui/folderstatusdelegate.cpp +++ b/src/gui/folderstatusdelegate.cpp @@ -264,6 +264,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem & rect.setHeight(texts.count() * subFm.height() + 2 * margin); rect.setRight(option.rect.right() - margin); + painter->save(); painter->setBrush(color); painter->setPen(QColor(0xaa, 0xaa, 0xaa)); painter->drawRoundedRect(QStyle::visualRect(option.direction, option.rect, rect), @@ -280,6 +281,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem & subFm.elidedText(eText, Qt::ElideLeft, textRect.width())); textRect.translate(0, textRect.height()); } + painter->restore(); h = rect.bottom() + margin; }; diff --git a/src/gui/folderwatcher_linux.cpp b/src/gui/folderwatcher_linux.cpp index 5f6d580b1..d2fdb7d8d 100644 --- a/src/gui/folderwatcher_linux.cpp +++ b/src/gui/folderwatcher_linux.cpp @@ -31,6 +31,11 @@ FolderWatcherPrivate::FolderWatcherPrivate(FolderWatcher *p, const QString &path , _parent(p) , _folder(path) { + _wipePotentialRenamesSoon = new QTimer(this); + _wipePotentialRenamesSoon->setInterval(1000); + _wipePotentialRenamesSoon->setSingleShot(true); + connect(_wipePotentialRenamesSoon, &QTimer::timeout, this, &FolderWatcherPrivate::wipePotentialRenames); + _fd = inotify_init(); if (_fd != -1) { _socket.reset(new QSocketNotifier(_fd, QSocketNotifier::Read)); @@ -91,6 +96,17 @@ void FolderWatcherPrivate::inotifyRegisterPath(const QString &path) } } +void FolderWatcherPrivate::applyDirectoryRename(const FolderWatcherPrivate::Rename &rename) +{ + QString fromSlash = rename.from + "/"; + qCInfo(lcFolderWatcher) << "Applying rename from" << rename.from << "to" << rename.to; + for (auto &watch : _watches) { + if (watch == rename.from || watch.startsWith(fromSlash)) { + watch = rename.to + watch.mid(rename.from.size()); + } + } +} + void FolderWatcherPrivate::slotAddFolderRecursive(const QString &path) { int subdirs = 0; @@ -126,6 +142,11 @@ void FolderWatcherPrivate::slotAddFolderRecursive(const QString &path) } } +void FolderWatcherPrivate::wipePotentialRenames() +{ + _potentialRenames.clear(); +} + void FolderWatcherPrivate::slotReceivedNotification(int fd) { int len; @@ -154,33 +175,44 @@ void FolderWatcherPrivate::slotReceivedNotification(int fd) } } while (false); - // reset counter - i = 0; - // while there are enough events in the buffer - while (i + sizeof(struct inotify_event) < static_cast<unsigned int>(len)) { + // iterate events in buffer + unsigned int ulen = len; + for (i = 0; i + sizeof(inotify_event) < ulen; i += sizeof(inotify_event) + (event ? event->len : 0)) { // cast an inotify_event event = (struct inotify_event *)&buffer[i]; if (event == NULL) { qCDebug(lcFolderWatcher) << "NULL event"; - i += sizeof(struct inotify_event); continue; } // Fire event for the path that was changed. - if (event->len > 0 && event->wd > -1) { - QByteArray fileName(event->name); - if (fileName.startsWith("._sync_") - || fileName.startsWith(".csync_journal.db") - || fileName.startsWith(".owncloudsync.log") - || fileName.startsWith(".sync_")) { + if (event->len == 0 || event->wd <= -1) + continue; + QByteArray fileName(event->name); + if (fileName.startsWith("._sync_") + || fileName.startsWith(".csync_journal.db") + || fileName.startsWith(".owncloudsync.log") + || fileName.startsWith(".sync_")) { + continue; + } + const QString p = _watches[event->wd] + '/' + fileName; + _parent->changeDetected(p); + + // Collect events to form complete renames where possible + // and apply directory renames to the cached paths. + if ((event->mask & (IN_MOVED_TO | IN_MOVED_FROM)) && (event->mask & IN_ISDIR) && event->cookie > 0) { + auto &rename = _potentialRenames[event->cookie]; + if (event->mask & IN_MOVED_TO) + rename.to = p; + if (event->mask & IN_MOVED_FROM) + rename.from = p; + if (!rename.from.isEmpty() && !rename.to.isEmpty()) { + applyDirectoryRename(rename); + _potentialRenames.remove(event->cookie); } else { - const QString p = _watches[event->wd] + '/' + fileName; - _parent->changeDetected(p); + _wipePotentialRenamesSoon->start(); } } - - // increment counter - i += sizeof(struct inotify_event) + event->len; } } diff --git a/src/gui/folderwatcher_linux.h b/src/gui/folderwatcher_linux.h index 24d337777..e9361eb42 100644 --- a/src/gui/folderwatcher_linux.h +++ b/src/gui/folderwatcher_linux.h @@ -23,6 +23,8 @@ #include "folderwatcher.h" +class QTimer; + namespace OCC { /** @@ -44,10 +46,22 @@ protected slots: void slotReceivedNotification(int fd); void slotAddFolderRecursive(const QString &path); + /// Remove all half-built renames. Called by timer when idle for a bit. + void wipePotentialRenames(); + protected: + struct Rename + { + QString from; + QString to; + }; + bool findFoldersBelow(const QDir &dir, QStringList &fullList); void inotifyRegisterPath(const QString &path); + /// Adjusts the paths in _watches when directories are renamed. + void applyDirectoryRename(const Rename &rename); + private: FolderWatcher *_parent; @@ -55,6 +69,25 @@ private: QHash<int, QString> _watches; QScopedPointer<QSocketNotifier> _socket; int _fd; + + /** Maps inotify event cookie to rename data. + * + * For moves two independent inotify events will be seen and they + * can be matched via the event cookie. This field stores partial + * information as it is received. When both sides have arrived, + * directory moves can be processed with applyDirectoryRename(). + * + * If we don't receive both sides (if something moves away from + * the watched folder tree, or into it from an unwatched location) + * the _wipePotentialRenamesSoon will eventually discard the + * incomplete data. + * + * These events can even be emitted by different watches if the + * directory parent folder changed. + */ + QHash<quint32, Rename> _potentialRenames; + + QTimer *_wipePotentialRenamesSoon; }; } diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt index 3369596d1..b78a66e33 100644 --- a/src/libsync/CMakeLists.txt +++ b/src/libsync/CMakeLists.txt @@ -16,10 +16,6 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|OpenBSD") ) ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|OpenBSD") -if(SPARKLE_FOUND AND NOT BUILD_LIBRARIES_ONLY) - list (APPEND OS_SPECIFIC_LINK_LIBRARIES ${SPARKLE_LIBRARY}) -endif() - set(libsync_SRCS account.cpp bandwidthmanager.cpp @@ -167,10 +163,6 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE) ) else() install(TARGETS ${synclib_NAME} DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS) - if (SPARKLE_FOUND) - install(DIRECTORY "${SPARKLE_LIBRARY}" - DESTINATION "${OWNCLOUD_OSX_BUNDLE}/Contents/Frameworks" USE_SOURCE_PERMISSIONS) - endif (SPARKLE_FOUND) endif() diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp index 809a0820d..426b488cb 100644 --- a/src/libsync/account.cpp +++ b/src/libsync/account.cpp @@ -90,7 +90,10 @@ QString Account::davUser() const void Account::setDavUser(const QString &newDavUser) { + if (_davUser == newDavUser) + return; _davUser = newDavUser; + emit wantsAccountSaved(this); } #ifndef TOKEN_AUTH_ONLY diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp index c2d5c387d..a8b260515 100644 --- a/src/libsync/propagateupload.cpp +++ b/src/libsync/propagateupload.cpp @@ -564,6 +564,8 @@ void PropagateUploadFileCommon::slotJobDestroyed(QObject *job) // This function is used whenever there is an error occuring and jobs might be in progress void PropagateUploadFileCommon::abortWithError(SyncFileItem::Status status, const QString &error) { + if (_aborting) + return; abort(AbortType::Synchronous); done(status, error); } @@ -636,6 +638,10 @@ void PropagateUploadFileCommon::abortNetworkJobs( PropagatorJob::AbortType abortType, const std::function<bool(AbstractNetworkJob *)> &mayAbortJob) { + if (_aborting) + return; + _aborting = true; + // Count the number of jobs that need aborting, and emit the overall // abort signal when they're all done. QSharedPointer<int> runningCount(new int(0)); diff --git a/src/libsync/propagateupload.h b/src/libsync/propagateupload.h index 2985be930..15da30db9 100644 --- a/src/libsync/propagateupload.h +++ b/src/libsync/propagateupload.h @@ -209,6 +209,14 @@ protected: QVector<AbstractNetworkJob *> _jobs; /// network jobs that are currently in transit bool _finished BITFIELD(1); /// Tells that all the jobs have been finished bool _deleteExisting BITFIELD(1); + + /** Whether an abort is currently ongoing. + * + * Important to avoid duplicate aborts since each finishing PUTFileJob might + * trigger an abort on error. + */ + bool _aborting BITFIELD(1); + QByteArray _transmissionChecksumHeader; public: @@ -216,6 +224,7 @@ public: : PropagateItemJob(propagator, item) , _finished(false) , _deleteExisting(false) + , _aborting(false) { } diff --git a/src/libsync/propagateuploadv1.cpp b/src/libsync/propagateuploadv1.cpp index d3d1dbaf1..696f21fa6 100644 --- a/src/libsync/propagateuploadv1.cpp +++ b/src/libsync/propagateuploadv1.cpp @@ -310,8 +310,6 @@ void PropagateUploadFileV1::slotPutFinished() // Normally Owncloud 6 always puts X-OC-MTime qCWarning(lcPropagateUpload) << "Server does not support X-OC-MTime" << job->reply()->rawHeader("X-OC-MTime"); // Well, the mtime was not set - done(SyncFileItem::SoftError, "Server does not support X-OC-MTime"); - return; } finalize(); diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp index df1c464c1..704fe5b41 100644 --- a/src/libsync/syncengine.cpp +++ b/src/libsync/syncengine.cpp @@ -1650,6 +1650,22 @@ void SyncEngine::setLocalDiscoveryOptions(LocalDiscoveryStyle style, std::set<QB { _localDiscoveryStyle = style; _localDiscoveryPaths = std::move(paths); + + // Normalize to make sure that no path is a contained in another. + // Note: for simplicity, this code consider anything less than '/' as a path separator, so for + // example, this will remove "foo.bar" if "foo" is in the list. This will mean we might have + // some false positive, but that's Ok. + // This invariant is used in SyncEngine::shouldDiscoverLocally + QByteArray prev; + auto it = _localDiscoveryPaths.begin(); + while(it != _localDiscoveryPaths.end()) { + if (!prev.isNull() && it->startsWith(prev) && (prev.endsWith('/') || *it == prev || it->at(prev.size()) <= '/')) { + it = _localDiscoveryPaths.erase(it); + } else { + prev = *it; + ++it; + } + } } bool SyncEngine::shouldDiscoverLocally(const QByteArray &path) const @@ -1657,14 +1673,28 @@ bool SyncEngine::shouldDiscoverLocally(const QByteArray &path) const if (_localDiscoveryStyle == LocalDiscoveryStyle::FilesystemOnly) return true; + // The intention is that if "A/X" is in _localDiscoveryPaths: + // - parent folders like "/", "A" will be discovered (to make sure the discovery reaches the + // point where something new happened) + // - the folder itself "A/X" will be discovered + // - subfolders like "A/X/Y" will be discovered (so data inside a new or renamed folder will be + // discovered in full) + // Check out TestLocalDiscovery::testLocalDiscoveryDecision() + auto it = _localDiscoveryPaths.lower_bound(path); - if (it == _localDiscoveryPaths.end() || !it->startsWith(path)) + if (it == _localDiscoveryPaths.end() || !it->startsWith(path)) { + // Maybe a subfolder of something in the list? + if (it != _localDiscoveryPaths.begin() && path.startsWith(*(--it))) { + return it->endsWith('/') || (path.size() > it->size() && path.at(it->size()) <= '/'); + } return false; + } // maybe an exact match or an empty path? if (it->size() == path.size() || path.isEmpty()) return true; + // Maybe a parent folder of something in the list? // check for a prefix + / match forever { if (it->size() > path.size() && it->at(path.size()) == '/') diff --git a/test/csync/csync_tests/check_csync_update.cpp b/test/csync/csync_tests/check_csync_update.cpp index b4eca074d..df571cbf9 100644 --- a/test/csync/csync_tests/check_csync_update.cpp +++ b/test/csync/csync_tests/check_csync_update.cpp @@ -127,7 +127,6 @@ static int setup_ftw(void **state) assert_int_equal(rc, 0); rc = system("mkdir -p /tmp/check_csync1"); assert_int_equal(rc, 0); - csync = new CSYNC("/tmp", new OCC::SyncJournalDb(TESTDB)); sqlite3 *db = NULL; rc = sqlite3_open_v2(TESTDB, &db, SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE, NULL); diff --git a/test/csync/vio_tests/check_vio_ext.cpp b/test/csync/vio_tests/check_vio_ext.cpp index f0e772956..731a0906f 100644 --- a/test/csync/vio_tests/check_vio_ext.cpp +++ b/test/csync/vio_tests/check_vio_ext.cpp @@ -134,7 +134,8 @@ static int teardown(void **state) { rc = wipe_testdir(); assert_int_equal(rc, 0); - *state = NULL; + SAFE_FREE(((statevar*)*state)->result); + SAFE_FREE(*state); return 0; } @@ -419,6 +420,8 @@ static void check_readdir_longtree(void **state) assert_int_equal(files_cnt, 0); /* and compare. */ assert_string_equal( sv->result, result); + + SAFE_FREE(result); } // https://github.com/owncloud/client/issues/3128 https://github.com/owncloud/client/issues/2777 diff --git a/test/stub.cpp b/test/stub.cpp index d987b2412..700484196 100644 --- a/test/stub.cpp +++ b/test/stub.cpp @@ -1,6 +1,6 @@ // stub to prevent linker error #include "accountmanager.h" -OCC::AccountManager *OCC::AccountManager::instance() { return static_cast<AccountManager *>(new QObject); } +OCC::AccountManager *OCC::AccountManager::instance() { static QObject dummy; return reinterpret_cast<AccountManager *>(&dummy); } void OCC::AccountManager::saveAccountState(AccountState *) { } void OCC::AccountManager::save(bool saveCredentials) { Q_UNUSED(saveCredentials); } void OCC::AccountManager::accountRemoved(OCC::AccountState*) { } diff --git a/test/syncenginetestutils.h b/test/syncenginetestutils.h index 8edbb141f..fbd0a2158 100644 --- a/test/syncenginetestutils.h +++ b/test/syncenginetestutils.h @@ -948,7 +948,7 @@ public: QMetaObject::invokeMethod(this, "respond", Qt::QueuedConnection); } - Q_INVOKABLE void respond() { + Q_INVOKABLE virtual void respond() { setAttribute(QNetworkRequest::HttpStatusCodeAttribute, _httpErrorCode); setError(InternalServerError, "Internal Server Fake Error"); emit metaDataChanged(); @@ -1130,6 +1130,7 @@ public: _account->setUrl(QUrl(QStringLiteral("http://admin:admin@localhost/owncloud"))); _account->setCredentials(new FakeCredentials{_fakeQnam}); _account->setDavDisplayName("fakename"); + _account->setServerVersion("10.0.0"); _journalDb.reset(new OCC::SyncJournalDb(localPath() + "._sync_test.db")); _syncEngine.reset(new OCC::SyncEngine(_account, localPath(), "", _journalDb.get())); diff --git a/test/testchunkingng.cpp b/test/testchunkingng.cpp index 1e9e5e809..bd605ff61 100644 --- a/test/testchunkingng.cpp +++ b/test/testchunkingng.cpp @@ -246,15 +246,15 @@ private slots: setChunkSize(fakeFolder.syncEngine(), 1 * 1000 * 1000); // Make the MOVE never reply, but trigger a client-abort and apply the change remotely - auto parent = new QObject; + QObject parent; QByteArray moveChecksumHeader; int nGET = 0; int responseDelay = 100000; // bigger than abort-wait timeout fakeFolder.setServerOverride([&](QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *) -> QNetworkReply * { if (request.attribute(QNetworkRequest::CustomVerbAttribute) == "MOVE") { - QTimer::singleShot(50, parent, [&]() { fakeFolder.syncEngine().abort(); }); + QTimer::singleShot(50, &parent, [&]() { fakeFolder.syncEngine().abort(); }); moveChecksumHeader = request.rawHeader("OC-Checksum"); - return new DelayedReply<FakeChunkMoveReply>(responseDelay, fakeFolder.uploadState(), fakeFolder.remoteModifier(), op, request, parent); + return new DelayedReply<FakeChunkMoveReply>(responseDelay, fakeFolder.uploadState(), fakeFolder.remoteModifier(), op, request, &parent); } else if (op == QNetworkAccessManager::GetOperation) { nGET++; } @@ -330,12 +330,12 @@ private slots: setChunkSize(fakeFolder.syncEngine(), 1 * 1000 * 1000); // Make the MOVE never reply, but trigger a client-abort and apply the change remotely - auto parent = new QObject; + QObject parent; int responseDelay = 200; // smaller than abort-wait timeout fakeFolder.setServerOverride([&](QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *) -> QNetworkReply * { if (request.attribute(QNetworkRequest::CustomVerbAttribute) == "MOVE") { - QTimer::singleShot(50, parent, [&]() { fakeFolder.syncEngine().abort(); }); - return new DelayedReply<FakeChunkMoveReply>(responseDelay, fakeFolder.uploadState(), fakeFolder.remoteModifier(), op, request, parent); + QTimer::singleShot(50, &parent, [&]() { fakeFolder.syncEngine().abort(); }); + return new DelayedReply<FakeChunkMoveReply>(responseDelay, fakeFolder.uploadState(), fakeFolder.remoteModifier(), op, request, &parent); } return nullptr; }); diff --git a/test/testfolderwatcher.cpp b/test/testfolderwatcher.cpp index d90856828..66236c412 100644 --- a/test/testfolderwatcher.cpp +++ b/test/testfolderwatcher.cpp @@ -182,6 +182,48 @@ private slots: QVERIFY(waitForPathChanged(old_file)); QVERIFY(waitForPathChanged(new_file)); } + + void testRenameDirectorySameBase() { + QString old_file(_rootPath+"/a1/b1"); + QString new_file(_rootPath+"/a1/brename"); + QVERIFY(QFile::exists(old_file)); + mv(old_file, new_file); + QVERIFY(QFile::exists(new_file)); + + QVERIFY(waitForPathChanged(old_file)); + QVERIFY(waitForPathChanged(new_file)); + + // Verify that further notifications end up with the correct paths + + QString file(_rootPath+"/a1/brename/c1/random.bin"); + touch(file); + QVERIFY(waitForPathChanged(file)); + + QString dir(_rootPath+"/a1/brename/newfolder"); + mkdir(dir); + QVERIFY(waitForPathChanged(dir)); + } + + void testRenameDirectoryDifferentBase() { + QString old_file(_rootPath+"/a1/brename"); + QString new_file(_rootPath+"/bren"); + QVERIFY(QFile::exists(old_file)); + mv(old_file, new_file); + QVERIFY(QFile::exists(new_file)); + + QVERIFY(waitForPathChanged(old_file)); + QVERIFY(waitForPathChanged(new_file)); + + // Verify that further notifications end up with the correct paths + + QString file(_rootPath+"/bren/c1/random.bin"); + touch(file); + QVERIFY(waitForPathChanged(file)); + + QString dir(_rootPath+"/bren/newfolder2"); + mkdir(dir); + QVERIFY(waitForPathChanged(dir)); + } }; #ifdef Q_OS_MAC diff --git a/test/testlocaldiscovery.cpp b/test/testlocaldiscovery.cpp index 03754af51..8a554c0c9 100644 --- a/test/testlocaldiscovery.cpp +++ b/test/testlocaldiscovery.cpp @@ -76,7 +76,7 @@ private slots: fakeFolder.syncEngine().setLocalDiscoveryOptions( LocalDiscoveryStyle::DatabaseAndFilesystem, - { "A/X", "foo bar space/touch", "foo/", "zzz" }); + { "A/X", "A/X space", "A/X/beta", "foo bar space/touch", "foo/", "zzz", "zzzz" }); QVERIFY(engine.shouldDiscoverLocally("")); QVERIFY(engine.shouldDiscoverLocally("A")); @@ -84,11 +84,23 @@ private slots: QVERIFY(!engine.shouldDiscoverLocally("B")); QVERIFY(!engine.shouldDiscoverLocally("A B")); QVERIFY(!engine.shouldDiscoverLocally("B/X")); - QVERIFY(!engine.shouldDiscoverLocally("A/X/Y")); QVERIFY(engine.shouldDiscoverLocally("foo bar space")); QVERIFY(engine.shouldDiscoverLocally("foo")); QVERIFY(!engine.shouldDiscoverLocally("foo bar")); QVERIFY(!engine.shouldDiscoverLocally("foo bar/touch")); + // These are within "A/X" so they should be discovered + QVERIFY(engine.shouldDiscoverLocally("A/X/alpha")); + QVERIFY(engine.shouldDiscoverLocally("A/X beta")); + QVERIFY(engine.shouldDiscoverLocally("A/X/Y")); + QVERIFY(engine.shouldDiscoverLocally("A/X space")); + QVERIFY(engine.shouldDiscoverLocally("A/X space/alpha")); + QVERIFY(!engine.shouldDiscoverLocally("A/Xylo/foo")); + QVERIFY(engine.shouldDiscoverLocally("zzzz/hello")); + QVERIFY(!engine.shouldDiscoverLocally("zzza/hello")); + + QEXPECT_FAIL("", "There is a possibility of false positives if the set contains a path " + "which is a prefix, and that prefix is followed by a character less than '/'", Continue); + QVERIFY(!engine.shouldDiscoverLocally("A/X o")); fakeFolder.syncEngine().setLocalDiscoveryOptions( LocalDiscoveryStyle::DatabaseAndFilesystem, @@ -149,6 +161,29 @@ private slots: QVERIFY(fakeFolder.currentRemoteState().find("A/a4")); QVERIFY(tracker.localDiscoveryPaths().empty()); } + + void testDirectoryAndSubDirectory() + { + FakeFolder fakeFolder{ FileInfo::A12_B12_C12_S12() }; + + fakeFolder.localModifier().mkdir("A/newDir"); + fakeFolder.localModifier().mkdir("A/newDir/subDir"); + fakeFolder.localModifier().insert("A/newDir/subDir/file", 10); + + auto expectedState = fakeFolder.currentLocalState(); + + // Only "A" was modified according to the file system tracker + fakeFolder.syncEngine().setLocalDiscoveryOptions( + LocalDiscoveryStyle::DatabaseAndFilesystem, + { "A" }); + + QVERIFY(fakeFolder.syncOnce()); + + QCOMPARE(fakeFolder.currentLocalState(), expectedState); + QCOMPARE(fakeFolder.currentRemoteState(), expectedState); + } + + }; QTEST_GUILESS_MAIN(TestLocalDiscovery) diff --git a/test/testsyncengine.cpp b/test/testsyncengine.cpp index 5628befdc..65321bfed 100644 --- a/test/testsyncengine.cpp +++ b/test/testsyncengine.cpp @@ -439,13 +439,13 @@ private slots: // Produce an error based on upload size int remoteQuota = 1000; int n507 = 0, nPUT = 0; - auto parent = new QObject; + QObject parent; fakeFolder.setServerOverride([&](QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *) -> QNetworkReply * { if (op == QNetworkAccessManager::PutOperation) { nPUT++; if (request.rawHeader("OC-Total-Length").toInt() > remoteQuota) { n507++; - return new FakeErrorReply(op, request, parent, 507); + return new FakeErrorReply(op, request, &parent, 507); } } return nullptr; @@ -649,6 +649,33 @@ private slots: QTextCodec::setCodecForLocale(utf8Locale); #endif } + + // Aborting has had bugs when there are parallel upload jobs + void testUploadV1Multiabort() + { + FakeFolder fakeFolder{ FileInfo{} }; + SyncOptions options; + options._initialChunkSize = 10; + options._maxChunkSize = 10; + options._minChunkSize = 10; + fakeFolder.syncEngine().setSyncOptions(options); + + QObject parent; + int nPUT = 0; + fakeFolder.setServerOverride([&](QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *) -> QNetworkReply * { + if (op == QNetworkAccessManager::PutOperation) { + ++nPUT; + return new FakeHangingReply(op, request, &parent); + } + return nullptr; + }); + + fakeFolder.localModifier().insert("file", 100, 'W'); + QTimer::singleShot(100, &fakeFolder.syncEngine(), [&]() { fakeFolder.syncEngine().abort(); }); + QVERIFY(!fakeFolder.syncOnce()); + + QCOMPARE(nPUT, 3); + } }; QTEST_GUILESS_MAIN(TestSyncEngine) diff --git a/translations/client_ca.ts b/translations/client_ca.ts index fa83e5acf..2aca17902 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Cancel·la</translation> </message> @@ -165,204 +165,209 @@ <translation>Connectat amb <server> com a <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>No hi ha cap compte configurat</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Afegeix-ne un de nou</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Elimina</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Compte</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Trieu què sincronitzar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Força la sincronització ara</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Reinicia la sincronització</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Elimina la connexió de la carpeta sincronitzada</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Ha fallat la creació de la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>No s'ha pogut crear la carpeta local <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirma l'eliminació de la connexió de la carpeta sincronitzada</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Elimina la connexió de la carpeta sincronitzada</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>S'està sincronitzant</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>S'està sincronitzant.<br/>Voleu parar-la?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 en ús</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 com a <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Connectat a %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>El servidor %1 no està disponible temporalment</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>S'ha desconnectat de %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>No hi ha connexió amb %1 a %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Inici de sessió</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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 externes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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 externes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Confirmeu l'eliminació del compte</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>Segur que voleu eliminar la connexió al compte <i>%1</i>?</p><p><b>Nota:</b> això <b>no</b> esborrarà cap fitxer.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Elimina la connexió</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Obre la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Surt</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Continua la sincronització</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Pausa la sincronització</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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 aturar la sincronització de la carpeta <i>%1</i>?</p><p><b>Nota:</b> això <b>no</b> esborrarà cap fitxer.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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 les carpetes muntades a través de xarxa o les compartides, poden tenir límits diferents.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%1 de %2 en ús</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <source>Currently there is no storage usage information available.</source> <translation>Actualment no hi ha informació disponible de l'ús d'emmagatzemament.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>La connexió %1 no està configurada.</translation> </message> @@ -793,41 +798,41 @@ Consulteu el registre per obtenir més informació.</numerusform></translation> <translation>Activitat de sincronització</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <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="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>S'ha afegit una carpeta de més de %1 MB: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <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="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -836,7 +841,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -844,46 +849,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Esborra tots els fitxers?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Esborra tots els fitxers</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Mantén els fitxers</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Copia de seguretat detectada</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Sincronització normal</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>Manté els fitxers locals com a conflicte</translation> </message> @@ -1004,7 +1009,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>S'està sincronitzant amb les carpetes locals</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Fitxer</translation> </message> @@ -1162,7 +1167,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2485,7 +2490,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Error en escriure les metadades a la base de dades</translation> </message> @@ -3427,12 +3432,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> diff --git a/translations/client_cs.ts b/translations/client_cs.ts index 65dd8b3e6..a67bf92f0 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Zrušit</translation> </message> @@ -165,204 +165,209 @@ <translation>Připojen k <server> jako <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Žádný účet nenastaven.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Přidat nový</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Odebrat</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Účet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Vybrat co sesynchronizovat</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Vynutit synchronizaci nyní</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Restartovat synchronizaci</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Odstranit připojení synchronizace adresáře</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Vytvoření adresáře selhalo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Nelze vytvořit místní adresář <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Potvrdit odstranění připojení synchronizace adresáře</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Odstranit připojení synchronizace adresáře</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Synchronizace probíhá</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Operace synchronizace právě probíhá.<br/>Přejete si ji ukončit?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 používaný</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 jako <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Připojeno k %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 je dočasně nedostupný.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>server %1 je v režimu údržby.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>Odhlášeno z %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>Připojeno k %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>Bez připojení k %1 na %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Přihlásit</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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ází na externím úložišti:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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ází na externím úložišti:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Potvrdit odstranění účtu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>Opravdu chcete odstranit připojení k účtu <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="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Odstranit připojení</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Otevřít adresář</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Odhlásit se</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Pokračovat v synchronizaci</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Pozastavit synchronizaci</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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 adresáře <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>Používaných %1 (%3%) z %2. Některé adresáře včetně připojených síťových nebo sdílených adresářů mohou mít odlišné limity.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>Používaných %1 z %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <source>Currently there is no storage usage information available.</source> <translation>Momentálně nejsou k dispozici žádné informace o využití úložiště.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>Žádné spojení s %1 nenastaveno.</translation> </message> @@ -791,40 +796,40 @@ <translation>Průběh synchronizace</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <source>Could not read system exclude file</source> <translation>Nezdařilo se přečtení systémového exclude souboru</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Nová složka větší než %1 MB byla přidána: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <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="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Pokud to chcete stáhnout, běžte do nastavení a vyberte to.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -833,7 +838,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -843,7 +848,7 @@ Tyto soubory budou smazány i ve vaší místní synchronizované složce a nebu Rozhodnete-li se soubory smazat, budou vám nedostupné, nejste-li jejich vlastníkem.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -852,22 +857,22 @@ Jste si jisti, že chcete tyto akce synchronizovat se serverem? Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze serveru.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Odstranit všechny soubory?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Odstranit všechny soubory</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Ponechat soubory</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> @@ -876,17 +881,17 @@ Toto může být způsobeno obnovením zálohy na straně serveru. Pokračováním v synchronizaci způsobí přepsání všech vašich souborů staršími soubory z dřívějšího stavu. Přejete si ponechat své místní nejaktuálnější soubory jako konfliktní soubory?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Záloha nalezena</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Normální synchronizace</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>Ponechat místní soubory jako konflikt</translation> </message> @@ -1007,7 +1012,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st <translation>Synchronizace s místním adresářem</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Soubor</translation> </message> @@ -1165,7 +1170,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2488,7 +2493,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Chyba zápisu metadat do databáze</translation> </message> @@ -3430,12 +3435,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Není povoleno, protože nemáte oprávnění přidávat soubory do tohoto adresáře</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> diff --git a/translations/client_de.ts b/translations/client_de.ts index 11f9598f0..d8d49b10f 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> @@ -165,204 +165,209 @@ <translation>Verbunden mit <server> als <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Kein Konto konfiguriert.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Neues Konto hinzufügen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Benutzerkonto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Zu synchronisierende Elemente auswählen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Synchronisation jetzt erzwingen </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Synchronisation neustarten</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Ordner-Synchronisation entfernen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Anlegen des Ordners fehlgeschlagen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Konnte lokalen Ordner <i>%1</i> nicht anlegen.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Bestätigen Sie die Löschung der Ordner-Synchronisation</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Ordner-Synchronisation entfernen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Synchronisation läuft</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Die Synchronisation läuft gerade.<br/>Wollen Sie sie beenden?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 wird verwendet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 als <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Verbunden mit %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 ist derzeit nicht verfügbar.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Server %1 befindet sich im Wartungsmodus.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>Abgemeldet von %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Berechtigung vom Browser einholen. <a href='%1'> Hier klicken </a> zum nochmaligen Öffnen des Browsers.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>Verbinde mit %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>Keine Verbindung zu %1 auf %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Einloggen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Einige Verzeichnisse konnten nicht synchronisiert werden, da sie zu groß sind:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da diese externe Speicher sind:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da diese zu groß oder externe Speicher sind:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Konto wirklich entfernen?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>Wollen Sie wirklich die Verbindung zum Konto <i>%1</i> lösen?</p><p><b>Anmerkung:</b> Dieser Vorgang wird <b>keine</b> Dateien löschen.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Verbindung entfernen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Ordner öffnen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Abmelden</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Synchronisation fortsetzen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Synchronisation pausieren</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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> wirklich 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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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 freigegebene Ordner oder geteilte Ordner können unterschiedliche Beschränkungen aufweisen. </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%1 von %2 Serverkapazität verwendet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <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="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>Keine %1-Verbindung konfiguriert.</translation> </message> @@ -791,41 +796,41 @@ <translation>Synchronisierungsaktivität</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <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="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Ein neues Verzeichnis größer als %1 MB wurde hinzugefügt: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation>Ein Verzeichnis, von einem externen Speicher wurde hinzugefügt. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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 das Verzeichnis herunterladen möchten.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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 erzeugt aber früher von der Synchronisation ausgeschlossen. Daten im Ordner werden nicht synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Die Datei %1 wurde erzeugt aber früher von der Synchronisation ausgeschlossen. Sie wird nicht synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -838,7 +843,7 @@ Dies bedeutet, dass der Synchronisationsclient lokale Änderungen möglicherweis %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -849,7 +854,7 @@ Wenn Sie sich dazu entscheiden, diese Dateien zu behalten, werden diese wieder z Wenn Sie sich zum Löschen der Dateien entscheiden, sind diese nicht mehr verfügbar, außer Sie sind der Eigentümer.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -858,22 +863,22 @@ Sind Sie sich sicher, dass Sie diese Aktion mit Ihrem Server synchronisieren mö Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheiden, werden diese wieder vom Server synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Alle Dateien löschen?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Lösche alle Dateien</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Dateien behalten</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> @@ -882,17 +887,17 @@ Der Grund dafür ist möglicherweise, dass auf dem Server ein Backup eingespielt Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älteren Versionen überschrieben. Möchten Sie die neueren lokalen Dateien als Konflikt-Dateien behalten?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Backup erkannt</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Normale Synchronisation</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>Lokale Konfliktdateien behalten</translation> </message> @@ -1013,7 +1018,7 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter <translation>Synchronisiere mit lokalem Verzeichnis</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Datei</translation> </message> @@ -1171,7 +1176,7 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation>Dieses Problem tritt normalerweise auf, wenn die Inotify-watcher erschöpft sind. Überprüfen Sie die FAQ für Details.</translation> </message> @@ -2498,7 +2503,7 @@ Dies ist ein neuer experimenteller Modus.Wenn du dich dafür entscheidest, diese <translation>Das Hochladen von %1 überschreitet das Speicherkontingent des Ordners </translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> </message> @@ -3440,12 +3445,12 @@ Dies ist ein neuer experimenteller Modus.Wenn du dich dafür entscheidest, diese <translation>Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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 senken, wurden ausgelassen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <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> diff --git a/translations/client_el.ts b/translations/client_el.ts index 094bc677b..7f846c7aa 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Άκυρο</translation> </message> @@ -165,204 +165,209 @@ <translation>Συνδεδεμένοι με το <server> ως <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Δεν ρυθμίστηκε λογαριασμός.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Προσθήκη νέου</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Αφαίρεση</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Λογαριασμός</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Επιλέξτε τι θα συγχρονιστεί</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Εξαναγκασμός συγχρονισμού τώρα</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Επανεκκίνηση συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Αφαίρεση σύνδεσης συγχρονισμού φακέλου</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Αποτυχία αφαίρεσης φακέλου</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Αδυναμία δημιουργίας τοπικού φακέλου <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Επιβεβαίωση αφαίρεσης σύνδεσης συγχρονισμού φακέλου</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Αφαίρεση σύνδεσης συγχρονισμού φακέλου</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Εκτελείται Συγχρονισμός </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Η λειτουργία συγχρονισμού εκτελείται.<br/> Θέλετε να την τερματίσετε;</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 σε χρήση</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 ως <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Συνδεδεμένο με %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>Ο διακομιστής %1 δεν είναι διαθέσιμος προσωρινά.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>Αποσυνδέθηκε από %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>Σύνδεση σε %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>Δεν υπάρχει σύνδεση με το %1 στο %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Είσοδος</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Επιβεβαίωση Αφαίρεσης Λογαριασμού</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>Θέλετε πραγματικά να αφαιρέσετε τη σύνδεση με το λογαριασμό <i>%1</i>;</p><p><b>Σημείωση:</b> Αυτό <b>δεν</b> θα διαγράψει κανένα αρχείο.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Αφαίρεση σύνδεσης</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Άνοιγμα φακέλου</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Αποσύνδεση</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Συνέχιση συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Παύση συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%1 από %2 σε χρήση</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <source>Currently there is no storage usage information available.</source> <translation>Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>Δεν έχει ρυθμιστεί σύνδεση με το %1.</translation> </message> @@ -791,41 +796,41 @@ <translation>Δραστηριότητα Συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <source>Could not read system exclude file</source> <translation>Αδυναμία ανάγνωσης αρχείου αποκλεισμού συστήματος</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation>Προστέθηκε ένας φάκελος από εξωτερικό αποθηκευτικό χώρο. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -834,7 +839,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -845,7 +850,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a Εφόσον επιλέξετε να διαγράψετε τα αρχεία, δε θα είναι διαθέσιμα σε εσάς, εκτός εάν είστε ο ιδιοκτήτης τους. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -854,22 +859,22 @@ If this was an accident and you decide to keep your files, they will be re-synce Αν αυτό ήταν ένα ατύχημα και αποφασίσατε να διατηρήσετε τα αρχεία σας, θα συγχρονιστούν εκ νέου από το διακομιστή.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Αφαίρεση Όλων των Αρχείων;</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Αφαίρεση όλων των αρχείων</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Διατήρηση αρχείων</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> @@ -878,17 +883,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an Η συνέχιση του συγχρονισμού κανονικά θα προκαλέσει την αντικατάσταση όλων των αρχείων σας από παλιότερο αρχείο σε προηγούμενη κατάσταση. Θέλετε να διατηρήσετε τα τοπικά σας πιο πρόσφατα αρχεία ως αρχεία σύγκρουσης;</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Ανιχνεύθηκε αντίγραφο ασφαλείας</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Κανονικός συγχρονισμός</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>Διατήρηση τοπικών αρχείων ως Διένεξη</translation> </message> @@ -1009,7 +1014,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Συγχρονισμός με τοπικό φάκελο</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Αρχείο</translation> </message> @@ -1167,7 +1172,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2490,7 +2495,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation> </message> @@ -3432,12 +3437,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε αρχεία σε αυτόν τον φάκελο</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> diff --git a/translations/client_en.ts b/translations/client_en.ts index 38298d205..02ccc2a6e 100644 --- a/translations/client_en.ts +++ b/translations/client_en.ts @@ -156,8 +156,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -167,204 +167,209 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <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="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation type="unfinished"></translation> </message> @@ -820,39 +825,39 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <source>Could not read system exclude file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -861,7 +866,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -869,46 +874,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation type="unfinished"></translation> </message> @@ -1029,7 +1034,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation type="unfinished"></translation> </message> @@ -1190,7 +1195,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"></translation> </message> @@ -2509,7 +2514,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation type="unfinished"></translation> </message> @@ -3455,12 +3460,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"></translation> </message> diff --git a/translations/client_es.ts b/translations/client_es.ts index 0715c9368..a8d55f56b 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -165,204 +165,209 @@ <translation>Conectado a <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>No se ha configurado ninguna cuenta.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Añadir nuevo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Elija qué sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Forzar la sincronización ahora</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Reiniciar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Eliminar la sincronización de carpetas conectadas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Hubo un fallo al crear la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>No se pudo crear la carpeta local <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <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="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Eliminar carpeta de sincronización conectada</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Sincronización en curso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La sincronización está en curso.<br/>¿Desea interrumpirla?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Conectado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>Servidor %1 no está disponible temporalmente.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>El servidor %1 está actualmente en modo mantenimiento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>Cerró sesión desde %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Obteniendo autorización desde el navegador. <a href='%1'>Haga click aqui</a> para re-abrir el navegador .</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>Conectando a %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>Sin conexión a %1 en %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Iniciar sesión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque residen en almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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 residen en almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Confirmar eliminación de cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>¿De verdad quiere eliminar la conexión a la cuenta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> eliminará los archivos.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Eliminar conexión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Abrir carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Cerrar sesión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Continuar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Pausar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%1 de %2 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <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="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>¡La versión del servidor %1 no es compatible! Continúa bajo tu responsabilidad.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>No hay ninguna conexión de %1 configurada.</translation> </message> @@ -791,41 +796,41 @@ <translation>Actividad de la sincronización</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <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="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <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="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>La carpeta %1 ha sido creada, pero tambien ha sido excluida de la sincronización. Los datos que contenga, no serán sincronizados.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>El archivo %1 ha sido creado, pero tambien ha sido excluido de la sincronización. Por tanto, no será sincronizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -838,7 +843,7 @@ Esto significa que el cliente de sincronización podría no subir los cambios lo %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -849,7 +854,7 @@ Si decide mantener estos archivos, serán re-sincronizados con el servidor si Vd Si decide borrarlos, no serán visibles para Vd. a menos que sea usted el propietario.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -858,22 +863,22 @@ If this was an accident and you decide to keep your files, they will be re-synce Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados con el servidor.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>¿Eliminar todos los archivos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Eliminar todos los archivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Conservar archivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> @@ -882,17 +887,17 @@ Esto puede deberse a que una copia de seguridad fue restaurada en el servidor. Si continua con la sincronización todos los archivos serán remplazados por su versión previa. ¿Desea mantener los archivos locales en su versión actual como archivos en conflicto?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Backup detectado</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Sincronización Normal</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>Mantener los archivos locales en caso de conflicto</translation> </message> @@ -1013,7 +1018,7 @@ Si continua con la sincronización todos los archivos serán remplazados por su <translation>Sincronizando con carpeta local</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Archivo</translation> </message> @@ -1171,7 +1176,7 @@ Si continua con la sincronización todos los archivos serán remplazados por su <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation>Este problema sucede habitualmente cuando las búsquedas de inotify están agotadas. Comprueba las FAQ para más detalles.</translation> </message> @@ -2499,7 +2504,7 @@ Este es un nuevo modo experimental. Si decide usarlo, por favor informe de los p <translation>La subida %1 excede la quota de la carpeta</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Error al escribir los metadatos en la base de datos</translation> </message> @@ -3441,12 +3446,12 @@ Este es un nuevo modo experimental. Si decide usarlo, por favor informe de los p <translation>No permitido porque no tiene permiso para añadir archivos a ese directorio</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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, debería abortar.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <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> diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts index a05207a31..edec6b022 100644 --- a/translations/client_es_AR.ts +++ b/translations/client_es_AR.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -165,204 +165,209 @@ <translation>Conectado con <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>No hay cuenta configurada.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Agregar nuevo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Borrar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Elegir que sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Forzar sincronización ahora</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Reinicia sincronización </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Eliminar conexión de sincronización de carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Falló la creacion de la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>No pudó ser creada la carpeta local <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirmar eliminación de conexión de sincronización de carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Eliminar Conexión de Sincronización de Carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Sincronización en curso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La sincronización está en curso.<br/>¿Querés interrumpirla?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 de <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Conectado a %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>El servidor %1 esta temporalmente sin conexión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Servidor %1 actualmente en modo mantenimiento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>Registrado desde %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Obteniendo autorización del navegador. <a href='%1'>Click aquí</a> para volver a abrir el navegador.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>Conectando a %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>Sin conexión a %1 desde %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Iniciar sesión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Hay carpetas que no fueron sincronizadas debido a que son demasiado grandes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Confirmar la eliminación de la cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Eliminar conexión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Abrir carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Cerrar la sesión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Reanudar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Pausar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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 detener la sincronización de la carpeta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> eliminara ningun archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%1 de %2 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <source>Currently there is no storage usage information available.</source> <translation>Actualmente no hay información disponible acerca del uso del almacenamiento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>No hay ninguna conexión de %1 configurada.</translation> </message> @@ -791,39 +796,39 @@ <translation>Actividad de Sync</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <source>Could not read system exclude file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -832,7 +837,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -840,46 +845,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>¿Borrar todos los archivos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Borrar todos los archivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Conservar archivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Sincronizacón Normal.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>Mantener Archivos Locales como Conflicto</translation> </message> @@ -1000,7 +1005,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Archivo</translation> </message> @@ -1158,7 +1163,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2477,7 +2482,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Error escribiendo metadatos a la base de datos</translation> </message> @@ -3417,12 +3422,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> diff --git a/translations/client_et.ts b/translations/client_et.ts index d80f3ed88..03a7f68a3 100644 --- a/translations/client_et.ts +++ b/translations/client_et.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Loobu</translation> </message> @@ -165,204 +165,209 @@ <translation>Ühendatud <server> kasutajana <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Ühtegi kontot pole seadistatud</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Lisa uus</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Eemalda</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Konto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Vali, mida sünkroonida</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Sünkrooni jõuga kohe</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Taaskäivita sünkroonimine</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Kausta loomine ebaõnnestus</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Sünkroniseerimine on käimas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Sünkroniseerimine on käimas.<br/>Kas sa soovid seda lõpetada?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 kasutusel</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 as <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Ühendatud %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 pole ajutiselt saadaval.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Logi sisse</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Kinnita konto eemaldamine</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Eemalda ühendus</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Ava kaust</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Logi välja</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Taasta sünroonimist</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Peata sünkroonimine</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <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="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>Ühtegi %1 ühendust pole seadistatud.</translation> </message> @@ -791,39 +796,39 @@ <translation>Sünkroniseerimise tegevus</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <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="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -832,7 +837,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -840,46 +845,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Kustutada kõik failid?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Kustutada kõik failid</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Säilita failid</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Leiti varukoopia</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Tavaline sünkroonimine</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation type="unfinished"/> </message> @@ -1000,7 +1005,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Fail</translation> </message> @@ -1158,7 +1163,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2478,7 +2483,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation type="unfinished"/> </message> @@ -3420,12 +3425,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> diff --git a/translations/client_eu.ts b/translations/client_eu.ts index 59b9448f1..dfbc75eb5 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Ezeztatu</translation> </message> @@ -165,204 +165,209 @@ <translation><user> bezala <server>-n konektatuta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Ez da konturik konfiguratu.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Gehitu berria</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Ezabatu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Kontua</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Hautatu zer sinkronizatu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Behartu orain sinkronizatzen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Berrabiarazi sinkronizazioa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Ezabatu karpeta honen konexioa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Karpeta sortzeak huts egin du</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Ezin izan da <i>%1</i> bertako karpeta sortu.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Baieztatu Karpetaren Konexioaren Ezabatzea</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Ezabatu Karpeta Honen Konexioa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Sinkronizazioa martxan da</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Sinkronizazio martxan da.<br/>Bukatu nahi al duzu?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 erabiltzen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>%1ra konektatuta.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>%1 zerbitzaria ez dago orain eskuragarri</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>%1 zerbitzaria mantenu moduan dago.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>%1etik saioa itxita.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>%1-era konektatzen...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>Konexiorik ez %1-ekin %2-etan</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Hasi saioa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Baieztatu Kontuaren Ezabatzea</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Ezabatu konexioa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Ireki karpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Saioa bukatu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Berrekin sinkronizazioa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Gelditu sinkronizazioa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%2tik %1 erabilita</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <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="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>Ez dago %1 konexiorik konfiguratuta.</translation> </message> @@ -791,39 +796,39 @@ <translation>Sinkronizazio Jarduerak</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <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="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -832,7 +837,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -840,46 +845,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Ezabatu Fitxategi Guztiak?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Ezabatu fitxategi guztiak</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Mantendu fitxategiak</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation type="unfinished"/> </message> @@ -1000,7 +1005,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Fitxategia</translation> </message> @@ -1158,7 +1163,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2480,7 +2485,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Errorea metadatuak datu-basean idaztean</translation> </message> @@ -3420,12 +3425,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> diff --git a/translations/client_fa.ts b/translations/client_fa.ts index 5566a5415..434cbf87d 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>منصرف شدن</translation> </message> @@ -165,204 +165,209 @@ <translation>متصل به <server> به عنوان <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>هیچ حسابکاربریای تنظیم نشده است.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>اضافه کردن جدید</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>حذف</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>حساب کاربری</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>انتخاب موارد همگامسازی</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>راه اندازی مجدد همگام سازی</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>حذف اتصال همگام سازی پوشه </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>ساخت پوشه ناموفق</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>ناتوانی در ساخت پوشه محلی <i>1%</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>تأیید حذف اتصال همگام سازی پوشه</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>حذف اتصال همگام سازی پوشه</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>همگام سازی در حال اجراست</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>عملیات همگام سازی در حال اجراست.<br/>آیا دوست دارید آن را متوقف کنید؟</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>1% در استفاده</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>1% به عنوان <i>2%</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>متصل به %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>سرور %1 بصورت موقت خارج از دسترس است.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>سرور 1% اکنون در حالت تعمیر است.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>از 1% خارج شد.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>دریافت مجوز از مرورگر. <a href='%1'>اینجا کلیک کنید</a> تا مرورگر دوباره باز شود.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>اتصال به %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>اتصال به 1% در 2% وجود ندارد.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>ورود</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>تائید حذف حسابکاربری</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>آیا شما واقعا می خواهید اتصال به حساب <i>1%</i>را حذف کنید؟</p> <p><b>توجه:</b> این هیچ فایلی را حذف نخواهد کرد.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>حذف ارتباط</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>بازکردن پوشه</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>خروج</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>از سرگیری همگامسازی</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>توقف بههنگامسازی </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>1% از 2% در استفاده</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <source>Currently there is no storage usage information available.</source> <translation>در حال حاضر هیچ اطلاعات کاربرد ذخیره سازی در دسترس نیست.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>بدون %1 اتصال پیکربندی شده.</translation> </message> @@ -791,41 +796,41 @@ <translation>فعالیت همگام سازی</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <source>Could not read system exclude file</source> <translation>نمی توان پرونده خارجی سیستم را خواند.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation>یک پوشه از یک مخزن خارجی اضافه شده است. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -834,7 +839,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -845,7 +850,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a اگر شما تصمیم بگیرید پرونده ها را حذف کنید، آن ها در دسترس شما نخواهند بود، مگر اینکه مالک باشید.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -854,22 +859,22 @@ If this was an accident and you decide to keep your files, they will be re-synce اگر این یک اتفاق بوده و شما تصمیم دارید پرونده هایتان را نگه دارید، آن ها از سرور مجددا همگام سازی خواهند شد.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>حذف تمام فایل ها؟</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>حذف تمام فایل ها</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>نگه داشتن فایل ها</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> @@ -878,17 +883,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an ادامه همگام سازی به طور معمول سبب خواهد شد که تمام پرونده های شما توسط یک فایل قدیمی تر در یک وضعیت جدیدتر بازنویسی شوند. آیا شما می خواهید پرونده های اخیر محلیتان را به عنوان پرونده های ناسازگار نگهداری کنید؟</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>پشتیبان شناسایی شد</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>همگام سازی معمول</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>پرونده های محلی را به عنوان ناسازگار نگه دارید</translation> </message> @@ -1009,7 +1014,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>همگامسازی با پوشه محلی</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>فایل</translation> </message> @@ -1167,7 +1172,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2488,7 +2493,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>بارگذاری از 1% بیش از سهمیه برای پوشه است</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>خطا در نوشتن متادیتا در پایگاه داده</translation> </message> @@ -3429,12 +3434,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>مجاز نیستید زیرا شما اجازه افزودن پرونده به آن پوشه را ندارید</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>برای بعضی از بارگذاری ها در سرور فضای کافی موجود نیست.</translation> </message> diff --git a/translations/client_fi.ts b/translations/client_fi.ts index 6fafc6848..4cbbd9abc 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Peruuta</translation> </message> @@ -165,204 +165,209 @@ <translation>Yhdistetty palvelimeen <server> käyttäen tunnusta <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Tiliä ei ole määritelty.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Lisää uusi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Poista</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Tili</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Valitse synkronoitavat tiedot</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Pakota synkronointi nyt</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Käynnistä synkronointi uudelleen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Poista kansion synkronointiyhteys</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Kansion luominen epäonnistui</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Paikallisen kansion <i>%1</i> luominen epäonnistui.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Vahvista kansion synkronointiyhteyden poisto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Poista kansion synkronointiyhteys</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Synkronointi meneillään</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Synkronointioperaatio on meneillään.<br/>Haluatko keskeyttää sen?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 käytössä</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 käyttäjänä <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Yhteys muodostettu kohteeseen %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>Palvelin %1 ei ole juuri nyt saatavilla.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Palvelin %1 on juuri nyt huoltotilassa.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>Kirjauduttu ulos kohteesta %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>Ei yhteyttä kohteeseen %1 osoitteessa %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Kirjaudu sisään</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Vahvista tilin poistaminen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>Haluatko varmasti poistaa tilin <i>%1</i>?</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="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Poista yhteys</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Avaa kansio</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Kirjaudu ulos</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Palauta synkronointi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Keskeytä synkronointi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%1/%2 käytössä</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <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="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>%1-yhteyttä ei ole määritelty.</translation> </message> @@ -791,41 +796,41 @@ <translation>Synkronointiaktiviteetti</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <source>Could not read system exclude file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Uusi kansio, joka on suurempi kuin %1 Mt, on lisätty: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <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="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -834,7 +839,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -842,46 +847,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Poistetaanko kaikki tiedostot?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Poista kaikki tiedostot</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Säilytä tiedostot</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Varmuuskopio poistettu</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Normaali synkronointi</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation type="unfinished"/> </message> @@ -1002,7 +1007,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Synkronoidaan paikallisen kansion kanssa</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Tiedosto</translation> </message> @@ -1160,7 +1165,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2482,7 +2487,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Virhe kirjoittaessa metadataa tietokantaan</translation> </message> @@ -3424,12 +3429,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ei sallittu, koska käyttöoikeutesi eivät riitä tiedostojen lisäämiseen kyseiseen kansioon</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Palvelimella ei ole riittävästi tallennustilaa joidenkin lähetysten osalta.</translation> </message> diff --git a/translations/client_fr.ts b/translations/client_fr.ts index ecbec5cb2..8d1efbf7b 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Annuler</translation> </message> @@ -165,204 +165,209 @@ <translation>Connecté au serveur <server> avec le compte <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Aucun compte configuré.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Ajouter un nouveau compte</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Supprimer</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Compte</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Sélectionner le contenu à synchroniser</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Forcer la synchronisation maintenant</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Redémarrer la synchronisation</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Supprimer la synchronisation du dossier</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Échec de création du dossier</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Impossible de créer le dossier local <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirmer une suppression de synchronisation de dossier</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Supprimer la synchronisation de ce dossier</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Synchronisation en cours</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La synchronisation est en cours.<br/>Voulez-vous l'arrêter ?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 utilisés</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 avec le compte <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Connecté au serveur %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>Le serveur %1 est temporairement indisponible.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Le serveur %1 est en cours de maintenance.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>Session sur %1 fermée.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>En attente d'autorisation du navigateur. <a href='%1'>Cliquer ici</a> pour recharger le navigateur.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>Connexion à %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>Aucune connexion au serveur %1 à l'adresse %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Se connecter</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Confirmation de retrait du compte</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>Êtes-vous certain de vouloir retirer <i>%1</i> des comptes synchronisés avec le serveur ?</p><p><b>Remarque :</b> cela ne supprimera pas votre compte sur le serveur, et aucun fichier ne sera supprimé ni localement ni en ligne.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Retirer le compte</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Ouvrir le dossier local</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Se déconnecter</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Reprendre la synchronisation</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Mettre en pause</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%1 utilisés sur %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <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="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>Aucune connexion à %1 configurée</translation> </message> @@ -791,19 +796,19 @@ <translation>Activité de synchronisation</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <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="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation>Un nouveau dossier localisé sur un stockage externe a été ajouté. @@ -811,22 +816,22 @@ </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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 avait été exclu de la synchronisation auparavant. Les données à l'intérieur ne seront pas synchronisées.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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 avait été exclu de la synchronisation auparavant. Il ne sera pas synchronisé.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -839,7 +844,7 @@ Cela veut dire que le client de synchronisation ne peut pas téléverser les cha %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -850,7 +855,7 @@ Si vous décidez de conserver ces fichiers, ils seront synchronisés à nouveau Si vous décidez de supprimer ces fichiers, ils vous seront inaccessibles, sauf si vous en êtes le/la propriétaire.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -859,22 +864,22 @@ If this was an accident and you decide to keep your files, they will be re-synce S'il s'agissait d'un accident et que vous choisissiez de conserver vos fichiers, ils seront synchronisés à nouveau depuis le serveur.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Supprimer tous les fichiers ?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Supprimer tous les fichiers</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Conserver les fichiers</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> @@ -883,17 +888,17 @@ Cela peut être dû à une copie de sauvegarde restaurée sur le serveur. Continuer la synchronisation comme d'habitude fera en sorte que tous les fichiers soient remplacés par des fichiers plus vieux d'un état précédent. Voulez-vous conserver les versions les plus récentes de vos fichiers en tant que fichiers conflictuels ?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Sauvegarde détectée</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Synchronisation normale</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>Conserver les fichiers locaux comme Conflits</translation> </message> @@ -1014,7 +1019,7 @@ Continuer la synchronisation comme d'habitude fera en sorte que tous les fi <translation>Sélectionnez les sous-dossiers à synchroniser à partir du dossier local</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Fichier</translation> </message> @@ -1172,7 +1177,7 @@ Continuer la synchronisation comme d'habitude fera en sorte que tous les fi <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation>Ce problème survient généralement lorsque les contrôleurs inotify sont saturés. Consulter la FAQ pour plus de détails.</translation> </message> @@ -2503,7 +2508,7 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Le téléversement de %1 amène un dépassement de quota pour le dossier</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Erreur à l'écriture des métadonnées dans la base de données</translation> </message> @@ -3446,12 +3451,12 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Non autorisé car vous n'avez pas la permission d'ajouter des fichiers dans ce dossier</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <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> diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 5b65d8e09..b32d17e7c 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -165,204 +165,209 @@ <translation>Conectado con <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Non hai contas configuradas.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Engadir novo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Retirar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Conta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Escolla que sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Forzar a sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Reiniciar a sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Retirar a conexión da sincronización do cartafol</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Non foi posíbel crear o cartafol</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Non foi posíbel crear o cartafol local <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <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="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Retirar a conexión da sincronización do cartafol</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Sincronización en proceso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Estase a realizar a sincronización.<br/>Quere interrompela e rematala?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Conectado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>O servidor %1 non está dispoñíbel temporalmente.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>Desconectado de %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>Non hai conexión con %1 en %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Acceder</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Confirme a retirada da conta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>De verdade quere retirar a conexión a conta <i>%1</i>?</p><p><b>Aviso:</b> Esto <b>non</b> eliminará ningún ficheiro.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Retirar conexión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Abrir o cartafol</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Desconectar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Continuar coa sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Por en pausa a sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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>Quere realmente deixar de sincronizar o cartafol <i>%1</i>?</p><p><b>Aviso:</b> Esto <b>non</b> eliminará ningún ficheiro.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%1 de %2 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <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="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>Non se configurou a conexión %1.</translation> </message> @@ -791,39 +796,39 @@ <translation>Actividade de sincronización</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <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="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -832,7 +837,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -840,46 +845,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Retirar todos os ficheiros?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Retirar todos os ficheiros</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Manter os ficheiros</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation type="unfinished"/> </message> @@ -1000,7 +1005,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Ficheiro</translation> </message> @@ -1158,7 +1163,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2479,7 +2484,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation type="unfinished"/> </message> @@ -3421,12 +3426,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> diff --git a/translations/client_hu.ts b/translations/client_hu.ts index 9485c5e1f..07f644963 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Mégsem</translation> </message> @@ -165,204 +165,209 @@ <translation>Csatlakoztatva <user> felhasználóval ehhez: <server></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Nincs beállított fiók.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Új hozzáadása</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Eltávolítás</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Fiók</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Szinkronizálandó elemek kiválasztása</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Kényszerített szinkronizálás</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Szinkronizálás újraindítása</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Könyvtár szinkronizációs kapcsolat törlése</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Könyvtár létrehozása nem sikerült</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Nem lehet helyi könyvtárat létrehozni: <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Könyvtár szinkronizációs kapcsolat törlésének megerősítése</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Könyvtár szinkronizációs kapcsolat törlése</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Szinkronizálás fut</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>A szinkronizálás folyamatban van. <br/>Szakítsuk meg?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 használatban</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1, mint <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Csatlakozva: %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>%1 szerver jelenleg nem elérhető.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>A(z) %1 szerver jelenleg karbantartási módban van.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>Kijelentkezve innen: %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Engedély kérése a böngészőtől. <a href='%1'>Kattintson ide</a> a böngésző újranyitásához.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>Csatlakozás ehhez: %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>Nincs kapcsolat ehhez: %1 ekkor: %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Bejelentkezés</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Vannak mappák, amelyek nem szinkronizáltak, mert túl nagyok:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Vannak mappák, amelyek nem szinkronizáltak, mert külső tárolók:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Vannak olyan mappák, amelyek nem szinkronizáltak, mert túl nagyok vagy külső tárolók:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Fiók törlésének megerősítése</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>Tényleg törölni szeretné a kapcsolatot <i>%1</i> fiókkal?</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="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Kapcsolat törlése</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Könyvtár megnyitása</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Kilépés</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Szinkronizálás folytatása</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Szinkronizálás szüneteltetése</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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 leszeretné állítani <i>%1</i> könyvtár 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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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 könyvtár - 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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%1 / %2 használatban</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <source>Currently there is no storage usage information available.</source> <translation>Jelenleg nem érhető el tárhelyhasználati információ.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>Nincs beállított kapcsolat: %1.</translation> </message> @@ -791,40 +796,40 @@ <translation>Szinkronizálási aktivitás</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <source>Could not read system exclude file</source> <translation>Nem sikerült olvasni a rendszer kizárási fájlját</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>A (z) % 1 MB-nál nagyobb új mappa hozzáadva: % 2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation>Hozzáadt egy mappát egy külső tárból.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>A beállítások megadásához válassza ki, ha szeretné letölteni.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -833,7 +838,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -841,46 +846,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>A kiszolgáló egy "% 1" mappában levő összes fájlt törölték.Ezek a törlések szinkronizálódnak a helyi szinkronizálási mappájukhoz, így az ilyen fájlok nem érhetők el, hacsak nem jogosult a visszaállításra. Ha úgy dönt, hogy megtartja a fájlokat, akkor újra szinkronizálódik a szerverrel, ha jogosult erre.Ha úgy dönt, hogy törli a fájlokat, akkor nem lesznek elérhetők, hacsak nem vagy egy tulajdonos.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation>A (z) "% 1" helyi szinkronmappában található összes fájl törölve lett. Ezek a törlések szinkronizálásra kerülnek a kiszolgálóval, így az ilyen fájlok nem érhetők el, hacsak vissza nem állítják őket.Biztos benne, hogy ezeket a műveleteket szinkronizálni szeretné a kiszolgálóval?Ha ez baleset volt, és úgy döntenél, hogy megőrzi a fájlokat, újra szinkronizálódik a kiszolgálóról.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Törli az összes fájlt?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Összes fájl eltávolítása</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Fájlok megtartása</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> <translation>Ez a szinkronizálás a "% 1" szinkronizálási mappában korábbi időpontban alaphelyzetbe állítja a fájlokat.Ez azért lehetséges, mert egy biztonsági másolat visszaállt a kiszolgálón.Ha a szokásos módon folytatja a szinkronizálást, az régebbi fájl felülírja az összes fájlt egy korábbi állapotban. Meg szeretné őrizni a helyi legfrissebb fájlokat konfliktusfájlokként?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Biztonsági mentés észlelve</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Normal szinkronizáció</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>Helyi file-ok megtartása konfliktusként</translation> </message> @@ -1001,7 +1006,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Szinkronizálás a helyi mappával</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Fájl</translation> </message> @@ -1159,7 +1164,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2482,7 +2487,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Hiba történt a metaadatok megadásához a adatbázisban</translation> </message> @@ -3423,12 +3428,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> diff --git a/translations/client_it.ts b/translations/client_it.ts index 364f536fe..73457aba4 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Annulla</translation> </message> @@ -165,204 +165,209 @@ <translation>Connesso a <server> come <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Nessun account configurato.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Aggiungi nuovo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Rimuovi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Account</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Scegli cosa sincronizzare</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Forza ora la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Riavvia sincronizzazione</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Rimuovi connessione di sincronizzazione cartelle</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Creazione della cartella non riuscita</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Impossibile creare la cartella locale <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Conferma rimozione connessione di sincronizzazione cartelle</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Rimuovi connessione di sincronizzazione cartelle</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>La sincronizzazione è in corso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>L'operazione di sincronizzazione è in corso.<br/>Vuoi terminarla?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 in uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 come <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Connesso a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>Il server %1 è temporaneamente non disponibile.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Il Server %1 è attualmente in manutenzione</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>Disconnesso da %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Ottenimento dell'autorizzazione dal browser. <a href='%1'>Clicca qui</a> per riaprirle nel browser.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>Connessione con %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>Nessuna connessione a %1 su %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Accedi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Conferma rimozione account</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>Vuoi davvero eliminare la connessione all'account <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="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Rimuovi connessione</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Apri cartella</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Esci</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Riprendi la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Sospendi la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%1% di %2 in uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <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="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>Nessuna connessione di %1 configurata.</translation> </message> @@ -791,19 +796,19 @@ <translation>Sincronizza attività</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <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="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation>Una nuova cartella da un'archiviazione esterna è stata aggiunta. @@ -811,22 +816,22 @@ </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>La cattella %1 è stata creata ma esclusa dalla sincronizzazione in prevecedenza. I dati al suo interno non saranno sincronzzati.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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 escluso in precedenza dalla sincronizzazione. Non sarà quindi sincronizzato.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -835,7 +840,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -843,29 +848,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Vuoi rimuovere tutti i file?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Rimuovi tutti i file</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Mantieni i file</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> @@ -874,17 +879,17 @@ Ciò potrebbe verificarsi in seguito al ripristino di un backup sul server. Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tutti i tuoi file con file più datati in uno stato precedente. Vuoi mantenere i tuoi file locali più recenti come file di conflitto?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Backup rilevato</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Sincronizzazione normale</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>Mantieni i file locali come conflitto</translation> </message> @@ -1005,7 +1010,7 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut <translation>Sincronizzazione con cartella locale</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>File</translation> </message> @@ -1163,7 +1168,7 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2485,7 +2490,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>L'upload eccede di %1 la quota della cartella</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Errore durante la scrittura dei metadati nel database</translation> </message> @@ -3427,12 +3432,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Non consentito poiché non disponi dei permessi per aggiungere file in quella cartella</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Lo spazio su disco è scarso: I downloads che ridurranno lo spazio libero al di sotto di %1 verranno saltati.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Non c'è spazio disponibile sul server per effettuare caricamenti.</translation> </message> diff --git a/translations/client_ja.ts b/translations/client_ja.ts index 7ac80f159..91680cae4 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>キャンセル</translation> </message> @@ -165,204 +165,209 @@ <translation><server> に <user> で接続中</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>アカウントが未設定です。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>新規追加</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>削除</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>アカウント</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>同期フォルダーを選択</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>今すぐ強制的に同期</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>同期を再実行</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>同期フォルダー接続を削除</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>フォルダーの作成に失敗しました</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>ローカルフォルダー <i>%1</i> を作成できません。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>同期フォルダー接続の削除を確認</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>同期フォルダー接続を削除</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>同期を実行中</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>同期作業を実行中です。<br/>終了しますか？</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 を使用中</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation><i>%2</i> の %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>%1 に接続</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>サーバー %1 は一時的に利用できません</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>サーバー %1 は現在メンテナンスモードです。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>%1 からサインアウトしました。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>ブラウザから権限を取得しています。<a href='%1'>ここをクリック</a>してブラウザを再度開いてください。 </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>%1 に接続中...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>%2 の %1 への接続がありません。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>ログイン</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>アカウント削除確認</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p> アカウント <i>%1</i> を本当に削除しますか?</p><p><b>注意:</b> これによりファイルが一切削除されることはありません。</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>接続削除</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>フォルダーを開く</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>ログアウト</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>再開</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>一時停止</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%2 のうち %1 を使用中</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <source>Currently there is no storage usage information available.</source> <translation>現在、利用できるストレージ利用状況はありません。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>%1 の接続は設定されていません。</translation> </message> @@ -791,41 +796,41 @@ <translation>同期アクティビティ</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <source>Could not read system exclude file</source> <translation>システム上の除外ファイルを読み込めません</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation>外部ストレージからフォルダーが追加されました。 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -834,7 +839,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -845,7 +850,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a 「すべてのファイルを削除」を選択すると、あなたが所有者でない限り、ファイルは使用できなくなります。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -854,39 +859,39 @@ If this was an accident and you decide to keep your files, they will be re-synce 「ファイルを残す」を選択した場合、ファイルはサーバーから再同期されます。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>すべてのファイルを削除しますか？</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>すべてのファイルを削除</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>ファイルを残す</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> <translation>この同期により同期フォルダー '%1' のファイルが以前のものに戻されます。 これは、バックアップがサーバー上に復元されたためです。 通常と同じように同期を続けると、すべてのファイルが以前の状態の古いファイルによって上書きされます。最新のローカルファイルを競合ファイルとして保存しますか？</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>バックアップが検出されました</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>正常同期</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>コンフリクト時にローカルファイルを保持</translation> </message> @@ -1007,7 +1012,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>ローカルフォルダーを同期中</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>ファイル</translation> </message> @@ -1165,7 +1170,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2486,7 +2491,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>メタデータのデータベースへの書き込みに失敗</translation> </message> @@ -3428,12 +3433,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>そのフォルダーにファイルを追加する権限がありません</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index 20a38d7f4..089096d1e 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -165,204 +165,209 @@ <translation>Tilkoblet <server> som <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Ingen konto konfigurert.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Legg til ny</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Fjern</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Konto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Velg hva som synkroniseres</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Tving synkronisering nå</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Prøv synkronisering igjen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Fjern tilkobling for mappe-synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Oppretting av mappe feilet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Klarte ikke å opprette lokal mappe <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Bekreft fjerning av tilkobling for mappe-synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Fjern tilkobling for mappe-synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Synkroniserer...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Synkronisering kjører.<br/>Vil du avbryte den?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 i bruk</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 som <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Tilkoblet %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 er midlertidig utilgjengelig.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Server %1 er for øyeblikket i vedlikeholdsmodus.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>Logget ut fra %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Hente autorisasjon fra nettleseren. <a href='%1'>Klikk her </a> for å åpne nettleseren på nytt.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>Kobler til %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>Ingen tilkobling til %1 på %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Logg inn</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Bekreft fjerning av konto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>Vil du virkelig fjerne tilkoblingen til kontoen <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="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Fjern tilkobling</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Åpne mappe</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Logg ut</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Fortsett synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Sett synkronisering på pause</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%1 av %2 i bruk</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <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="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>Ingen %1-forbindelse konfigurert.</translation> </message> @@ -791,40 +796,40 @@ <translation>Synkroniseringsaktivitet</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <source>Could not read system exclude file</source> <translation>Klarte ikke å lese systemets ekskluderingsfil</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <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="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Mappen %1 var laget, men har tidligere blitt ekskludert fra synkronisering. Data i mappen vil derfor ikke bli synkronisert. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -833,7 +838,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -844,7 +849,7 @@ Hvis du velger å beholde filene, vil de bli synkronisert tilbake til serveren h Hvis du velger å slette filene, blir de utilgjengelige for deg hvis du ikke er eieren av filen.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -853,22 +858,22 @@ Er du sikker på at du ønsker å synkronisere denne handlingen med serveren? Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert tilbake fra serveren.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Fjerne alle filer?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Fjern alle filer</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Behold filer</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> @@ -877,17 +882,17 @@ Dette kan være fordi en backup ble gjenopprettet på serveren. Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrevet av en eldre fil i en tidligere tilstand. Ønsker du å beholde dine ferskeste lokale filer som konflikt-filer?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Backup oppdaget</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Normal synkronisering</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>Behold lokale filer som konflikt</translation> </message> @@ -1008,7 +1013,7 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev <translation>Synkroniserer med lokal mappe</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Fil</translation> </message> @@ -1166,7 +1171,7 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2494,7 +2499,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Opplasting av %1 overstiger kvoten for mappen</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Feil ved skriving av metadata til databasen</translation> </message> @@ -3436,12 +3441,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ikke tillatt fordi du ikke har lov til å opprette filer i den mappen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Diskplass er lav: Nedlastinger som ville redusere ledig plass under% 1 ble hoppet over.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Det er ikke nok ledig plass på serveren for noen av opplastingene.</translation> </message> diff --git a/translations/client_nl.ts b/translations/client_nl.ts index d568d5f31..fafc3c35d 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Annuleren</translation> </message> @@ -165,204 +165,209 @@ <translation>Verbonden met <server> als <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Geen account ingesteld.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Toevoegen nieuw</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Verwijder</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Account</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Selectieve synchronisatie</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Forceer sync nu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Herstarten sync</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Verwijder map-synchronisatie verbinding</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Maken map mislukt</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Kon lokale map <i>%1</i> niet maken.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Bevestig verwijderen map-synchronisatie verbinding</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Verwijder map-synchronisatie verbinding</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Bezig met synchroniseren</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Bezig met synchroniseren.<br/>Wilt u stoppen met synchroniseren?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 in gebruik</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 als <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Verbonden met %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 is tijdelijk niet beschikbaar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Server %1 is momenteel in onderhoudsmodus.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>Uitgelogd van %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Probeert autorisatie te krijgen van de browser. <a href='%1'> Klik hier</a> om de browser opnieuw te openen.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>Verbinden met %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>Geen verbinding met %1 op %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Meld u aan</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Er zijn mappen die niet gesynchroniseerd werden, omdat ze te groot zijn:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Er zijn mappen die niet gesynchroniseerd werden, omdat ze op externe opslag staan:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Er zijn mappen die niet gesynchroniseerd werden, omdat ze te groot zijn of op externe opslag staan:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Bevestig verwijderen account</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>Wilt u echt de verbinding met het account <i>%1</i> verbreken?</p><p><b>Let op:</b> Hierdoor verwijdert u <b>geen</b> bestanden.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Verwijderen verbinding</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Openen map</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Afmelden</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Hervatten sync</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Pauzeren sync</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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 u zeker dat u de synchronisatie 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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%1 van %2 in gebruik</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <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="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>Geen %1 connectie geconfigureerd.</translation> </message> @@ -791,41 +796,41 @@ <translation>Synchronisatie-activiteit</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <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="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <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="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -834,7 +839,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -845,7 +850,7 @@ Als u de bestanden wilt behouden, worden ze opnieuw gesynchroniseerd met de serv Als u de bestanden wilt verwijderen, worden ze niet beschikbaar, tenzij u de eigenaar bent.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -853,22 +858,22 @@ If this was an accident and you decide to keep your files, they will be re-synce Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw gesynchroniseerd met de server.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Verwijder alle bestanden?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Verwijder alle bestanden</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Bewaar bestanden</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> @@ -877,17 +882,17 @@ Dit kan komen doordat een backup is hersteld op de server. Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere versie. Wilt u uw lokale meer recente bestanden behouden als conflict bestanden?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Backup gedetecteerd</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Normale synchronisatie</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>Behoud lokale bestanden als conflict</translation> </message> @@ -1008,7 +1013,7 @@ Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere v <translation>Synchroniseren met lokale map</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Bestand</translation> </message> @@ -1167,7 +1172,7 @@ Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere v <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2494,7 +2499,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Upload van %1 overtreft de quota van de folder</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Fout bij schrijven van Metadata naar de database</translation> </message> @@ -3436,12 +3441,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Niet toegestaan omdat u geen rechten hebt om bestanden in die map toe te voegen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> diff --git a/translations/client_pl.ts b/translations/client_pl.ts index ff10bec2b..e3bd49432 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Anuluj</translation> </message> @@ -165,204 +165,209 @@ <translation>Połączony z <server> jako <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Brak skonfigurowanych kont.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Dodaj nowe</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Usuń</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Konto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Wybierz co synchronizować</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Zsynchronizuj teraz</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Uruchom ponownie synchronizację</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Usuń folder połączenia synchronizacji</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Nie udało się stworzyć katalogu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Nie można stworzyć lokalnego katalogu <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Potwierdź usunięcie połączenia folderów synchronizacji</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Usuń folder połączenia synchronizacji</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Synchronizacja uruchomiona</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Operacja synchronizacji jest uruchomiona.<br>Czy chcesz ją zakończyć?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 w użyciu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 jako <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Podłączony do %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>Serwer %1 jest tymczasowo niedostępny.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Serwer %1 jest obecnie w trybie konserwacji.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>Wylogowano z %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>Łączenie do %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>Brak połączenia do %1 z %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Zaloguj</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Te foldery nie zostały zsynchronizowane ponieważ są zbyt duze:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Te foldery nie zostały zsynchronizowane ponieważ znajdują się w pamięci zewnętrznej:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Te foldery nie zostały zsynchronizowane ponieważ są zbyt duże lub znajdują się w pamięci zewnętrznej:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Potwierdź usunięcie konta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>Czy na pewno chcesz usunąć połączenie z kontem <i>%1</i>?</p><p><b>Uwaga:</b> ta operacja <b>nie</b> usunie plików klienta.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Usuwanie połączenia</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Otwórz katalog</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Wyloguj</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Przywróć synchronizację</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Zatrzymaj synchronizację</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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ę folderu <i>%1</i>?</p><p><b>Uwaga:</b> ta operacja <b>nie</b> usunie plików z klienta.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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 foldery, w tym zamontowane lub udostępnione foldery w sieci, mogą mieć różne limity.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%1 z %2 w użyciu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <source>Currently there is no storage usage information available.</source> <translation>Obecnie nie ma dostępnych informacji o wykorzystaniu pamięci masowej.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>Połączenie %1 nie skonfigurowane.</translation> </message> @@ -791,41 +796,41 @@ <translation>Aktywności synchronizacji</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <source>Could not read system exclude file</source> <translation>Nie można przeczytać pliku wyłączeń</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Nowy folder większy niż %1MB został dodany: %2 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation>Folder z pamięci zewnętrznej został dodany . </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Przejdź do ustawień żeby go zaznaczyć i pobrać.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Folder %1 został utworzony ale poprzednio został wykluczony z synchronizacji. Dane wewnątrz folderu nie będą zsynchronizowane.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Plik %1 został utworzony ale poprzednio został wykluczony z synchronizacji. Nie będzie zsynchronizowany.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -834,7 +839,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -845,46 +850,46 @@ Jeśli zdecydujesz się zatrzymać pliki i posiadasz odpowiednie uprawnienia, zo Jeśli zdecydujesz je usunąć, nie będą więcej dostępne. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Usunąć wszystkie pliki?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Usuń wszystkie pliki</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Pozostaw pliki</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Wykryto kopię zapasową.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Normalna synchronizacja.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>Zatrzymaj pliki lokalne i ustaw status konfliktu.</translation> </message> @@ -1005,7 +1010,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Synchronizacja z folderem lokalnym.</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Plik</translation> </message> @@ -1163,7 +1168,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2486,7 +2491,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Błąd podczas zapisu metadanych do bazy</translation> </message> @@ -3428,12 +3433,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania plików w tym katalogu</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> diff --git a/translations/client_pt.ts b/translations/client_pt.ts index 0ee993d90..2645ee29a 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -165,204 +165,209 @@ <translation>Ligado ao <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Nenhuma conta configurada.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Adicionar nova</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Remover</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Conta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Escolher o que sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Forçar a sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Retomar sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Remover ligação de sincronização de pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Não foi possível criar a pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Não foi possível criar a pasta local<i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <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="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Remover Ligação da Sincronização de Pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Sincronização em Execução</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <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="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 em utilização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Ligado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>O servidor %1 está temporariamente indisponível.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>O Servidor %1 encontra-se em manutenção</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>Terminou a sessão de %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>A Conectar a %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>Sem ligação para %1 em %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Iniciar Sessão</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Confirmar Remoção da Conta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>Deseja mesmo remover a ligação da conta <i>%1</i>?</p><p><b>Nota:</b> isto <b>não</b> irá eliminar quaisquer ficheiros.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Remover ligação</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Abrir pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Terminar sessão</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Retomar sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Pausar sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%1 de %2 em utilização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <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="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>%1 sem ligação configurada.</translation> </message> @@ -791,41 +796,41 @@ <translation>Atividade de Sincronização</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <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="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <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="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Por favor, vá às configurações para a selecionar se a desejar transferir.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -834,7 +839,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -845,7 +850,7 @@ Se decidir manter os ficheiros, eles serão sincronizados novamento para o servi Se decidir apagar os ficheiros, eles ficaram indisponíveis para si, a não ser que seja o seu proprietário.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -854,22 +859,22 @@ Tem a certeza que deseja sincronizar essas ações com o servidor? Se foi acidental e decidir manter os seus ficheiros, eles serão sincronizados novamente apartir do servidor.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Remover todos os ficheiros?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Remover todos os ficheiros</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Manter ficheiros</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> @@ -878,17 +883,17 @@ Isto pode ser porque um backup foi restaurado no servidor. Continuando a sincronização fará com que todos os seus ficheiros sejam substituídos por um ficheiro mais velho num estado anterior. Deseja manter os seus ficheiros locais mais recentes como ficheiros de conflito?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Detetada cópia de segurança</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Sincronização Normal</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>Manter Ficheiros Locais como Conflito</translation> </message> @@ -1009,7 +1014,7 @@ Continuando a sincronização fará com que todos os seus ficheiros sejam substi <translation>A sincronizar com a pasta local</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Ficheiro</translation> </message> @@ -1167,7 +1172,7 @@ Continuando a sincronização fará com que todos os seus ficheiros sejam substi <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2490,7 +2495,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Erro ao gravar os metadados para a base de dados</translation> </message> @@ -3432,12 +3437,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Não permitido, porque não tem permissão para adicionar os ficheiros nessa pasta</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index 625777ba4..ab80504ad 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -165,204 +165,209 @@ <translation>Conectado com <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Nenhuma conta configurada.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Adicionar nova</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Remover</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Conta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Escolha o que quer sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Forçar sincronização agora</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Reiniciar a sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Remover a conexão de sincronização de pastas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Falha na criação de pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Não foi possível criar pasta local <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirme a Remoção de Sincronização de Pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Remover a Conexão de Sincronização de pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Sincronização Acontecendo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>A operação de sincronização está acontecendo.<br/>Você deseja finaliza-la?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 em uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Conectado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>O Servidor %1 está temporariamente indisponível.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Servidor %1 está atualmente em modo de manutenção.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>Desconectado de %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Obtendo autorização do navegador. <a href='%1'>Clique aqui</a> para reabrir o navegador.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>Conectando a %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>Sem conexão para %1 em %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Entrar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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 armazenamentos externos:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Confirmar a Remoção da Conta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>Você realmente deseja remover a conexão desta conta<i>%1</i>?</p><p><b>Nota:</b> Isto <b>não</b> irá deletar nenhum arquivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Remover conexão</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Abrir pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Sair</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Resumir sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Pausar sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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>Você realmente deseja para a sincronização desta pasta <i>%1</i>?</p><p><b>Nota:</b> Isto <b>não</b> vai deletar qualquer arquivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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 montadas na rede ou pastas compartilhadas, podem ter limites diferenes.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%1 de %2 em uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <source>Currently there is no storage usage information available.</source> <translation>Atualmente, não há informações de uso de armazenamento disponível.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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 conta e risco.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>Nenhuma %1 conexão configurada.</translation> </message> @@ -791,41 +796,41 @@ <translation>Atividade de Sincronização</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <source>Could not read system exclude file</source> <translation>Não foi possível ler o sistema de arquivo de exclusão</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <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="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Por favor, vá nas configurações para selecioná-lo se você deseja baixá-lo.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>A arquivo %1 foi criado, mas foi excluído da sincronização anteriormente. Ele não será sincronizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -838,7 +843,7 @@ Isso significa que o cliente de sincronização pode não fazer envios de altera %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -849,29 +854,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a Se você decidir excluir os arquivos, eles não estarão disponíveis para você, a menos que você seja o proprietário.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation>Todos os arquivos na pasta de sincronização local '%1' foram excluídos. Essas exclusões serão sincronizadas com o servidor, tornando tais arquivos indisponíveis, a menos que restaurados.Tem certeza de que deseja sincronizar essas ações com o servidor?Se isso foi um acidente e você decidir manter seus arquivos, eles serão re-sincronizados a partir do servidor.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Deseja Remover Todos os Arquivos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Remover todos os arquivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Manter arquivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> @@ -880,17 +885,17 @@ Isso pode ser porque um backup foi restaurado no servidor. Continuar a sincronização como normal fará com que todos os seus arquivos sejam substituídos por um arquivo antigo em um estado anterior. Deseja manter seus arquivos mais recentes locais como arquivos de conflito?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Backup detectado</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Sincronização Normal</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>Manter Arquivos Locais como Conflito</translation> </message> @@ -1011,7 +1016,7 @@ Continuar a sincronização como normal fará com que todos os seus arquivos sej <translation>Sincronizando com a pasta local</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Arquivo</translation> </message> @@ -1169,7 +1174,7 @@ Continuar a sincronização como normal fará com que todos os seus arquivos sej <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation>Esse problema geralmente acontece quando o inotify esgotou as notificações. Verifique o FAQ para mais detalhes.</translation> </message> @@ -2495,7 +2500,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>O envio de %1 excede a quota da pasta</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation> </message> @@ -3437,12 +3442,12 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Não permitido porque você não tem permissão para adicionar arquivos na pasta</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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 reduzam o espaço livre abaixo de %1 foram ignorados.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Há espaço disponível no servidor para alguns envios.</translation> </message> diff --git a/translations/client_ru.ts b/translations/client_ru.ts index 84a711d9f..59b5e8e6e 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Отмена</translation> </message> @@ -165,204 +165,209 @@ <translation>Подключен к <server> как <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Учётная запись не настроена.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Добавить новую</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Уч.запись</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Выбрать объекты для синхронизации</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Принудительно синхронизовать сейчас</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Перезапустить синхронизацию</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Удалить подключение синхронизации каталога</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Ошибка создания каталога</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Не удалось создать локальный каталог <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Подтвердите удаление подключения синхронизации каталога</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Удалить подключение синхронизации каталога</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Синхронизация запущена</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Выполняется синхронизация.<br/>Вы хотите её остановить?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 используется</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 как <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Соединен с %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>Сервер %1 временно недоступен.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Сервер %1 в настоящее время находится в режиме технического обслуживания.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>Успешно вышли из %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Получение авторизации из браузера. <a href='%1'>Нажмите здесь</a>, чтобы повторно открыть браузер.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>Соединение с %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>Нет соединения с %1 в %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Войти</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Подтверждение удаления учетной записи</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>Вы действительно желаете удалить подключение к учетной записи <i>%1</i>?</p><p><b>Примечание:</b> Это действие <b>НЕ</b> удалит ваши файлы.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Удалить подключение</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Открыть папку</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Выйти</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Возобновить синхронизацию</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Приостановить синхронизацию</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%1 из %2 используется</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <source>Currently there is no storage usage information available.</source> <translation>В данный момент информация о заполненности хранилища недоступна.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>Нет настроенного подключения %1.</translation> </message> @@ -791,41 +796,41 @@ <translation>Журнал синхронизации</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <source>Could not read system exclude file</source> <translation>Невозможно прочесть системный файл исключений</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation>Добавлен каталог из внешнего хранилища. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -838,7 +843,7 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -849,7 +854,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a Если вы решили удалить файлы, они станут вам недоступны, крмое случая, когда вы сам владелец.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -858,39 +863,39 @@ If this was an accident and you decide to keep your files, they will be re-synce Если это произошло случайно и вы решите сохранить файлы, они будут перезакачаны с сервера.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Удалить все файлы?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Удалить все файлы</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Сохранить файлы</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> <translation>Эта синхронизация собирается сбросить файлы в катлоге '%1' в более ранее состояние. Такое может случиться, если на сервере восстановлена резервная копия. Если продолжать синхронизацию как обычно, то ваши файлы будут перетёрты более старыми версиями. Хотите сохранить ваши локальные свежие файлы в качестве конфликтных?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Обнаружена резервная копия</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Обычная синхронизация</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>Сохранить локальные файлы как конфликтующие</translation> </message> @@ -1011,7 +1016,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Синхронизация с локальным каталогом</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Файл</translation> </message> @@ -1169,7 +1174,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation>Эта проблема обычно связана с механизмом оповещений inotify. Подробнее - см. FAQ.</translation> </message> @@ -2499,7 +2504,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Закачка %1 превышает квоту для каталога</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Ошибка записи метаданных в базу данных</translation> </message> @@ -3441,12 +3446,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Не разрешается, так как у вас нет полномочий на добавление файлов в эту папку</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>На сервере недостаточно места для некоторых закачек.</translation> </message> diff --git a/translations/client_sk.ts b/translations/client_sk.ts index 26c815dd4..1029088fc 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Zrušiť</translation> </message> @@ -165,204 +165,209 @@ <translation>Spojené z <server> ako <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Žiadny účet nie je nastavený.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Pridať nový účet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Odobrať</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Účet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Vybrať čo synchronizovať</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Vynútiť synchronizáciu teraz</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Odstrániť prepojenie priečinka</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Vytvorenie priečinka zlyhalo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Nemožno vytvoriť lokálny priečinok <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Potvrdiť odstránenie prepojenia priečinka</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Odstrániť prepojenie priečinka</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Prebiehajúca synchronizácia</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Proces synchronizácie práve prebieha.<br/>Chcete ho ukončiť?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 sa používa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 ako <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Pripojené k %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 je dočasne nedostupný.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>Odhlásený z %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>Žiadne pripojenie k %1 na %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Prihlásiť sa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Potvrďte ostránenie účtu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>Naozaj chcete odstrániť pripojenie k účtu <i>%1</i>?</p><p><b>Poznámka:</b> Tým sa <b>nevymažú</b> žiadne súbory.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Vymazať pripojenie</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Otvoriť priečinok</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Odhlásiť</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Obnoviť synchronizáciu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Pozastaviť synchronizáciu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <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="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <source>Currently there is no storage usage information available.</source> <translation>Teraz nie sú k dispozícii žiadne informácie o využití úložiska.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>Žiadne nakonfigurované %1 spojenie</translation> </message> @@ -791,39 +796,39 @@ <translation>Aktivita synchronizácie</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <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="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -832,7 +837,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -840,46 +845,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Odstrániť všetky súbory?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Odstrániť všetky súbory</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Ponechať súbory</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Záloha je dostupná</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Bežná synchronizácia</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>Ponechať lokálne súbory ako konfliktné</translation> </message> @@ -1000,7 +1005,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Synchronizujem lokálny priečinok</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Súbor</translation> </message> @@ -1158,7 +1163,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2479,7 +2484,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Chyba pri zápise metadát do databázy</translation> </message> @@ -3421,12 +3426,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> diff --git a/translations/client_sl.ts b/translations/client_sl.ts index 550245e9a..bfcd1a0e8 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Prekliči</translation> </message> @@ -165,204 +165,209 @@ <translation>Vzpostavljena je povezava s strežnikom <server> kot <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Ni nastavljenega računa.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Dodaj novo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Odstrani</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Račun</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Izbor predmetov za usklajevanje</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Vsili takojšnje usklajevanje</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Ponovno zaženi usklajevanje</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Odstrani povezavo mape usklajevanja</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Ustvarjanje mape je spodletelo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Ni mogoče ustvariti krajevne mape <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Potrdi odstranjevanje povezave usklajevanja mape</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Odstrani povezavo usklajevanja mape</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Usklajevanje je v teku</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Izvaja se usklajevanje.<br/>Ali želite opravilo prekiniti?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 v uporabi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 kot <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Povezano z %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>Strežnik %1 trenutno ni dosegljiv.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Strežnik %1 je trenutno v vzdrževalnem načinu.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>Uspešno odjavljeno iz %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Poteka pridobivanje overitve brskalnika. <a href='%1'>Kliknite</a> za ponovno odpiranje brskalnika.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>Poteka vzpostavljanje povezave s strežnikom %1 ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>Ni povezave z %1 pri %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Prijava</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Zaznane so mape, ki zaradi pripadnosti zunanji shrambi niso bile usklajene: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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 pripadnosti zunanji shrambi niso bile usklajene: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Potrdi odstranitev računa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>Ali res želite odstraniti povezavo z računom <i>%1</i>?</p><p><b>Opomba:</b> S tem <b>ne bo</b> izbrisana nobena datoteka.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Odstrani povezavo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Odpri mapo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Odjava</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Nadaljuj z usklajevanjem</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Premor usklajevanja</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%1 od %2 v uporabi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <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="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>Ni nastavljene povezave %1.</translation> </message> @@ -791,41 +796,41 @@ <translation>Dejavnost usklajevanja</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <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="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <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="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Med nastavitvami jo lahko izberete in označite za prejem.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -834,7 +839,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -845,7 +850,7 @@ V kolikor se odločite te datoteke ohraniti, in so na voljo ustrezna dovoljenja, Nasprotno, če potrdite izbris in niste lastnik datotek, te ne bodo več na voljo.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -854,22 +859,22 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom? Če je prišlo do napake in se odločite datoteke ohraniti, bodo te ponovno usklajene s strežnika.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Ali naj bodo odstranjene vse datoteke?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Odstrani vse datoteke</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Ohrani datoteke</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> @@ -878,17 +883,17 @@ To se lahko zgodi, če je na strežniku na primer obnovljena varnostna kopija. Z nadaljevanjem usklajevanja bodo vse trenutne datoteke prepisane s starejšimi različicami. Ali želite ohraniti trenutne krajevne datoteke kot preimenovane datoteke v usklajevalnem sporu?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Varnostna kopija je zaznana</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Običajno usklajevanje</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>Ohrani krajevne datoteke kot datoteke v sporu</translation> </message> @@ -1009,7 +1014,7 @@ Z nadaljevanjem usklajevanja bodo vse trenutne datoteke prepisane s starejšimi <translation>Poteka usklajevanje s krajevno mapo</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Datoteka</translation> </message> @@ -1167,7 +1172,7 @@ Z nadaljevanjem usklajevanja bodo vse trenutne datoteke prepisane s starejšimi <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2490,7 +2495,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation> </message> @@ -3432,12 +3437,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Dejanje ni dovoljeno, ker ni ustreznih dovoljenj za dodajanje datotek v to mapo</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> diff --git a/translations/client_sr.ts b/translations/client_sr.ts index 4311d994d..df922b51b 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Одустани</translation> </message> @@ -165,204 +165,209 @@ <translation>Повезан са <server> као <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Није подешен налог.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Додај нови</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Уклони</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Налог</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Изаберите шта синхронизовати</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Прављење фасцикле није успело</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Не могу да направим локалну фасциклу <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Синхронизација у току</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Синхронизација је у току.<br/>Желите ли да је прекинете?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 искоришћено</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 као <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Повезан са %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>Сервер %1 је привремено недоступан.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>Одјављен са %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Пријава</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Потврда уклањања налога</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Уклони везу</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Отвори фасциклу</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Одјава</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Настави синхронизацију</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Паузирај синхронизацију</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%1% од %2 искоришћено</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <source>Currently there is no storage usage information available.</source> <translation>Тренутно нема доступних података о заузећу складишта.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>Нема подешене %1 везе.</translation> </message> @@ -791,39 +796,39 @@ <translation>Активност синхронизације</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <source>Could not read system exclude file</source> <translation>Не могу да прочитам системски списак за игнорисање</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -832,7 +837,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -840,46 +845,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Уклонити све фајлове?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Уклони све фајлове</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Остави фајлове</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation type="unfinished"/> </message> @@ -1000,7 +1005,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Фајл</translation> </message> @@ -1158,7 +1163,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2479,7 +2484,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation type="unfinished"/> </message> @@ -3421,12 +3426,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> diff --git a/translations/client_sv.ts b/translations/client_sv.ts index 2370e78fc..3eb2a21d0 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -165,204 +165,209 @@ <translation>Ansluten till <server> som <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Inget konto är konfigurerat.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Lägg till ny</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Radera</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Konto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Välj vad som ska synkas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Tvinga synkning</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Starta om synkning</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Ta bort anslutning till mappsynkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Kunde inte skapa mappen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Kunde inte skapa lokal mapp <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Bekräfta radering av anslutning till mappsynkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Ta bort anslutning till mappsynkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Synkronisering pågår</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>En synkronisering pågår.<br/>Vill du avbryta den?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 används</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 som <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Ansluten till %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>Servern %1 är för tillfället inte tillgänglig.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Servern %1 är för närvarande i underhållsläge.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>Utloggad från %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Anskaffar autentisering från webbläsaren. <a href='%1'>Klicka här </a> för att öppna webbläsaren igen.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>Ansluter till %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>Ingen anslutning till %1 vid %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Logga in</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Bekräfta radering an kontot</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>Vill du verkligen avsluta anslutningen till kontot <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="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Radera anslutning</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Öppna mapp</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Logga ut</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Återuppta synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Pausa synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%1 av %2 används</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <source>Currently there is no storage usage information available.</source> <translation>Just nu finns ingen utrymmes information tillgänglig</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>Ingen %1 anslutning konfigurerad.</translation> </message> @@ -791,41 +796,41 @@ <translation>Synk aktivitet</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <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="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <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="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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 ladda ner den.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -834,7 +839,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -842,29 +847,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Ta bort alla filer?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Ta bort alla filer</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Behåll filer</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> @@ -873,17 +878,17 @@ Detta kan vara för att en säkerhetskopia har återställts på servern. Om du fortsätter synkningen kommer alla dina filer återställas med en äldre version av filen. Vill du behålla dina nyare lokala filer som konfliktfiler?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Backup upptäckt</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Normal synkronisation</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>Behåll lokala filer som konflikt</translation> </message> @@ -1004,7 +1009,7 @@ Om du fortsätter synkningen kommer alla dina filer återställas med en äldre <translation>Synkroniserar med lokal mapp</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Fil</translation> </message> @@ -1162,7 +1167,7 @@ Om du fortsätter synkningen kommer alla dina filer återställas med en äldre <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2485,7 +2490,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Uppladdningen av %1 överstiger kvoten för mappen</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Fel vid skrivning av metadata till databasen</translation> </message> @@ -3427,12 +3432,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Otillåtet eftersom du inte har rättigheter att lägga till filer i den mappen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Diskutrymmet är lågt: Nedladdningar som reduceringar det fria utrymmet under %1 skippades.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <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> diff --git a/translations/client_th.ts b/translations/client_th.ts index 3bffabac7..fa973fb8e 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>ยกเลิก</translation> </message> @@ -165,204 +165,209 @@ <translation>เชื่อมต่อกับ <server> ด้วยผู้ใช้ <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>ไม่มีการกำหนดค่าบัญชี</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>เพิ่มใหม่</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>ลบออก</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>บัญชี</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>เลือกข้อมูลที่ต้องการประสาน</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>บังคับประสานข้อมูลเดี๋ยวนี้</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>ประสานข้อมูลอีกครั้ง</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>ลบโฟลเดอร์ที่ประสานข้อมูลออก</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>สร้างโฟลเดอร์ล้มเหลว</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>ไม่สามารถสร้างโฟลเดอร์ต้นทาง <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>ยืนยันการลบโฟลเดอร์ที่ประสานข้อมูลออก</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>ลบโฟลเดอร์ที่ประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>กำลังประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>กำลังดำเนินการประสานข้อมูลอยู่ <br/>คุณต้องการสิ้นสุดการทำงาน?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 กำลังถูกใช้งาน</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 เช่น <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>เชื่อมต่อกับ %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>เซิร์ฟเวอร์ %1 ไม่สามารถใช้ได้ชั่วคราว</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>เซิร์ฟเวอร์ %1 กำลังอยู่ในโหมดการบำรุงรักษา</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>ลงชื่อออกจาก %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>กำลังได้รับอนุญาตจากเบราเซอร์ <a href='%1'>คลิกที่นี่</a> เพื่อเปิดเบราเซอร์อีกครั้ง</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>กำลังเชื่อมต่อไปยัง %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>ไม่มีการเชื่อมต่อไปยัง %1 ที่ %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>เข้าสู่ระบบ</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>ยืนยันการลบบัญชี</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>คุณต้องการลบการเชื่อมต่อกับบัญชี<i>%1</i>?</p><p><b>หมายเหตุ:</b> นี้จะ <b>ไม่</b> ลบไฟล์ใดๆ</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>ลบการเชื่อมต่อ</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>เปิดโฟลเดอร์</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>ออกจากระบบ</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>ประสานข้อมูลอีกครั้ง</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>หยุดประสานข้อมูลชั่วคราว</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>มีการใช้งาน %1 จาก %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <source>Currently there is no storage usage information available.</source> <translation>ขณะนี้ไม่มีพื้นที่จัดเก็บข้อมูลที่ใช้งานได้</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>ไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation> </message> @@ -791,41 +796,41 @@ <translation>ความเคลื่อนไหวของการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <source>Could not read system exclude file</source> <translation>ไม่สามารถอ่าน ยกเว้นไฟล์ระบบ</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation>โฟลเดอร์ที่มีพื้นที่จัดเก็บข้อมูลภายนอกได้ถูกเพิ่ม </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -836,7 +841,7 @@ This means that the synchronization client might not upload local changes immedi หมายความว่าการประสานข้อมูลของไคลเอ็นต์อาจยังไม่ได้อัพโหลดการเปลี่ยนแปลงในระบบทันทีและจะสแกนเฉพาะการเปลี่ยนแปลงที่ต้นทางและอัพโหลดไฟล์เหล่านั้นเป็นครั้งคราว (ทุกสองชั่วโมงตามค่าเริ่มต้น)</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -847,7 +852,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a หากคุณตัดสินใจที่จะลบไฟล์ก็จะทำให้ไม่มีใครสามารถใช้งานโฟลเดอร์นี้ได้เพราะคุณเป็นเจ้าของ</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -857,22 +862,22 @@ If this was an accident and you decide to keep your files, they will be re-synce ถ้าเรื่องนี้เป็นอุบัติเหตุและคุณตัดสินใจที่จะเก็บไฟล์ของคุณ ไฟล์ของคุณก็จะถูกประสานข้อมูลใหม่อีกครั้ง</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>ลบไฟล์ทั้งหมด?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>ลบไฟล์ทั้งหมด</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>เก็บไฟล์เอาไว้</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> @@ -881,17 +886,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an ไฟล์ปัจจุบันของคุณทั้งหมดจะถูกเขียนทับด้วยไฟล์เก่า คุณต้องการเก็บไฟล์ไว้?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>ตรวจพบการสำรองข้อมูล</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>ประสานข้อมูลปกติ</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>เก็บไฟล์ต้นทางเป็นไฟล์ที่มีปัญหา</translation> </message> @@ -1012,7 +1017,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>กำลังประสานข้อมูลกับโฟลเดอร์ต้นทาง</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>ไฟล์</translation> </message> @@ -1170,7 +1175,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation>ปัญหานี้มักเกิดขึ้นเมื่อใช้ inotify watches ครบจำนวน ตรวจสอบรายละเอียดเพิ่มเติมได้ที่ คำถามที่พบบ่อย</translation> </message> @@ -2500,7 +2505,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>การอัพโหลด %1 เกินโควต้าของโฟลเดอร์</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล</translation> </message> @@ -3441,12 +3446,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ไม่ได้รับอนุญาต เพราะคุณไม่มีสิทธิ์ที่จะเพิ่มไฟล์ในโฟลเดอร์นั้น</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>มีพื้นที่ว่างไม่เพียงพอบนเซิร์ฟเวอร์สำหรับการอัพโหลดบางรายการ</translation> </message> diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 3211a5891..b33143388 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>İptal</translation> </message> @@ -165,204 +165,209 @@ <translation><server> ile <user> olarak bağlantı kuruldu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Hiçbir hesap yapılandırılmamış.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Yeni ekle</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Kaldır</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Hesap</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Ne eşitleneceğini seçin</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Şimdi eşitlemeye zorla</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Eşitlemeyi yeniden başlat</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>Klasör eşitleme bağlantısını sil</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Klasör oluşturma başarısız oldu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p><i>%1</i> yerel klasörü oluşturulamadı.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Klasör Eşitleme Bağlantısının Silinmesini Onaylayın</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>Klasör Eşitleme Bağlantısını Sil</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Eşitleme Çalışıyor</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Eşitleme işlemi devam ediyor.<br/>Durdurmak istiyor musunuz?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 kullanımda</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>%1 ile bağlı.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>%1 sunucusu geçici olarak ulaşılamaz durumda.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>%1 oturumu sonlandırıldı.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>%1 ile %2 bağlantısı yok.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Giriş yap</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Harici depolama diskinde oldukları için eşitlenmeyen klasörler var:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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 harici depolama alanında oldukları için eşitlenmeyen klasörler var:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Hesap Silinmesini Onaylayın</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p><i>%1</i> hesabının bağlantısını kaldırmayı gerçekten istiyor musunuz?</p><p><b>Not:</b> Bu işlem herhangi bir dosyayı <b>silmeyecektir</b>.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>Bağlantıyı kaldır</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Klasörü aç</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Çıkış yap</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Eşitlemeye devam et</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Eşitlemeyi duraklat</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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 durdurmayı gerçekten istiyor musunuz?</p><p><b>Not:</b> Bu işlem herhangi bir dosyayı <b>silmeyecektir</b>.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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ğdan bağlanmış veya paylaşılan dizinlerin farklı sınırları olabilir.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>%1 / %2 kullanımda</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <source>Currently there is no storage usage information available.</source> <translation>Şu anda depolama kullanım bilgisi mevcut değil.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>Hiç %1 bağlantısı yapılandırılmamış.</translation> </message> @@ -791,39 +796,39 @@ <translation>Eşitleme Etkinliği</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <source>Could not read system exclude file</source> <translation>Sistem hariç tutulma dosyası okunamadı</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -832,7 +837,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -840,46 +845,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Tüm Dosyalar Kaldırılsın mı?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Tüm dosyaları kaldır</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Dosyaları koru</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Yedek bulundu</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>Normal Eşitleme</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>Çakışma Durumunda Yerel Dosyaları Tut</translation> </message> @@ -1000,7 +1005,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Yerel klasör ile eşitleniyor</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Dosya</translation> </message> @@ -1158,7 +1163,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2480,7 +2485,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>Veritabanına üstveri yazma hatası</translation> </message> @@ -3422,12 +3427,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Bu klasöre dosya ekleme yetkiniz olmadığından izin verilmedi</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 844a9d2e5..9759a4c6b 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>Скасувати</translation> </message> @@ -165,204 +165,209 @@ <translation>Підключено до <server> як <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>Обліковий запис не налаштовано.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>Додати</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Видалити</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Обліковий запис</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>Оберіть, що хочете синхронізувати</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>Примусово синхронізувати зараз</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>Перезапустити синхронізацію</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>Не вдалося створити теку</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>Виконується синхронізація</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Виконується процедура синхронізації.<br/>Бажаєте зупинити?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 використовується</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 як <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>Підключено до %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>Сервер %1 тимчасово недоступний.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>З'єднання з %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>Увійти</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>Підтвердіть видалення облікового запису</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>Відкрити каталог</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>Вихід</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>Відновити синхронізацію</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>Призупинити синхронізацію</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>Використовується %1 з %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <source>Currently there is no storage usage information available.</source> <translation>На даний час немає відомостей про наповнення сховища.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>Жодного %1 підключення не налаштовано.</translation> </message> @@ -791,39 +796,39 @@ <translation>Журнал синхронізації</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <source>Could not read system exclude file</source> <translation>Неможливо прочитати виключений системний файл</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -832,7 +837,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -840,46 +845,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>Видалити усі файли?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>Видалити усі файли</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>Зберегти файли</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>Резервну копію знайдено</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation type="unfinished"/> </message> @@ -1000,7 +1005,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Синхронізується з локальною текою</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>Файл</translation> </message> @@ -1158,7 +1163,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2478,7 +2483,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation type="unfinished"/> </message> @@ -3420,12 +3425,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index d59fb31ed..786436025 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>取消</translation> </message> @@ -165,204 +165,209 @@ <translation><user> 已经连接到 <server> </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>没有配置的帐号。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>添加</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>移除</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>账户</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>选择同步内容</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>强制同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>重新开始同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>断开文件夹同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>文件夹创建失败</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>无法创建文件夹 <i>%1</i>。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>确定断开文件夹同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>断开文件夹同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>正在同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>正在执行同步。<br />您确定要关闭它吗？</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 使用中</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1, <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>连接到 %1。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>远程服务器%1暂时不可用。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>服务器%1处于维护模式。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>从 %1 退出</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>从浏览器获取权限。<a href='%1'>点击此按钮</a>重启浏览器。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>正在连接到 %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>没有到位于%2中的%1的连接</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>登录</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>确认删除账号</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>你确定要删除账号的连接？ <i>%1</i>?</p><p><b>Note:</b> 这 <b>不会</b> 删除任何文件</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>删除连接</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>打开文件夹</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>注销</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>恢复同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>暂停同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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>Note:</b> 这 <b>不会</b> 删除任何文件</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>使用量 %1 / %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <source>Currently there is no storage usage information available.</source> <translation>目前没有储存使用量信息可用。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>没有 %1 连接配置。</translation> </message> @@ -791,41 +796,41 @@ <translation>同步活动</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <source>Could not read system exclude file</source> <translation>无法读取系统排除的文件</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation>一个来自外部存储的文件夹已被添加。 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -834,7 +839,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -845,7 +850,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a 如果您决定删除这些文件，它们将不再可用，除非您是其所有者。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -854,22 +859,22 @@ If this was an accident and you decide to keep your files, they will be re-synce 如果这是一个意外而您想要保留这些文件，他们会被重新从服务器同步过来。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>删除所有文件？</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>删除所有文件</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>保持所有文件</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> @@ -878,17 +883,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an 继续正常同步将导致您全部文件被更早状态的旧文件覆盖。您想要保留冲突文件的本地最新版本吗？</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation>备份已删除</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation>正常同步</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation>保留本地文件为冲突文件</translation> </message> @@ -1009,7 +1014,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>与本地文件夹同步</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>文件</translation> </message> @@ -1167,7 +1172,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2489,7 +2494,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>向数据库写入元数据错误</translation> </message> @@ -3431,12 +3436,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>你没有权限增加文件</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 6736bd43b..86cc39035 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -154,8 +154,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="454"/> - <location filename="../src/gui/accountsettings.cpp" line="867"/> + <location filename="../src/gui/accountsettings.cpp" line="488"/> + <location filename="../src/gui/accountsettings.cpp" line="901"/> <source>Cancel</source> <translation>取消</translation> </message> @@ -165,204 +165,209 @@ <translation>以 <user> 的身分連接 <server></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="183"/> <source>No account configured.</source> <translation>沒有設置帳號。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="195"/> + <location filename="../src/gui/accountsettings.cpp" line="196"/> <source>Add new</source> <translation>新增</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>移除</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>帳號</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="302"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Choose what to sync</source> <translation>選擇要同步的項目</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="308"/> + <location filename="../src/gui/accountsettings.cpp" line="309"/> <source>Force sync now</source> <translation>強制同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Restart sync</source> <translation>重新啟動同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="319"/> + <location filename="../src/gui/accountsettings.cpp" line="320"/> <source>Remove folder sync connection</source> <translation>移除資料夾同步連線</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="392"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> + <source>Create virtual files for new files (Experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="426"/> <source>Folder creation failed</source> <translation>資料夾建立失敗</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="393"/> + <location filename="../src/gui/accountsettings.cpp" line="427"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>無法建立本地資料夾 <i>%1</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="480"/> <source>Confirm Folder Sync Connection Removal</source> <translation>確認移除資料夾同步連線</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="453"/> + <location filename="../src/gui/accountsettings.cpp" line="487"/> <source>Remove Folder Sync Connection</source> <translation>移除資料夾同步連線</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="535"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> <source>Sync Running</source> <translation>正在同步中</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="536"/> + <location filename="../src/gui/accountsettings.cpp" line="570"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>正在同步中<br/>你真的想要中斷？</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="629"/> + <location filename="../src/gui/accountsettings.cpp" line="663"/> <source>%1 in use</source> <translation>%1 正在使用</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="656"/> + <location filename="../src/gui/accountsettings.cpp" line="690"/> <source>%1 as <i>%2</i></source> <translation>%1 如 <i>%2<i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="664"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source>Connected to %1.</source> <translation>已連線到 %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="666"/> + <location filename="../src/gui/accountsettings.cpp" line="700"/> <source>Server %1 is temporarily unavailable.</source> <translation>伺服器 ％1 暫時無法使用。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="668"/> + <location filename="../src/gui/accountsettings.cpp" line="702"/> <source>Server %1 is currently in maintenance mode.</source> <translation>伺服器 %1 現正處於維護模式</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="704"/> <source>Signed out from %1.</source> <translation>從 %1 登出</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="679"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="683"/> + <location filename="../src/gui/accountsettings.cpp" line="717"/> <source>Connecting to %1...</source> <translation>正在連接到 ％1 ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="686"/> + <location filename="../src/gui/accountsettings.cpp" line="720"/> <source>No connection to %1 at %2.</source> <translation>沒有從 %2 連線到 %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="749"/> <source>Log in</source> <translation>登入</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="810"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="812"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="813"/> + <location filename="../src/gui/accountsettings.cpp" line="847"/> <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="859"/> + <location filename="../src/gui/accountsettings.cpp" line="893"/> <source>Confirm Account Removal</source> <translation>確認移除帳號</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="860"/> + <location filename="../src/gui/accountsettings.cpp" line="894"/> <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><p>您確定要中斷此帳號 <i>%1</i> 的連線?</p><p><b>注意:</b>此操作 <b>不會</b> 刪除任何的檔案。</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="900"/> <source>Remove connection</source> <translation>移除連線</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="298"/> + <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="299"/> <source>Open folder</source> <translation>開啟資料夾</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="717"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Log out</source> <translation>登出</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Resume sync</source> <translation>繼續同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="317"/> <source>Pause sync</source> <translation>暫停同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="447"/> + <location filename="../src/gui/accountsettings.cpp" line="481"/> <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="616"/> + <location filename="../src/gui/accountsettings.cpp" line="650"/> <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="617"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>%1 of %2 in use</source> <translation>已使用 %2 中的 %1%</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="626"/> + <location filename="../src/gui/accountsettings.cpp" line="660"/> <source>Currently there is no storage usage information available.</source> <translation>目前無法查詢儲存空間使用資訊。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="662"/> + <location filename="../src/gui/accountsettings.cpp" line="696"/> <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="692"/> + <location filename="../src/gui/accountsettings.cpp" line="726"/> <source>No %1 connection configured.</source> <translation>沒有 %1 連線設置。</translation> </message> @@ -791,39 +796,39 @@ <translation>同步活動</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="673"/> + <location filename="../src/gui/folder.cpp" line="680"/> <source>Could not read system exclude file</source> <translation>無法讀取系統的排除檔案</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="961"/> + <location filename="../src/gui/folder.cpp" line="968"/> <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="964"/> + <location filename="../src/gui/folder.cpp" line="971"/> <source>A folder from an external storage has been added. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="965"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="1020"/> + <location filename="../src/gui/folder.cpp" line="1027"/> <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="1023"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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="1034"/> + <location filename="../src/gui/folder.cpp" line="1041"/> <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). @@ -832,7 +837,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1079"/> + <location filename="../src/gui/folder.cpp" line="1086"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -840,46 +845,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1091"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1088"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>Remove All Files?</source> <translation>移除所有檔案?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1091"/> + <location filename="../src/gui/folder.cpp" line="1098"/> <source>Remove all files</source> <translation>移除所有檔案</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1092"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Keep files</source> <translation>保留檔案</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1116"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1114"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <source>Backup detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1117"/> + <location filename="../src/gui/folder.cpp" line="1124"/> <source>Normal Synchronisation</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Keep Local Files as Conflict</source> <translation type="unfinished"/> </message> @@ -1000,7 +1005,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="296"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="298"/> <source>File</source> <translation>檔案</translation> </message> @@ -1158,7 +1163,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::FolderWatcherPrivate</name> <message> - <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <location filename="../src/gui/folderwatcher_linux.cpp" line="92"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> <translation type="unfinished"/> </message> @@ -2481,7 +2486,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="624"/> + <location filename="../src/libsync/propagateupload.cpp" line="626"/> <source>Error writing metadata to the database</source> <translation>寫入後設資料(metadata) 時發生錯誤</translation> </message> @@ -3423,12 +3428,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>拒絕此操作，您沒有新增檔案在此資料夾的權限。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1701"/> + <location filename="../src/libsync/syncengine.cpp" line="1731"/> <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="1708"/> + <location filename="../src/libsync/syncengine.cpp" line="1738"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> |