diff --git a/.github/release_template.md b/.github/release_template.md index e823533127a..1973a35880b 100644 --- a/.github/release_template.md +++ b/.github/release_template.md @@ -30,12 +30,12 @@ __TODO__: ### Copy for Each Build (Beta/RC) * [ ] DEV: Tag (Beta or RC) and build [builds](https://confluence.owncloud.com/display/OG/Build+and+Tags#BuildandTags-Sprintbuild) for theme 'ownCloud' and 'testpilotcloud' (includes ChangeLog for the tag on https://github.com/owncloud/client/releases/) -* [ ] Smoke test -* [ ] GitHub release +* [ ] QA: [Smoke test](https://owncloud.testrail.io/index.php?/cases/view/2469) (for public prelease) +* [ ] DEV: GitHub release * [ ] Beta/RC [Communication](https://confluence.owncloud.com/x/loJK) - * [ ] Inform ``#updates`` and ``#marketing`` that we have Beta/RC - * [ ] For public prerelease: Tell marketing to send email to beta testers - * [ ] For public prerelease: Write Central post https://central.owncloud.org/tags/c/news/desktop with link to github release + * [ ] Inform ``#updates`` that we have Beta/RC + * [ ] For public prerelease: Inform ``#marketing`` and tell them to send email to beta testers + * [ ] For public prerelease: Write/edit Central post https://central.owncloud.org/tags/c/news/desktop with link to github release * [ ] DEV: Prepare the update server for new version (AppImages included) * [ ] DEV: Provide 'testpilotcloud' on **Beta** update channel @@ -73,11 +73,12 @@ __TODO__: * [ ] QA: [Smoke test](https://confluence.owncloud.com/display/OG/Manual+Tests#ManualTests-SmokeTest) * [ ] DEV: Publish the release in GitHub +* [ ] QA: Update lines 4 and 5 of [install docs](https://github.com/owncloud/docs-client-desktop/blob/master/modules/ROOT/pages/installing.adoc) with the final build number * [ ] QA: Check that [documentation](https://doc.owncloud.com/desktop/next/) offers the new version ### [Marketing and Communication](https://confluence.owncloud.com/display/OG/Marketing+and+Communication) -* [ ] QA: Ping ``#marketing``: @bwalter to update links on https://owncloud.com/desktop-app/ (provide links from github releases) and @mfeilner to update [wiki de](https://de.wikipedia.org/wiki/OwnCloud), [wiki en](https://en.wikipedia.org/wiki/OwnCloud), [wikidata](https://www.wikidata.org/wiki/Q20763576)) +* [ ] QA: Ping ``#marketing``at marketing@owncloud.com; @bwalter to update links on https://owncloud.com/desktop-app/ (provide links from github releases) and @mfeilner to update [wiki de](https://de.wikipedia.org/wiki/OwnCloud), [wiki en](https://en.wikipedia.org/wiki/OwnCloud), [wikidata](https://www.wikidata.org/wiki/Q20763576)) * [ ] QA: Central post https://central.owncloud.org/tags/c/news/desktop * [ ] QA: Inform on ``#updates`` channel * [ ] QA: Inform [packagers](https://confluence.owncloud.com/x/QYLEAg) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c9cabfd06e..490a9583ce8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,11 @@ Summary ------- * Bugfix - Crash when accepting a notification: [#11226](https://github.com/owncloud/client/issues/11226) +* Bugfix - Fix crash on start-up when starting shell integration: [#11280](https://github.com/owncloud/client/issues/11280) +* Bugfix - Properly schedule the sync after an account was added: [#11308](https://github.com/owncloud/client/issues/11308) +* Bugfix - Don't start credentials save jobs during shutdown: [#11313](https://github.com/owncloud/client/pull/11313) * Change - Remove unused command line option --language: [#11245](https://github.com/owncloud/client/issues/11245) +* Change - Windows: always use fusion style: [#11275](https://github.com/owncloud/client/issues/11275) Details ------- @@ -20,6 +24,30 @@ Details https://github.com/owncloud/client/issues/11226 +* Bugfix - Fix crash on start-up when starting shell integration: [#11280](https://github.com/owncloud/client/issues/11280) + + A possible crash has been fixed that could occur during start-up, when the shell integration + started doing requests before the client itself completed starting up. + + https://github.com/owncloud/client/issues/11280 + https://github.com/owncloud/client/pull/11288 + +* Bugfix - Properly schedule the sync after an account was added: [#11308](https://github.com/owncloud/client/issues/11308) + + We fixed a bug where a folder was scheduled to be synced before the account reported it was ready. + This resulted in the sync having no effect and the folder was then only synced once we polled the + etag. + + https://github.com/owncloud/client/issues/11308 + +* Bugfix - Don't start credentials save jobs during shutdown: [#11313](https://github.com/owncloud/client/pull/11313) + + Due to a bug we "re saved" the credentials during application shutdown. As the application was + quitting while the jobs where running we might have encountered corruped credentials or + crashes. + + https://github.com/owncloud/client/pull/11313 + * Change - Remove unused command line option --language: [#11245](https://github.com/owncloud/client/issues/11245) This option was used before the UI language could be chosen in the settings. The option @@ -28,6 +56,14 @@ Details https://github.com/owncloud/client/issues/11245 https://github.com/owncloud/client/pull/11270 +* Change - Windows: always use fusion style: [#11275](https://github.com/owncloud/client/issues/11275) + + We already used the fusion style on Windows for years if the system used dpi scaling. Since Qt6.5 + the fusion style also support the dark theme on Windows. Those two reasons convinced us that + always using the fusion style on Windows will result in the best experience for the users. + + https://github.com/owncloud/client/issues/11275 + Changelog for ownCloud Desktop Client [5.0.0] (2023-10-05) ======================================= The following sections list the changes in ownCloud Desktop Client 5.0.0 relevant to diff --git a/changelog/unreleased/11275 b/changelog/unreleased/11275 new file mode 100644 index 00000000000..7138e519044 --- /dev/null +++ b/changelog/unreleased/11275 @@ -0,0 +1,8 @@ +Change: Windows: always use fusion style + +We already used the fusion style on Windows for years if the system used dpi scaling. +Since Qt6.5 the fusion style also support the dark theme on Windows. +Those two reasons convinced us that always using the fusion style on Windows will result +in the best experience for the users. + +https://github.com/owncloud/client/issues/11275 diff --git a/changelog/unreleased/11288 b/changelog/unreleased/11288 new file mode 100644 index 00000000000..a7fe47e890a --- /dev/null +++ b/changelog/unreleased/11288 @@ -0,0 +1,8 @@ +Bugfix: Fix crash on start-up when starting shell integration + +A possible crash has been fixed that could occur during start-up, when +the shell integration started doing requests before the client itself +completed starting up. + +https://github.com/owncloud/client/issues/11280 +https://github.com/owncloud/client/pull/11288 diff --git a/changelog/unreleased/11308 b/changelog/unreleased/11308 new file mode 100644 index 00000000000..7508d38fe7d --- /dev/null +++ b/changelog/unreleased/11308 @@ -0,0 +1,6 @@ +Bugfix: Properly schedule the sync after an account was added + +We fixed a bug where a folder was scheduled to be synced before the account reported it was ready. +This resulted in the sync having no effect and the folder was then only synced once we polled the etag. + +https://github.com/owncloud/client/issues/11308 diff --git a/changelog/unreleased/11313 b/changelog/unreleased/11313 new file mode 100644 index 00000000000..91f8710af0f --- /dev/null +++ b/changelog/unreleased/11313 @@ -0,0 +1,6 @@ +Bugfix: Don't start credentials save jobs during shutdown + +Due to a bug we "re saved" the credentials during application shutdown. +As the application was quitting while the jobs where running we might have encountered corruped credentials or crashes. + +https://github.com/owncloud/client/pull/11313 diff --git a/src/crashreporter/main.cpp b/src/crashreporter/main.cpp index ac520b2a61f..911811a18db 100644 --- a/src/crashreporter/main.cpp +++ b/src/crashreporter/main.cpp @@ -27,14 +27,7 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); #ifdef Q_OS_WIN - // The Windows style still has pixelated elements with Qt 5.6, - // it's recommended to use the Fusion style in this case, even - // though it looks slightly less native. Check here after the - // QApplication was constructed, but before any QWidget is - // constructed. - if (!qFuzzyCompare(app.devicePixelRatio(), 1)) { - QApplication::setStyle(QStringLiteral("fusion")); - } + QApplication::setStyle(QStringLiteral("fusion")); #endif // Q_OS_WIN if (app.arguments().size() != 2) { diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index 23a42270653..8a7248b8542 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -828,9 +828,10 @@ void AccountSettings::slotAccountStateChanged() _toggleSignInOutAction->setText(tr("Log out")); } - ui->addButton->setEnabled(state == AccountState::Connected); if (state == AccountState::Connected) { ui->_folderList->setItemsExpandable(true); + ui->addButton->setEnabled(true); + if (_accountState->supportsSpaces()) { ui->addButton->setText(tr("Add Space")); ui->addButton->setToolTip(tr("Click this button to add a Space.")); @@ -840,8 +841,15 @@ void AccountSettings::slotAccountStateChanged() } } else { ui->_folderList->setItemsExpandable(false); - ui->addButton->setText(tr("Add Folder")); - ui->addButton->setToolTip(tr("You need to be connected to add a folder.")); + ui->addButton->setEnabled(false); + + if (_accountState->supportsSpaces()) { + ui->addButton->setText(tr("Add Space")); + ui->addButton->setToolTip(tr("You need to be connected to add a Space.")); + } else { + ui->addButton->setText(tr("Add Folder")); + ui->addButton->setToolTip(tr("You need to be connected to add a folder.")); + } /* check if there are expanded root items, if so, close them */ ui->_folderList->collapseAll(); diff --git a/src/gui/application.cpp b/src/gui/application.cpp index f25d1dd8b0f..a16007f3781 100644 --- a/src/gui/application.cpp +++ b/src/gui/application.cpp @@ -171,7 +171,7 @@ void Application::slotAccountStateAdded(AccountStatePtr accountState) const }); // Hook up the folder manager slots to the account state's signals: - connect(accountState.data(), &AccountState::stateChanged, FolderMan::instance(), &FolderMan::slotAccountStateChanged); + connect(accountState.data(), &AccountState::isConnectedChanged, FolderMan::instance(), &FolderMan::slotIsConnectedChanged); connect(accountState->account().data(), &Account::serverVersionChanged, FolderMan::instance(), [account = accountState->account().data()] { FolderMan::instance()->slotServerVersionChanged(account); }); accountState->checkConnectivity(); @@ -183,7 +183,10 @@ void Application::slotCleanup() _gui->slotShutdown(); delete _gui; - AccountManager::instance()->save(); + // by now the credentials are supposed to be persisted + // don't start async credentials jobs during shutdown + AccountManager::instance()->save(false); + FolderMan::instance()->unloadAndDeleteAllFolders(); // Remove the account from the account manager so it can be deleted. diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp index e2b05b0fc44..44b78776d18 100644 --- a/src/gui/folderman.cpp +++ b/src/gui/folderman.cpp @@ -365,7 +365,7 @@ void FolderMan::slotSyncOnceFileUnlocks(const QString &path, FileSystem::LockMod _lockWatcher->addFile(path, mode); } -void FolderMan::slotAccountStateChanged() +void FolderMan::slotIsConnectedChanged() { AccountStatePtr accountState(qobject_cast(sender())); if (!accountState) { diff --git a/src/gui/folderman.h b/src/gui/folderman.h index be61c96664f..7a202fdb9bb 100644 --- a/src/gui/folderman.h +++ b/src/gui/folderman.h @@ -251,7 +251,7 @@ public slots: * Schedules folders of newly connected accounts, terminates and * de-schedules folders of disconnected accounts. */ - void slotAccountStateChanged(); + void slotIsConnectedChanged(); /** * restart the client as soon as it is possible, ie. no folders syncing. diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 1629f0ea91b..13b4d5c4ae7 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -26,6 +26,7 @@ #include "common/version.h" #include "gui/translations.h" #include "libsync/logger.h" +#include "socketapi/socketapi.h" #include @@ -470,7 +471,7 @@ int main(int argc, char **argv) return -1; } - FolderMan::instance()->setSyncEnabled(true); + folderManager->setSyncEnabled(true); auto ocApp = Application::createInstance(platform.get(), displayLanguage, options.debugMode); @@ -523,5 +524,8 @@ int main(int argc, char **argv) QTimer::singleShot(0, ocApp->gui(), &ownCloudGui::runNewAccountWizard); } + // Now that everything is up and running, start accepting connections/requests from the shell integration. + folderManager->socketApi()->startShellIntegration(); + return app.exec(); } diff --git a/src/gui/scheduling/etagwatcher.cpp b/src/gui/scheduling/etagwatcher.cpp index 676bcdfc693..61e3dabe1b0 100644 --- a/src/gui/scheduling/etagwatcher.cpp +++ b/src/gui/scheduling/etagwatcher.cpp @@ -83,11 +83,13 @@ void ETagWatcher::updateEtag(Folder *f, const QString &etag) if (OC_ENSURE_NOT(etag.isEmpty())) { auto &info = _lastEtagJob[f]; if (f->canSync() && info.etag != etag) { - qCDebug(lcEtagWatcher) << "Scheduling sync of" << f->displayName() << "due to an etag change"; + qCDebug(lcEtagWatcher) << "Scheduling sync of" << f->displayName() << f->path() << "due to an etag change"; info.etag = etag; _folderMan->scheduler()->enqueueFolder(f); } info.lastUpdate.reset(); + } else { + qCWarning(lcEtagWatcher) << "Invalid empty etag received for" << f->displayName() << f->path(); } } @@ -102,11 +104,15 @@ void ETagWatcher::startOC10EtagJob(Folder *f) requestEtagJob->setTimeout(pollTimeoutC); connect(requestEtagJob, &RequestEtagJob::finishedSignal, this, [requestEtagJob, f, this] { if (requestEtagJob->httpStatusCode() == 207) { - updateEtag(f, requestEtagJob->etag()); - f->accountState()->tagLastSuccessfullETagRequest(requestEtagJob->responseQTimeStamp()); + if (OC_ENSURE_NOT(requestEtagJob->etag().isEmpty())) { + f->accountState()->tagLastSuccessfullETagRequest(requestEtagJob->responseQTimeStamp()); + updateEtag(f, requestEtagJob->etag()); + } else { + qCWarning(lcEtagWatcher) << "Invalid empty etag received for" << f->displayName() << f->path() << requestEtagJob; + } } }); - qCDebug(lcEtagWatcher) << "Starting etag check for folder" << f->displayName(); + qCDebug(lcEtagWatcher) << "Starting etag check for folder" << f->displayName() << f->path(); requestEtagJob->start(); } } diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp index fde0417ddfe..eb5c103a29e 100644 --- a/src/gui/socketapi/socketapi.cpp +++ b/src/gui/socketapi/socketapi.cpp @@ -140,22 +140,21 @@ SocketApi::SocketApi(QObject *parent) qRegisterMetaType>("QSharedPointer"); qRegisterMetaType>("QSharedPointer"); - const QString socketPath = Utility::socketApiSocketPath(); + _socketPath = Utility::socketApiSocketPath(); // Remove any old socket that might be lying around: - SocketApiServer::removeServer(socketPath); + SocketApiServer::removeServer(_socketPath); // Create the socket path: if (!Utility::isMac()) { // Not on macOS: there the directory is there, and created for us by the sandboxing // environment, because we belong to an App Group. - QFileInfo info(socketPath); + QFileInfo info(_socketPath); if (!info.dir().exists()) { bool result = info.dir().mkpath(QStringLiteral(".")); qCDebug(lcSocketApi) << "creating" << info.dir().path() << result; if (result) { - QFile::setPermissions(socketPath, - QFile::Permissions(QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner)); + QFile::setPermissions(_socketPath, QFile::Permissions(QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner)); } } } @@ -163,16 +162,6 @@ SocketApi::SocketApi(QObject *parent) // Wire up the server instance to us, so we can accept new connections: connect(&_localServer, &SocketApiServer::newConnection, this, &SocketApi::slotNewConnection); - // Start listeneing: - if (_localServer.listen(socketPath)) { - qCInfo(lcSocketApi) << "server started, listening at " << socketPath; - } else { - qCWarning(lcSocketApi) << "can't start server" << socketPath; - } - - // Now we're ready to start the native shell integration: - Utility::startShellIntegration(); - connect(AccountManager::instance(), &AccountManager::accountRemoved, this, [this](const auto &accountState) { if (_registeredAccounts.contains(accountState->account())) { unregisterAccount(accountState->account()); @@ -189,6 +178,19 @@ SocketApi::~SocketApi() _listeners.clear(); } +void SocketApi::startShellIntegration() +{ + // Start listeneing: + if (_localServer.listen(_socketPath)) { + qCInfo(lcSocketApi) << "server started, listening at " << _socketPath; + } else { + qCWarning(lcSocketApi) << "can't start server" << _socketPath; + } + + // Now we're ready to start the native shell integration: + Utility::startShellIntegration(); +} + void SocketApi::slotNewConnection() { // Note that on macOS this is not actually a line-based QIODevice, it's a SocketApiSocket which is our diff --git a/src/gui/socketapi/socketapi.h b/src/gui/socketapi/socketapi.h index 527873e3de1..b136366f00c 100644 --- a/src/gui/socketapi/socketapi.h +++ b/src/gui/socketapi/socketapi.h @@ -53,6 +53,8 @@ class SocketApi : public QObject explicit SocketApi(QObject *parent = nullptr); ~SocketApi() override; + void startShellIntegration(); + public slots: void registerAccount(const AccountPtr &a); void unregisterAccount(const AccountPtr &a); @@ -155,6 +157,7 @@ private slots: QString buildRegisterPathMessage(const QString &path); + QString _socketPath; QSet _registeredFolders; QSet _registeredAccounts; QMap> _listeners; diff --git a/src/libsync/creds/credentialmanager.cpp b/src/libsync/creds/credentialmanager.cpp index 957b3dab72d..eef7abbb05b 100644 --- a/src/libsync/creds/credentialmanager.cpp +++ b/src/libsync/creds/credentialmanager.cpp @@ -19,6 +19,7 @@ using namespace OCC; Q_LOGGING_CATEGORY(lcCredentialsManager, "sync.credentials.manager", QtDebugMsg) namespace { +constexpr auto tiemoutC = 5s; QString credentialKeyC() { return QStringLiteral("%1_credentials").arg(Theme::instance()->appName()); @@ -67,18 +68,36 @@ QKeychain::Job *CredentialManager::set(const QString &key, const QVariant &data) qCInfo(lcCredentialsManager) << "set" << scopedKey(this, key); auto writeJob = new QKeychain::WritePasswordJob(Theme::instance()->appName()); writeJob->setKey(scopedKey(this, key)); - connect(writeJob, &QKeychain::WritePasswordJob::finished, this, [writeJob, key, this] { + + auto timer = new QTimer(writeJob); + timer->setInterval(tiemoutC); + timer->setSingleShot(true); + + auto timedOut = std::make_unique(false); + connect(timer, &QTimer::timeout, writeJob, [writeJob, timedOut = timedOut.get()] { + *timedOut = true; + Q_EMIT writeJob->finished(writeJob); + writeJob->deleteLater(); + }); + connect(writeJob, &QKeychain::WritePasswordJob::finished, this, [writeJob, timer, key, timedOut = std::move(timedOut), this] { + timer->stop(); if (writeJob->error() == QKeychain::NoError) { - qCInfo(lcCredentialsManager) << "added" << scopedKey(this, key); - // just a list, the values don't matter - credentialsList().setValue(key, true); + if (*timedOut.get()) { + qCInfo(lcCredentialsManager) << "set" << writeJob->key() << "timed out"; + } else { + qCInfo(lcCredentialsManager) << "added" << writeJob->key(); + // just a list, the values don't matter + credentialsList().setValue(key, true); + } } else { - qCWarning(lcCredentialsManager) << "Failed to set:" << scopedKey(this, key) << writeJob->errorString(); + qCWarning(lcCredentialsManager) << "Failed to set:" << writeJob->key() << writeJob->errorString(); } }); writeJob->setBinaryData(QCborValue::fromVariant(data).toCbor()); // start is delayed so we can directly call it writeJob->start(); + timer->start(); + return writeJob; } @@ -183,6 +202,7 @@ void CredentialJob::start() if (!_parent->contains(_key)) { _error = QKeychain::EntryNotFound; // QKeychain is started delayed, emit the signal delayed to make sure we are connected + qCDebug(lcCredentialsManager) << "We don't know" << _key << "skipping retrieval from keychain"; QTimer::singleShot(0, this, &CredentialJob::finished); return; } diff --git a/src/libsync/platform_win.cpp b/src/libsync/platform_win.cpp index 30ad04518b0..a487cd2ef57 100644 --- a/src/libsync/platform_win.cpp +++ b/src/libsync/platform_win.cpp @@ -65,15 +65,8 @@ void WinPlatform::setApplication(QCoreApplication *application) const QString opensslConf = QCoreApplication::applicationDirPath() + QStringLiteral("/openssl.cnf"); qputenv("OPENSSL_CONF", opensslConf.toLocal8Bit()); - // The Windows style still has pixelated elements with Qt 5.6, - // it's recommended to use the Fusion style in this case, even - // though it looks slightly less native. Check here after the - // QApplication was constructed, but before any QWidget is - // constructed. if (auto guiApp = qobject_cast(application)) { - if (!qFuzzyCompare(guiApp->devicePixelRatio(), 1)) { - QApplication::setStyle(QStringLiteral("fusion")); - } + QApplication::setStyle(QStringLiteral("fusion")); } } diff --git a/test/gui/envs.txt b/test/gui/envs.txt new file mode 100644 index 00000000000..a24aacfdad5 --- /dev/null +++ b/test/gui/envs.txt @@ -0,0 +1 @@ +XDG_CONFIG_HOME=/tmp/owncloudtest/ \ No newline at end of file diff --git a/test/gui/shared/scripts/helpers/ConfigHelper.py b/test/gui/shared/scripts/helpers/ConfigHelper.py index d1db9b93b1b..e2e1301374e 100644 --- a/test/gui/shared/scripts/helpers/ConfigHelper.py +++ b/test/gui/shared/scripts/helpers/ConfigHelper.py @@ -3,6 +3,27 @@ from tempfile import gettempdir from configparser import ConfigParser + +def read_env_file(): + envs = {} + script_path = os.path.dirname(os.path.realpath(__file__)) + env_path = os.path.abspath(os.path.join(script_path, '..', '..', '..', 'envs.txt')) + with open(env_path, "rt", encoding="UTF-8") as f: + for line in f: + if line.startswith('#'): + continue + key, value = line.split('=', 1) + envs[key] = value.strip() + return envs + + +def get_config_from_env_file(env): + envs = read_env_file() + if env in envs: + return envs[env] + raise Exception('Environment "%s" not found in envs.txt' % env) + + # map environment variables to config keys CONFIG_ENV_MAP = { 'localBackendUrl': 'BACKEND_HOST', @@ -30,7 +51,9 @@ 'clientLogFile': '-', 'clientRootSyncPath': '/tmp/client-bdd/', 'tempFolderPath': gettempdir() + '/client-bdd/temp/', - 'clientConfigDir': '/tmp/owncloud-client/', + 'clientConfigDir': os.path.join( + get_config_from_env_file("XDG_CONFIG_HOME"), "ownCloud" + ), 'guiTestReportDir': os.path.abspath('../reports/'), 'ocis': False, 'custom_lib': os.path.abspath('../shared/scripts/custom_lib'), diff --git a/test/gui/shared/scripts/helpers/SetupClientHelper.py b/test/gui/shared/scripts/helpers/SetupClientHelper.py index 63be46c917f..b7d803571f0 100644 --- a/test/gui/shared/scripts/helpers/SetupClientHelper.py +++ b/test/gui/shared/scripts/helpers/SetupClientHelper.py @@ -69,6 +69,10 @@ def getResourcePath(resource='', user='', space=''): ) +def getTempResourcePath(resourceName): + return join(get_config('tempFolderPath'), resourceName) + + def getCurrentUserSyncPath(): return get_config('currentUserSyncPath') @@ -80,8 +84,6 @@ def startClient(): + get_config('clientLogFile') + " --logdebug" + " --logflush" - + " --confdir " - + get_config('clientConfigDir') ) diff --git a/test/gui/shared/scripts/pageObjects/Activity.py b/test/gui/shared/scripts/pageObjects/Activity.py index 90a601c75e3..0696be7a7c3 100644 --- a/test/gui/shared/scripts/pageObjects/Activity.py +++ b/test/gui/shared/scripts/pageObjects/Activity.py @@ -26,15 +26,17 @@ class Activity: "visible": 1, } + @staticmethod + def getTabObject(tab_index): + return { + "container": Activity.SUBTAB_CONTAINER, + "index": tab_index, + "type": "TabItem", + } + @staticmethod def getTabText(tab_index): - return squish.waitForObjectExists( - { - "container": Activity.SUBTAB_CONTAINER, - "index": tab_index, - "type": "TabItem", - } - ).text + return squish.waitForObjectExists(Activity.getTabObject(tab_index)).text @staticmethod def getNotSyncedFileSelector(resource): @@ -69,7 +71,13 @@ def clickTab(tabName): if tabName in tabText: tabFound = True - squish.clickTab(squish.waitForObject(Activity.SUBTAB), tabText) + squish.mouseClick( + squish.waitForObjectExists(Activity.getTabObject(index)), + 0, + 0, + squish.Qt.NoModifier, + squish.Qt.LeftButton, + ) break if not tabFound: @@ -85,7 +93,6 @@ def checkFileExist(filename): @staticmethod def checkBlackListedResourceExist(filename): - result = squish.waitFor( lambda: Activity.isResourceBlackListed(filename), get_config('maxSyncTimeout') * 1000, diff --git a/test/gui/shared/scripts/pageObjects/SyncConnectionWizard.py b/test/gui/shared/scripts/pageObjects/SyncConnectionWizard.py index 7fceae86b4f..9b8611421bb 100644 --- a/test/gui/shared/scripts/pageObjects/SyncConnectionWizard.py +++ b/test/gui/shared/scripts/pageObjects/SyncConnectionWizard.py @@ -1,7 +1,11 @@ import names import squish from os import path -from helpers.SetupClientHelper import getCurrentUserSyncPath +from helpers.SetupClientHelper import ( + getCurrentUserSyncPath, + getTempResourcePath, + setCurrentUserSyncPath, +) from helpers.ConfigHelper import get_config @@ -67,20 +71,25 @@ class SyncConnectionWizard: } @staticmethod - def setSyncPathInSyncConnectionWizardOc10(): + def setSyncPathInSyncConnectionWizardOc10(folderName=''): squish.waitForObject(SyncConnectionWizard.ADD_FOLDER_SYNC_CONNECTION_WIZARD) - squish.type( - SyncConnectionWizard.CHOOSE_LOCAL_SYNC_FOLDER, - getCurrentUserSyncPath(), - ) + if folderName: + currentSyncPath = getTempResourcePath(folderName) + squish.type(SyncConnectionWizard.CHOOSE_LOCAL_SYNC_FOLDER, currentSyncPath) + setCurrentUserSyncPath(currentSyncPath) + else: + squish.type( + SyncConnectionWizard.CHOOSE_LOCAL_SYNC_FOLDER, + getCurrentUserSyncPath(), + ) SyncConnectionWizard.nextStep() @staticmethod - def setSyncPathInSyncConnectionWizard(spaceName=''): + def setSyncPathInSyncConnectionWizard(folderName=''): if get_config('ocis'): - SyncConnectionWizard.setSyncPathInSyncConnectionWizardOcis(spaceName) + SyncConnectionWizard.setSyncPathInSyncConnectionWizardOcis(folderName) else: - SyncConnectionWizard.setSyncPathInSyncConnectionWizardOc10() + SyncConnectionWizard.setSyncPathInSyncConnectionWizardOc10(folderName) @staticmethod def nextStep(): diff --git a/test/gui/shared/steps/file_context.py b/test/gui/shared/steps/file_context.py index 7547223f906..a8c604b0a72 100644 --- a/test/gui/shared/steps/file_context.py +++ b/test/gui/shared/steps/file_context.py @@ -18,6 +18,9 @@ can_write, read_file_content, ) +from helpers.SetupClientHelper import ( + getTempResourcePath, +) def folderExists(folderPath, timeout=1000): @@ -263,15 +266,23 @@ def step(context, username): writeFile(file, '') +@Given('the user has created a folder "|any|" in temp folder') +def step(context, folderName): + createFolder(folderName, isTempFolder=True) + + @Given( - 'the user has created a folder "|any|" with "|any|" files each of size "|any|" bytes in temp folder' + 'the user has created "|any|" files each of size "|any|" bytes inside folder "|any|" in temp folder' ) -def step(context, foldername, filenumber, filesize): - createFolder(foldername, isTempFolder=True) - filesize = builtins.int(filesize) - for i in range(0, builtins.int(filenumber)): - filename = f"file{i}.txt" - createFileWithSize(join(foldername, filename), filesize, True) +def step(context, fileNumber, fileSize, folderName): + currentSyncPath = getTempResourcePath(folderName) + if folderExists(currentSyncPath): + fileSize = builtins.int(fileSize) + for i in range(0, builtins.int(fileNumber)): + fileName = f"file{i}.txt" + createFileWithSize(join(currentSyncPath, fileName), fileSize, True) + else: + raise Exception(f"Folder '{folderName}' does not exist in the temp folder") @When( diff --git a/test/gui/shared/steps/sync_context.py b/test/gui/shared/steps/sync_context.py index 9890d982875..173b5509cc6 100644 --- a/test/gui/shared/steps/sync_context.py +++ b/test/gui/shared/steps/sync_context.py @@ -158,6 +158,13 @@ def step(context): SyncConnectionWizard.setSyncPathInSyncConnectionWizard() +@When( + 'the user sets the temp folder "|any|" as local sync path in sync connection wizard' +) +def step(context, folderName): + SyncConnectionWizard.setSyncPathInSyncConnectionWizard(folderName) + + @When('the user selects "|any|" as a remote destination folder') def step(context, folderName): SyncConnectionWizard.selectRemoteDestinationFolder(folderName) diff --git a/test/gui/suite.conf b/test/gui/suite.conf index 911c163142c..e1a13cdb266 100644 --- a/test/gui/suite.conf +++ b/test/gui/suite.conf @@ -1,5 +1,5 @@ AUT=owncloud --showsettings -ENVVARS=envvars +ENVVARS=envs.txt HOOK_SUB_PROCESSES=false IMPLICITAUTSTART=false LANGUAGE=Python diff --git a/test/gui/tst_checkAlltabs/test.feature b/test/gui/tst_checkAlltabs/test.feature index 9b340aba198..4563de1e0b2 100644 --- a/test/gui/tst_checkAlltabs/test.feature +++ b/test/gui/tst_checkAlltabs/test.feature @@ -14,7 +14,7 @@ Feature: Visually check all tabs | Settings | | QuitOwncloud | - @skip + Scenario: Open log dialog with Ctrl+l keys combination Given user "Alice" has been created on the server with default attributes and without skeleton files And user "Alice" has set up a client with default settings diff --git a/test/gui/tst_syncing/test.feature b/test/gui/tst_syncing/test.feature index 9e964562fda..fa36a6fac22 100644 --- a/test/gui/tst_syncing/test.feature +++ b/test/gui/tst_syncing/test.feature @@ -343,8 +343,10 @@ Feature: Syncing files Scenario: Syncing folders each having 500 files - Given the user has created a folder "folder1" with "500" files each of size "1048576" bytes in temp folder - And the user has created a folder "folder2" with "500" files each of size "1048576" bytes in temp folder + Given the user has created a folder "folder1" in temp folder + And the user has created "500" files each of size "1048576" bytes inside folder "folder1" in temp folder + And the user has created a folder "folder2" in temp folder + And the user has created "500" files each of size "1048576" bytes inside folder "folder2" in temp folder And user "Alice" has set up a client with default settings When user "Alice" moves folder "folder1" from the temp folder into the sync folder And user "Alice" moves folder "folder2" from the temp folder into the sync folder @@ -383,3 +385,23 @@ Feature: Syncing files And as "Alice" folder "folder2" should exist in the server And as "Alice" the file "file1.txt" should have the content "Test file1" in the server And as "Alice" the file "file2.txt" should have the content "Test file2" in the server + + + @skipOnOCIS + Scenario: sync remote folder to a local sync folder having special characters + Given user "Alice" has created folder "~`!@#$^&()-_=+{[}];',)" in the server + And user "Alice" has created folder "~test%" in the server + And the user has created a folder "~`!@#$^&()-_=+{[}];',)PRN%" in temp folder + And the user has started the client + And the user has added the following account information: + | server | %local_server% | + | user | Alice | + | password | 1234 | + When the user selects manual sync folder option in advanced section + And the user sets the temp folder "~`!@#$^&()-_=+{[}];',)PRN%" as local sync path in sync connection wizard + And the user selects "ownCloud" as a remote destination folder + And the user selects the following folders to sync: + | folder | + | ~`!@#$^&()-_=+{[}];',) | + Then the folder "~`!@#$^&()-_=+{[}];',)" should exist on the file system + But the folder "~test%" should not exist on the file system diff --git a/translations/client_ar.ts b/translations/client_ar.ts index 8235e3de13d..c5d9d6d6d95 100644 --- a/translations/client_ar.ts +++ b/translations/client_ar.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage @@ -423,7 +423,7 @@ - + Cancel إلغاء @@ -464,14 +464,15 @@ - + + Add Space - - + + Add Folder أضافة مجلد. @@ -586,47 +587,52 @@ Please authenticate using your browser. تسجيل الدخول - + Click this button to add a Space. - + Click this button to add a folder to synchronize. انقر فوق هذا الزر لإضافة مجلد للمزامنة. - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. - + There are folders that were not synchronized because they are too big: توجد مجلدات لم تتم مزامنتها لأن حجمها كبير جدًا: - + There are folders that were not synchronized because they are external storages: توجد مجلدات لم تتم مزامنتها لأنها وحدات تخزين خارجية: - + There are folders that were not synchronized because they are too big or external storages: توجد مجلدات لم تتم مزامنتها لأن حجمها كبير جدًا أو أنها وحدات تخزين خارجية: - + Confirm Account Removal أكِّد إزالة الحساب - + <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> <p>هل ترغب حقًا في إزالة الاتصال بالحساب <i>%1</i>؟</p><p><b>ملاحظة:</b> <b>لن</b> يؤدي ذلك إلى حذف أي ملفات.</p> - + Remove connection أزِل الاتصال @@ -797,7 +803,7 @@ The update will be performed in the background, and overwrite the current AppIma OCC::Application - + Quit إنهاء @@ -867,7 +873,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::CredentialJob - + Failed to parse credentials %1 @@ -3187,48 +3193,48 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud مشاركة مع %1 - + Context menu share مشاركة قائمة السياق - + Context menu share %1 مشاركة قائمة السياق %1 - + Confirm deletion تأكيد الحذف - + Do you want to delete the directory <i>%1</i> and all its contents permanently? هل ترغب في حذف الدليل <i>%1</i> ومحتوياته بشكل دائم؟ - + Do you want to delete the file <i>%1</i> permanently? هل ترغب في حذف الملف <i>%1</i> بشكل دائم؟ - + Select new location... جارٍ تحديد مكان جديد... - + Error خطأ - + Moving file failed: %1 @@ -3237,90 +3243,90 @@ for additional privileges during the process. %1 - + I shared something with you شاركت شيئًا ما معك - - + + Share... جارٍ المشاركة... - - + + Copy private link to clipboard نسخ رابط خاص إلى الحافظة - + Send private link by email... جارٍ إرسال رابط خاص بالبريد الإلكتروني... - + Resharing this file is not allowed غير مسموح بإعادة مشاركة هذا الملف - + Resharing this folder is not allowed غير مسموح بإعادة مشاركة هذا المجلد - + Create and copy public link to clipboard إنشاء ونسخ ارتباط عام إلى الحافظة - + Copy public link to clipboard انسخ رابطًا عامًا إلى الحافظة - + Open in %1 - + Show file versions in web browser - + Rename... جارٍ إعادة التسمية... - + Rename and upload... جارٍ إعادة التسمية والتحميل... - - + + Move and rename... جارٍ النقل وإعادة التسمية... - + Move, rename and upload... جارٍ النقل وإعادة التسمية والتحميل... - + Delete local changes حذف التغييرات المحلية - + Move and upload... جارٍ النقل والتحميل… - + Delete حذف @@ -4251,12 +4257,12 @@ Are you sure you want to proceed? account loading - + Error accessing the configuration file خطأ في الوصول إلى ملف التكوين - + There was an error while accessing the configuration file at %1. حدث خطأ في أثناء الوصول إلى ملف التكوين في %1. @@ -4438,7 +4444,7 @@ Are you sure you want to proceed? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version diff --git a/translations/client_bg_BG.ts b/translations/client_bg_BG.ts index 0ee6c286016..865f057e38d 100644 --- a/translations/client_bg_BG.ts +++ b/translations/client_bg_BG.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage За повече информация, вижте %1 @@ -423,7 +423,7 @@ - + Cancel Отказ @@ -464,14 +464,15 @@ - + + Add Space Добавяне на пространство - - + + Add Folder Добавяне на папка @@ -588,47 +589,52 @@ Please authenticate using your browser. Влизане - + Click this button to add a Space. Натиснете този бутон, за да добавите Пространство. - + Click this button to add a folder to synchronize. Натиснете върху този бутон за да добавите папка за синхронизиране. - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. Трябва да сте свързани, за да добавите папка. - + There are folders that were not synchronized because they are too big: Има папки, които не са синхронизирани защото са твърде големи: - + There are folders that were not synchronized because they are external storages: Има папки, които не са синхронизирани, защото са на външни дискови устройства: - + There are folders that were not synchronized because they are too big or external storages: Има папки, които не са синхронизирани защото са твърде големи, или на външни дискови устройства: - + Confirm Account Removal Потвърждаване на премахването на профила - + <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> <p>Сигурни ли сте, че желаете да премахнете връзката с профил <i>%1</i>?</p><p><b>Бележка:</b> Това <b>няма</b> да изтрие никакви файлове.</p> - + Remove connection Премахване на връзка @@ -801,7 +807,7 @@ The update will be performed in the background, and overwrite the current AppIma OCC::Application - + Quit Изход @@ -877,7 +883,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::CredentialJob - + Failed to parse credentials %1 Неуспешно анализиране на идентификационни данни %1 @@ -3201,48 +3207,48 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud Споделяне с %1 - + Context menu share Контекстно меню за споделяне - + Context menu share %1 Контекстно меню за споделяне на %1 - + Confirm deletion Потвърдете изтриването - + Do you want to delete the directory <i>%1</i> and all its contents permanently? Искате ли да изтриете за постоянно директорията <i>%1</i> и цялото и съдържание? - + Do you want to delete the file <i>%1</i> permanently? Искате ли да изтриете за постоянно файла <i>%1</i>? - + Select new location... Избор на ново местоположение... - + Error Грешка - + Moving file failed: %1 @@ -3251,90 +3257,90 @@ for additional privileges during the process. %1 - + I shared something with you Споделих нещо с теб - - + + Share... Споделяне... - - + + Copy private link to clipboard Копиране на поверителната връзка в клипборда - + Send private link by email... Изпращане на поверителната връзка чрез имейл... - + Resharing this file is not allowed Повторното споделяне на този файл не е позволено - + Resharing this folder is not allowed Повторното споделяне на тази папка не е позволено - + Create and copy public link to clipboard Създаване и копиране на публична връзка в клипборда - + Copy public link to clipboard Копиране на публичната връзка в клипборда - + Open in %1 Отваряне в %1 - + Show file versions in web browser - + Rename... Преименуване - + Rename and upload... Преименуване и качване... - - + + Move and rename... Преместване и преименуване... - + Move, rename and upload... Преместване, преименуване и качване... - + Delete local changes Изтриване на локалните промени - + Move and upload... Преместване и качване... - + Delete Изтриване @@ -4272,12 +4278,12 @@ Are you sure you want to proceed? account loading - + Error accessing the configuration file Грешка при достъп до конфигурационния файл - + There was an error while accessing the configuration file at %1. Възникна грешка при достъп до конфигурационния файл в %1. @@ -4459,7 +4465,7 @@ Are you sure you want to proceed? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version diff --git a/translations/client_cs.ts b/translations/client_cs.ts index dfb5a66d9c0..b51f6645b23 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage Pro více informací navštivte %1 @@ -423,7 +423,7 @@ - + Cancel Zrušit @@ -464,14 +464,15 @@ - + + Add Space - - + + Add Folder Přidat složku @@ -588,47 +589,52 @@ Prosím přihlaste se v prohlížeči. Přihlásit - + Click this button to add a Space. - + Click this button to add a folder to synchronize. Stisknutím tlačítka přidáte adresář k synchronizaci. - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. - + There are folders that were not synchronized because they are too big: Tyto složky nebyly synchronizovány, protože jsou příšliš velké: - + There are folders that were not synchronized because they are external storages: Tyto složky nebyly synchronizovány, protože se nachází na externím úložišti: - + There are folders that were not synchronized because they are too big or external storages: Tyto složky nebyly synchronizovány, protože jsou příliš velké, nebo se nachází na externím úložišti: - + Confirm Account Removal Potvrdit odstranění účtu - + <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> <p>Opravdu chcete odstranit připojení k účtu <i>%1</i>?</p><p><b>Poznámka:</b> Toto <b>neodstraní</b> žádné soubory.</p> - + Remove connection Odstranit připojení @@ -799,7 +805,7 @@ The update will be performed in the background, and overwrite the current AppIma OCC::Application - + Quit Ukončit @@ -869,7 +875,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::CredentialJob - + Failed to parse credentials %1 Nezdařená analýza přihlašovacích údajů %1 @@ -3182,48 +3188,48 @@ můžete být požádáni o dodatečná oprávnění. OCC::SocketApi - + Share with %1 parameter is ownCloud Sdílet s %1 - + Context menu share - + Context menu share %1 - + Confirm deletion Potvrdit smazání - + Do you want to delete the directory <i>%1</i> and all its contents permanently? Opravdu chcete trvale smazat složku <i>%1</i> včetně jejího obsahu? - + Do you want to delete the file <i>%1</i> permanently? Opravdu si přejete trvale odstranit soubor <i>%1</i>? - + Select new location... Vybrat nové umístění... - + Error Chyba - + Moving file failed: %1 @@ -3232,90 +3238,90 @@ můžete být požádáni o dodatečná oprávnění. %1 - + I shared something with you Něco s Vámi sdílím - - + + Share... Sdílet... - - + + Copy private link to clipboard Zkopírovat soukromý odkaz do schránky - + Send private link by email... Odeslat soukromý odkaz emailem... - + Resharing this file is not allowed Sdílení tohoto odkazu není dovoleno - + Resharing this folder is not allowed Sdílení této složky není dovoleno - + Create and copy public link to clipboard - + Copy public link to clipboard Zkopírovat veřejný odkaz do schránky - + Open in %1 Otevřít v %1 - + Show file versions in web browser - + Rename... Přejmenovat... - + Rename and upload... Přejmenovat a nahrát... - - + + Move and rename... Přesunout a přejmenovat... - + Move, rename and upload... Přesunout, přejmenovat a nahrát... - + Delete local changes Smazat místní změny - + Move and upload... Přesunout a nahrát... - + Delete Smazat @@ -4247,12 +4253,12 @@ Jste si jisti, že chcete pokračovat? account loading - + Error accessing the configuration file Chyba přístupu ke konfiguračnímu souboru - + There was an error while accessing the configuration file at %1. Došlo k chybě při přístupu ke konfiguračnímu souboru %1. @@ -4434,7 +4440,7 @@ Jste si jisti, že chcete pokračovat? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version diff --git a/translations/client_de-informal.ts b/translations/client_de-informal.ts index bace866f1b4..1a4ef2e4b04 100644 --- a/translations/client_de-informal.ts +++ b/translations/client_de-informal.ts @@ -39,7 +39,7 @@ Restore default value - + Standardeinstellung wiederherstellen @@ -103,10 +103,10 @@ CommandLine - + For more information, see %1 link to homepage - Siehe %1 für mehr Informationen + Siehe %1 für mehr Informationen. @@ -392,7 +392,7 @@ Preparing the account - + Konto vorbereiten @@ -423,7 +423,7 @@ - + Cancel Abbrechen @@ -464,14 +464,15 @@ - + + Add Space Space hinzufügen - - + + Add Folder Ordner hinzufügen @@ -586,47 +587,52 @@ Bitte über den Browser authentifizieren. Anmelden - + Click this button to add a Space. Diese Schaltfläche drücken, um einen Space hinzuzufügen. - + Click this button to add a folder to synchronize. Diesen Knopf drücken, um einen Ordner zur Synchronisation hinzuzufügen. - + + You need to be connected to add a Space. + Du musst verbunden sein, um einen Space hinzuzufügen. + + + You need to be connected to add a folder. Verbindung notwendig, um einen Ordner hinzuzufügen - + There are folders that were not synchronized because they are too big: Einige Verzeichnisse konnten nicht synchronisiert werden, da sie zu groß sind: - + There are folders that were not synchronized because they are external storages: Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da sie externer Speicher sind: - + There are folders that were not synchronized because they are too big or external storages: Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da sie zu groß oder externer Speicher sind: - + Confirm Account Removal Löschen des Benutzerkontos bestätigen - + <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> <p>Möchtest Du den Zugang zum Benutzerkonto <i>%1</i> wirklich entfernen?</p><p><b>Hinweis:</b>Es werden <b>keine</b> lokalen Daten gelöscht.</p> - + Remove connection Zugang löschen @@ -751,7 +757,7 @@ Bitte über den Browser authentifizieren. <br/>%1 does not provide activities. - + <br/>%1 stellt keine Aktivitäten bereit. @@ -799,7 +805,7 @@ Die Aktualisierung wird im Hintergrund durchgeführt und überschreibt die aktue OCC::Application - + Quit Beenden @@ -873,7 +879,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber OCC::CredentialJob - + Failed to parse credentials %1 Fehler beim Verarbeiten der Zugangsdaten %1 @@ -1304,7 +1310,7 @@ Erwägung Sie diesen Ordner aus dem Konto zu entfernen und erneut hinzuzufügen. Queued - + In Warteschlange gestellt @@ -1685,7 +1691,7 @@ Beachte, das dies nur bestimmt von welchem Bereich Sie Aktualisierungen erhalten Please enter your password to log in to the account %1. - + Zum Einlogen in Konto %1 Passwort eingeben. @@ -2321,7 +2327,7 @@ for additional privileges during the process. SelectiveSync: Ignored because its path is deselected - + SelectiveSync: Selektive Synchronisierung wurde ignoriert, da der Pfad dafür abgewählt ist. @@ -3195,48 +3201,48 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud Mit %1 teilen - + Context menu share Teilen über das Kontextmenü - + Context menu share %1 Freigabe %1 über das Kontextmenü - + Confirm deletion Löschung bestätigen - + Do you want to delete the directory <i>%1</i> and all its contents permanently? Soll der Ordner <i>%1</i> und alle seine Inhalte dauerhaft gelöscht werden? - + Do you want to delete the file <i>%1</i> permanently? Soll die Datei <i>%1</i> dauerhaft gelöscht werden? - + Select new location... Neuen Ort wählen... - + Error Fehler - + Moving file failed: %1 @@ -3245,90 +3251,90 @@ for additional privileges during the process. %1 - + I shared something with you Ich habe etwas mit dir geteilt - - + + Share... Teilen… - - + + Copy private link to clipboard Privaten Link in die Zwischenablage kopieren - + Send private link by email... Privaten Link über E-Mail senden... - + Resharing this file is not allowed Weiteres Teilen ist nicht erlaubt. - + Resharing this folder is not allowed Weiterteilen des Ordners ist nicht erlaubt - + Create and copy public link to clipboard Neuen öffentlichen Link erstellen und in die Zwischenablage kopieren - + Copy public link to clipboard Öffentlichen Link in die Zwischenablage kopieren - + Open in %1 In %1 öffnen - + Show file versions in web browser - + Zeige Dateiversionen im Browser - + Rename... Umbenennen... - + Rename and upload... Umbenennen und hochladen... - - + + Move and rename... Verschieben und umbenennen... - + Move, rename and upload... Verschieben, umbenennen und hochladen... - + Delete local changes Lokale Änderungen löschen - + Move and upload... Verschieben und hochladen... - + Delete Löschen @@ -3750,7 +3756,7 @@ Möchtest du fortfahren? Failed to retrieve user information from server - Die Userinformationen konnten nicht vom Server geladen werden + Die Benutzerinformationen konnten nicht vom Server geladen werden. @@ -3842,7 +3848,7 @@ Möchtest du fortfahren? Create a new account - + Neues Konto erstellen @@ -3863,7 +3869,7 @@ Möchtest du fortfahren? Resume synchronization - + Synchronisation fortsetzen @@ -4174,7 +4180,7 @@ Möchtest du fortfahren? Filename Reserved - + Dateiname reserviert @@ -4264,12 +4270,12 @@ Möchtest du fortfahren? account loading - + Error accessing the configuration file Fehler beim Zugriff auf die Konfigurationsdatei - + There was an error while accessing the configuration file at %1. Es ist ein Fehler beim Zugriff auf die Konfigurationsdatei unter %1 aufgetreten. @@ -4313,7 +4319,7 @@ Möchtest du fortfahren? Some available online only - Nur einige Online verfügbar + Einige nur online verfügbar @@ -4361,7 +4367,7 @@ Möchtest du fortfahren? Server version downloaded, local copy was backed up as conflict file - + Serverversion heruntergeladen, lokale Kopie wurde als Konfliktdatei gesichert. @@ -4451,9 +4457,9 @@ Möchtest du fortfahren? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version - + Manche Einstellungen wurden in neueren Versionen dieses Clients konfiguriert und benutzen Features, die in dieser Version nicht verfügbar sind. \ No newline at end of file diff --git a/translations/client_de.ts b/translations/client_de.ts index 533a3784773..e01d866026b 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage Mehr Informationen unter %1 @@ -423,7 +423,7 @@ - + Cancel Abbrechen @@ -464,14 +464,15 @@ - + + Add Space Space hinzufügen - - + + Add Folder Ordner hinzufügen @@ -588,47 +589,52 @@ Bitte über den Browser authentifizieren. Anmelden - + Click this button to add a Space. Diese Schaltfläche drücken, um einen Space hinzuzufügen. - + Click this button to add a folder to synchronize. Diesen Knopf drücken, um einen Ordner zur Synchronisation hinzuzufügen. - + + You need to be connected to add a Space. + Sie müssen verbunden sein, um einen Space hinzuzufügen. + + + You need to be connected to add a folder. Verbindung notwendig, um einen Ordner hinzuzufügen - + There are folders that were not synchronized because they are too big: Einige Verzeichnisse konnten nicht synchronisiert werden, da sie zu groß sind: - + There are folders that were not synchronized because they are external storages: Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da diese externe Speicher sind: - + There are folders that were not synchronized because they are too big or external storages: Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da diese zu groß oder externe Speicher sind: - + Confirm Account Removal Löschen des Benutzerkontos bestätigen - + <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> <p>Möchten Sie den Zugang zum Benutzerkonto <i>%1</i> wirklich entfernen?</p><p><b>Hinweis:</b> Bei diesem Vorgang werden <b>keine</b> lokalen Daten gelöscht.</p> - + Remove connection Verbindung entfernen @@ -801,7 +807,7 @@ Die Aktualisierung wird im Hintergrund durchgeführt und überschreibt die aktue OCC::Application - + Quit Beenden @@ -875,7 +881,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich dafür entscheiden, ber OCC::CredentialJob - + Failed to parse credentials %1 Fehler beim Verarbeiten der Zugangsdaten %1 @@ -3198,48 +3204,48 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud Via %1 teilen - + Context menu share Teilen über das Kontextmenü - + Context menu share %1 Freigabe %1 über das Kontextmenü - + Confirm deletion Löschung bestätigen - + Do you want to delete the directory <i>%1</i> and all its contents permanently? Soll der Ordner <i>%1</i> mit gesamtem Inhalt dauerhaft gelöscht werden? - + Do you want to delete the file <i>%1</i> permanently? Soll die Datei <i>%1</i> dauerhaft gelöscht werden? - + Select new location... Neuen Ort wählen... - + Error Fehler - + Moving file failed: %1 @@ -3248,90 +3254,90 @@ for additional privileges during the process. %1 - + I shared something with you Ich habe etwas mit Ihnen geteilt. - - + + Share... Teilen… - - + + Copy private link to clipboard Privaten Link in die Zwischenablage kopieren - + Send private link by email... Sende privaten Link per E-Mail... - + Resharing this file is not allowed Weiteres Teilen dieser Datei ist nicht erlaubt. - + Resharing this folder is not allowed Weiteres Teilen des Ordners ist nicht erlaubt. - + Create and copy public link to clipboard Neuen öffentlichen Link erstellen und in die Zwischenablage kopieren - + Copy public link to clipboard Öffentlichen Link in die Zwischenablage kopieren - + Open in %1 In %1 öffnen - + Show file versions in web browser Dateiversion im Webbrowser anzeigen. - + Rename... Umbenennen... - + Rename and upload... Umbenennen und hochladen... - - + + Move and rename... Verschieben und umbenennen... - + Move, rename and upload... Verschieben, umbenennen und hochladen... - + Delete local changes Lokale Änderungen löschen - + Move and upload... Verschieben und hochladen... - + Delete Löschen @@ -3845,7 +3851,7 @@ Möchten Sie fortfahren? Create a new account - Neues Konto anlegen + Neues Konto erstellen @@ -4267,12 +4273,12 @@ Möchten Sie fortfahren? account loading - + Error accessing the configuration file Fehler beim Zugriff auf die Konfigurationsdatei - + There was an error while accessing the configuration file at %1. Es ist ein Fehler beim Zugriff auf die Konfigurationsdatei unter %1 aufgetreten. @@ -4454,7 +4460,7 @@ Möchten Sie fortfahren? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version Manche Einstellungen wurden in neueren Versionen dieses Clients konfiguriert und benutzen Features, die in dieser Version nicht verfügbar sind. diff --git a/translations/client_de_AT.ts b/translations/client_de_AT.ts index e55e3ce30dd..709c0387898 100644 --- a/translations/client_de_AT.ts +++ b/translations/client_de_AT.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage Siehe %1 für mehr Informationen @@ -423,7 +423,7 @@ - + Cancel Abbrechen @@ -464,14 +464,15 @@ - + + Add Space - - + + Add Folder @@ -586,47 +587,52 @@ Bitte über den Browser authentifizieren. Anmelden - + Click this button to add a Space. - + Click this button to add a folder to synchronize. Diesen Knopf drücken um einen Ordner zur Synchronisation hinzuzufügen. - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. - + There are folders that were not synchronized because they are too big: Einige Verzeichnisse konnten nicht synchronisiert werden, da sie zu gross sind: - + There are folders that were not synchronized because they are external storages: Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da sie externer Speicher sind: - + There are folders that were not synchronized because they are too big or external storages: Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da sie zu gross oder externer Speicher sind: - + Confirm Account Removal Löschen des Benutzerkontos bestätigen - + <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> <p>Möchtest Du den Zugang zum Benutzerkonto <i>%1</i> wirklich entfernen?</p><p><b>Hinweis:</b>Es werden <b>keine</b> lokalen Daten gelöscht.</p> - + Remove connection Verbindung entfernen @@ -799,7 +805,7 @@ Die Aktualisierung wird im Hintergrund durchgeführt und überschreibt die aktue OCC::Application - + Quit Schließen @@ -873,7 +879,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber OCC::CredentialJob - + Failed to parse credentials %1 Fehler beim Verarbeiten der Zugangsdaten %1 @@ -3196,48 +3202,48 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud Teile mit %1 - + Context menu share Teilen über das Kontextmenü - + Context menu share %1 Freigabe %1 über das Kontextmenü - + Confirm deletion Löschung bestätigen - + Do you want to delete the directory <i>%1</i> and all its contents permanently? Soll der Ordner <i>%1</i> und alle seine Inhalte dauerhaft gelöscht werden? - + Do you want to delete the file <i>%1</i> permanently? Soll die Datei <i>%1</i> dauerhaft gelöscht werden? - + Select new location... Neuen Ort wählen... - + Error Fehler - + Moving file failed: %1 @@ -3246,90 +3252,90 @@ for additional privileges during the process. %1 - + I shared something with you Ich habe etwas mit dir geteilt - - + + Share... Teilen… - - + + Copy private link to clipboard Privaten Link in die Zwischenablage kopieren - + Send private link by email... Privaten Link über E-Mail senden... - + Resharing this file is not allowed Weiteres Teilen ist nicht erlaubt. - + Resharing this folder is not allowed Weiterteilen des Ordners ist nicht erlaubt - + Create and copy public link to clipboard Neuen öffentlichen Link erstellen und in die Zwischenablage kopieren - + Copy public link to clipboard Öffentlichen Link in die Zwischenablage kopieren - + Open in %1 In %1 öffnen - + Show file versions in web browser - + Rename... Umbenennen... - + Rename and upload... Umbenennen und hochladen... - - + + Move and rename... Verschieben und umbenennen... - + Move, rename and upload... Verschieben, umbenennen und hochladen... - + Delete local changes Lokale Änderungen löschen - + Move and upload... Verschieben und hochladen... - + Delete Löschen @@ -4265,12 +4271,12 @@ Möchten Sie fortfahren? account loading - + Error accessing the configuration file Fehler beim Zugriff auf die Konfigurationsdatei - + There was an error while accessing the configuration file at %1. Es ist ein Fehler beim Zugriff auf die Konfigurationsdatei unter %1 aufgetreten. @@ -4452,7 +4458,7 @@ Möchten Sie fortfahren? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version diff --git a/translations/client_de_CH.ts b/translations/client_de_CH.ts index 5cd048833aa..3e37b1e42a0 100644 --- a/translations/client_de_CH.ts +++ b/translations/client_de_CH.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage Siehe %1 für mehr Informationen @@ -423,7 +423,7 @@ - + Cancel Abbrechen @@ -464,14 +464,15 @@ - + + Add Space - - + + Add Folder Ordner hinzufügen @@ -586,47 +587,52 @@ Bitte über den Browser authentifizieren. Anmelden - + Click this button to add a Space. - + Click this button to add a folder to synchronize. Diesen Knopf drücken um einen Ordner zur Synchronisation hinzuzufügen. - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. - + There are folders that were not synchronized because they are too big: Einige Verzeichnisse konnten nicht synchronisiert werden, da sie zu gross sind: - + There are folders that were not synchronized because they are external storages: Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da sie externer Speicher sind: - + There are folders that were not synchronized because they are too big or external storages: Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da sie zu gross oder externer Speicher sind: - + Confirm Account Removal Löschen des Benutzerkontos bestätigen - + <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> <p>Möchten Sie den Zugang zum Benutzerkonto <i>%1</i> wirklich entfernen?</p><p><b>Hinweis:</b>Es werden <b>keine</b> lokalen Daten gelöscht.</p> - + Remove connection Zugang löschen @@ -799,7 +805,7 @@ Die Aktualisierung wird im Hintergrund durchgeführt und überschreibt die aktue OCC::Application - + Quit Beenden @@ -873,7 +879,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber OCC::CredentialJob - + Failed to parse credentials %1 Fehler beim Verarbeiten der Zugangsdaten %1 @@ -3195,48 +3201,48 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud Mit %1 teilen - + Context menu share Teilen über das Kontextmenü - + Context menu share %1 Freigabe %1 über das Kontextmenü - + Confirm deletion Löschen bestätigen - + Do you want to delete the directory <i>%1</i> and all its contents permanently? Soll der Ordner <i>%1</i> und alle seine Inhalte dauerhaft gelöscht werden? - + Do you want to delete the file <i>%1</i> permanently? Soll die Datei <i>%1</i> dauerhaft gelöscht werden? - + Select new location... Neuen Ort wählen... - + Error Fehler - + Moving file failed: %1 @@ -3245,90 +3251,90 @@ for additional privileges during the process. %1 - + I shared something with you Ich habe etwas mit dir geteilt - - + + Share... Teilen… - - + + Copy private link to clipboard Privaten Link in die Zwischenablage kopieren - + Send private link by email... Privaten Link über E-Mail senden... - + Resharing this file is not allowed Weiteres Teilen ist nicht erlaubt. - + Resharing this folder is not allowed Weiterteilen des Ordners ist nicht erlaubt - + Create and copy public link to clipboard Neuen öffentlichen Link erstellen und in die Zwischenablage kopieren - + Copy public link to clipboard Öffentlichen Link in die Zwischenablage kopieren - + Open in %1 In %1 öffnen - + Show file versions in web browser - + Rename... Umbenennen... - + Rename and upload... Umbenennen und hochladen... - - + + Move and rename... Verschieben und umbenennen... - + Move, rename and upload... Verschieben, umbenennen und hochladen... - + Delete local changes Lokale Änderungen löschen - + Move and upload... Verschieben und hochladen... - + Delete Löschen @@ -4264,12 +4270,12 @@ Möchten Sie fortfahren? account loading - + Error accessing the configuration file Fehler beim Zugriff auf die Konfigurationsdatei - + There was an error while accessing the configuration file at %1. Es ist ein Fehler beim Zugriff auf die Konfigurationsdatei unter %1 aufgetreten. @@ -4451,7 +4457,7 @@ Möchten Sie fortfahren? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version diff --git a/translations/client_en.ts b/translations/client_en.ts index 57546eca1b1..3d4ad5121a6 100644 --- a/translations/client_en.ts +++ b/translations/client_en.ts @@ -105,7 +105,7 @@ CommandLine - + For more information, see %1 link to homepage @@ -428,7 +428,7 @@ - + Cancel @@ -469,14 +469,15 @@ - + + Add Space - - + + Add Folder @@ -587,47 +588,52 @@ Please authenticate using your browser. - + Click this button to add a Space. - + Click this button to add a folder to synchronize. - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. - + There are folders that were not synchronized because they are too big: - + There are folders that were not synchronized because they are external storages: - + There are folders that were not synchronized because they are too big or external storages: - + Confirm Account Removal - + <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> - + Remove connection @@ -804,7 +810,7 @@ The update will be performed in the background, and overwrite the current AppIma OCC::Application - + Quit @@ -874,7 +880,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::CredentialJob - + Failed to parse credentials %1 @@ -3197,138 +3203,138 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud - + Context menu share - + Context menu share %1 - + Confirm deletion - + Do you want to delete the directory <i>%1</i> and all its contents permanently? - + Do you want to delete the file <i>%1</i> permanently? - + Select new location... - + Error - + Moving file failed: %1 - + I shared something with you - - + + Share... - - + + Copy private link to clipboard - + Send private link by email... - + Resharing this file is not allowed - + Resharing this folder is not allowed - + Create and copy public link to clipboard - + Copy public link to clipboard - + Open in %1 - + Show file versions in web browser - + Rename... - + Rename and upload... - - + + Move and rename... - + Move, rename and upload... - + Delete local changes - + Move and upload... - + Delete @@ -4286,12 +4292,12 @@ Are you sure you want to proceed? account loading - + Error accessing the configuration file - + There was an error while accessing the configuration file at %1. @@ -4473,7 +4479,7 @@ Are you sure you want to proceed? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index 7ba70339423..bc929cd47c0 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -39,7 +39,7 @@ Restore default value - + Restore default value @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage For more information, see %1 @@ -392,7 +392,7 @@ Preparing the account - + Preparing the account @@ -423,7 +423,7 @@ - + Cancel Cancel @@ -464,14 +464,15 @@ - + + Add Space Add Space - - + + Add Folder Add Folder @@ -588,47 +589,52 @@ Please authenticate using your browser. Log in - + Click this button to add a Space. Click this button to add a Space. - + Click this button to add a folder to synchronize. Click this button to add a folder to synchronise. - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. You need to be connected to add a folder. - + There are folders that were not synchronized because they are too big: There are folders that were not synchronised because they are too big: - + There are folders that were not synchronized because they are external storages: There are folders that were not synchronised because they are external storages: - + There are folders that were not synchronized because they are too big or external storages: There are folders that were not synchronised because they are too big or external storages: - + Confirm Account Removal Confirm Account Removal - + <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> <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> - + Remove connection Remove connection @@ -753,7 +759,7 @@ Please authenticate using your browser. <br/>%1 does not provide activities. - + <br/>%1 does not provide activities. @@ -801,7 +807,7 @@ The update will be performed in the background, and overwrite the current AppIma OCC::Application - + Quit Quit @@ -877,7 +883,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::CredentialJob - + Failed to parse credentials %1 Failed to parse credentials %1 @@ -1308,7 +1314,7 @@ Please consider removing this folder from the account and adding it again. Queued - + Queued @@ -1690,7 +1696,7 @@ Note that this selects only what pool upgrades are taken from, and that there ar Please enter your password to log in to the account %1. - + Please enter your password to log in to the account %1. @@ -2328,7 +2334,7 @@ for additional privileges during the process. SelectiveSync: Ignored because its path is deselected - + SelectiveSync: Ignored because its path is deselected @@ -3202,48 +3208,48 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud Share with %1 - + Context menu share Context menu share - + Context menu share %1 Context menu share %1 - + Confirm deletion Confirm deletion - + Do you want to delete the directory <i>%1</i> and all its contents permanently? Do you want to delete the directory <i>%1</i> and all its contents permanently? - + Do you want to delete the file <i>%1</i> permanently? Do you want to delete the file <i>%1</i> permanently? - + Select new location... Select new location... - + Error Error - + Moving file failed: %1 @@ -3252,90 +3258,90 @@ for additional privileges during the process. %1 - + I shared something with you I shared something with you - - + + Share... Share... - - + + Copy private link to clipboard Copy private link to clipboard - + Send private link by email... Send private link by email... - + Resharing this file is not allowed Resharing this file is not allowed - + Resharing this folder is not allowed Resharing this folder is not allowed - + Create and copy public link to clipboard Create and copy public link to clipboard - + Copy public link to clipboard Copy public link to clipboard - + Open in %1 Open in %1 - + Show file versions in web browser - + Show file versions in web browser - + Rename... Rename... - + Rename and upload... Rename and upload... - - + + Move and rename... Move and rename... - + Move, rename and upload... Move, rename and upload... - + Delete local changes Delete local changes - + Move and upload... Move and upload... - + Delete Delete @@ -3851,7 +3857,7 @@ Are you sure you want to proceed? Create a new account - + Create a new account @@ -3872,7 +3878,7 @@ Are you sure you want to proceed? Resume synchronization - + Resume synchronisation @@ -4183,7 +4189,7 @@ Are you sure you want to proceed? Filename Reserved - + Filename Reserved @@ -4273,12 +4279,12 @@ Are you sure you want to proceed? account loading - + Error accessing the configuration file Error accessing the configuration file - + There was an error while accessing the configuration file at %1. There was an error while accessing the configuration file at %1. @@ -4288,7 +4294,7 @@ Are you sure you want to proceed? %1 %2%7%8Libraries Qt %3, %4%7Using virtual files plugin: %5%7%6 - + %1 %2%7%8Libraries Qt %3, %4%7Using virtual files plugin: %5%7%6 @@ -4370,7 +4376,7 @@ Are you sure you want to proceed? Server version downloaded, local copy was backed up as conflict file - + Server version downloaded, local copy was backed up as conflict file @@ -4460,9 +4466,9 @@ Are you sure you want to proceed? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version - + Some settings were configured in newer versions of this client and use features that are not available in this version \ No newline at end of file diff --git a/translations/client_es.ts b/translations/client_es.ts index 679df33904b..8a866fde6ca 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage Para más información, mira %1 @@ -423,7 +423,7 @@ - + Cancel Cancelar @@ -464,14 +464,15 @@ - + + Add Space Agregar un espacio - - + + Add Folder Añadir carpeta @@ -588,47 +589,52 @@ Por favor, autentiquese usando su navegador. Iniciar sesión - + Click this button to add a Space. Pulse este botón para añadir un espacio. - + Click this button to add a folder to synchronize. Haga clic en este botón para añadir una carpeta a sincronizar - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. Tú necesita conectar para agregar una carpeta - + There are folders that were not synchronized because they are too big: Hay carpetas que no fueron sincronizadas porque son demasiado grandes: - + There are folders that were not synchronized because they are external storages: Hay carpetas que no fueron sincronizadas porque residen en almacenamiento externo: - + There are folders that were not synchronized because they are too big or external storages: Hay carpetas que no fueron sincronizadas porque son demasiado grandes o residen en almacenamiento externo: - + Confirm Account Removal Confirmar eliminación de cuenta - + <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> <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> - + Remove connection Eliminar conexión @@ -801,7 +807,7 @@ La actualización se realizará en segundo plano, y sobreescribirá el actual fi OCC::Application - + Quit Salir @@ -877,7 +883,7 @@ Este es nuevo modo en fase experimental. Si decide usarlo, por favor repórtenos OCC::CredentialJob - + Failed to parse credentials %1 Ha fallado la comprobación de credenciales %1 @@ -3199,48 +3205,48 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud Compartir con %1 - + Context menu share Compartido de menu contextual - + Context menu share %1 Menú contextual compartir %1 - + Confirm deletion Confirmar eliminación - + Do you want to delete the directory <i>%1</i> and all its contents permanently? ¿Desea eliminar el directorio <i>%1</i> y todo su contenido permanentemente? - + Do you want to delete the file <i>%1</i> permanently? ¿Desea eliminar el archivo <i>%1</i> de manera permanente? - + Select new location... Seleccionar nueva ubicación... - + Error Error - + Moving file failed: %1 @@ -3249,90 +3255,90 @@ for additional privileges during the process. %1 - + I shared something with you He compartido algo contigo - - + + Share... Compartir... - - + + Copy private link to clipboard Copiar enlace privado al portapapeles - + Send private link by email... Enviar enlace privado por e-mail... - + Resharing this file is not allowed No está permitido volver a compartir este archivo - + Resharing this folder is not allowed Recompartir esta carpeta no está permitido - + Create and copy public link to clipboard Crear y copiar enlace público al portapapeles - + Copy public link to clipboard Copiar enlace público al portapapeles - + Open in %1 Abierto en %1 - + Show file versions in web browser - + Rename... Renombrar... - + Rename and upload... Renombrar y subir... - - + + Move and rename... Mover y renombrar... - + Move, rename and upload... Mover, renombrar y subir... - + Delete local changes Eliminar cambios locales - + Move and upload... Mover y subir... - + Delete Eliminar @@ -4270,12 +4276,12 @@ Está seguro que quiere continuar? account loading - + Error accessing the configuration file Error al acceder al archivo de configuración - + There was an error while accessing the configuration file at %1. Ha ocurrido un error al acceder al archivo de configuración %1. @@ -4457,7 +4463,7 @@ Está seguro que quiere continuar? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version diff --git a/translations/client_et.ts b/translations/client_et.ts index 1ba2686fc0f..112fcdf2aee 100644 --- a/translations/client_et.ts +++ b/translations/client_et.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage Lisateabe saamiseks vt %1 @@ -423,7 +423,7 @@ - + Cancel Loobu @@ -464,14 +464,15 @@ - + + Add Space Lisa ruum - - + + Add Folder Lisa kaust @@ -588,47 +589,52 @@ Palun autentige end brauseri abil. Logi sisse - + Click this button to add a Space. Vajuta nuppu et lisada ruum - + Click this button to add a folder to synchronize. Sünkroniseeritava kausta lisamiseks kliki sellele nupule. - + + You need to be connected to add a Space. + Ruumi lisamiseks pead olema ühendatud. + + + You need to be connected to add a folder. Kausta lisamiseks pead olema ühendatud. - + There are folders that were not synchronized because they are too big: Mõned kataloogid jäeti liigse suuruse tõttu sünkroniseerimata: - + There are folders that were not synchronized because they are external storages: Mõned kataloogid jäeti sünkroniseerimata, sest nad asusid välistel ketastel: - + There are folders that were not synchronized because they are too big or external storages: Mõned kataloogid jäeti sünkroniseerimata, sest nad asusid välistel ketastel või olid liiga suured: - + Confirm Account Removal Kinnita konto eemaldamine - + <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> <p>Kas soovid tõesti ühenduse kontoga <i>%1</i> eemaldada?</p><p><b>Märkus:</b> See <b>ei</b> kustuta ühtegi faili.</p> - + Remove connection Eemalda ühendus @@ -801,7 +807,7 @@ Uuendus toimub taustal ja kirjutab praeguse AppImage'i faili üle. Uuendami OCC::Application - + Quit Lõpeta @@ -877,7 +883,7 @@ See on uus, eksperimentaalne režiim. Kui otsustate seda kasutada, palun teatage OCC::CredentialJob - + Failed to parse credentials %1 Kasutajaandmete parsimine ebaõnnestus %1 @@ -3200,48 +3206,48 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud Jaga kasutajaga %1 - + Context menu share Kontekstimenüü jagamine - + Context menu share %1 Kontekstimenüü jagamine %1 - + Confirm deletion Kinnita kustutamine - + Do you want to delete the directory <i>%1</i> and all its contents permanently? Kas soovite kataloogi <i>%1</i> ja kogu selle sisu jäädavalt kustutada? - + Do you want to delete the file <i>%1</i> permanently? Kas soovite faili <i>%1</i> jäädavalt kustutada? - + Select new location... Vali uus asukoht... - + Error Viga - + Moving file failed: %1 @@ -3250,90 +3256,90 @@ for additional privileges during the process. %1 - + I shared something with you Jagasin teiega midagi - - + + Share... Jaga... - - + + Copy private link to clipboard Kopeeri privaatne link lõikelauale - + Send private link by email... Saada privaatne link e-posti teel... - + Resharing this file is not allowed Selle faili edasijagamine ei ole lubatud - + Resharing this folder is not allowed Selle kausta edasijagamine ei ole lubatud - + Create and copy public link to clipboard Loo avalik link ja kopeeri lõikepuhvrisse - + Copy public link to clipboard Kopeeri avalik link lõikepuhvrisse - + Open in %1 Ava asukohas %1 - + Show file versions in web browser Näita faili versioone veebisirvijas - + Rename... Nimeta ümber... - + Rename and upload... Nimeta ümber ja lae üles... - - + + Move and rename... Liiguta ja nimeta ümber... - + Move, rename and upload... Liiguta, nimeta ümber ja laadi üles… - + Delete local changes Kustuta kohalikud muudatused - + Move and upload... Liiguta ja laadi üles... - + Delete Kustuta @@ -4271,12 +4277,12 @@ Kas olete kindel, et soovite jätkata? account loading - + Error accessing the configuration file Viga seadete faili pääsemisel - + There was an error while accessing the configuration file at %1. Tekkis viga pääsuga seadete faili aadressil %1. @@ -4458,7 +4464,7 @@ Kas olete kindel, et soovite jätkata? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version Mõned sätted olid seadistatud selle kliendi uuemas versioonis ja kasutavad võimalusi, misa käesolevas versioonis ei ole saadaval diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 9c925610ef9..412c7fc8912 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage @@ -423,7 +423,7 @@ - + Cancel Annuler @@ -464,14 +464,15 @@ - + + Add Space - - + + Add Folder Ajouter un dossier @@ -586,47 +587,52 @@ Please authenticate using your browser. Se connecter - + Click this button to add a Space. - + Click this button to add a folder to synchronize. Cliquez ce bouton pour ajouter un dossier à synchroniser. - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. - + There are folders that were not synchronized because they are too big: Certains dossiers n'ont pas été synchronisés parce qu'ils sont de taille trop importante : - + There are folders that were not synchronized because they are external storages: Certains dossiers n'ont pas été synchronisés parce qu'ils sont localisés sur un stockage externe : - + There are folders that were not synchronized because they are too big or external storages: 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 : - + Confirm Account Removal Confirmation de retrait du compte - + <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> <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> - + Remove connection Retirer le compte @@ -797,7 +803,7 @@ The update will be performed in the background, and overwrite the current AppIma OCC::Application - + Quit Quitter @@ -867,7 +873,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::CredentialJob - + Failed to parse credentials %1 @@ -3189,48 +3195,48 @@ L'assistant de mise à jour peut vous demandez des autorisations supplémen OCC::SocketApi - + Share with %1 parameter is ownCloud Partager avec %1 - + Context menu share Partage du menu contextuel - + Context menu share %1 Partage du menu contextuel %1 - + Confirm deletion Confirmez la suppression - + Do you want to delete the directory <i>%1</i> and all its contents permanently? Êtes-vous sûr de vouloir supprimer le répertoire <i>%1</i> et tout son contenu de manière permanente ? - + Do you want to delete the file <i>%1</i> permanently? Voulez-vous vraiment supprimer définitivement le fichier <i>%1</i> ? - + Select new location... Sélectionner nouvel emplacement.. - + Error Erreur - + Moving file failed: %1 @@ -3239,90 +3245,90 @@ L'assistant de mise à jour peut vous demandez des autorisations supplémen %1 - + I shared something with you J'ai partagé quelque chose avec vous - - + + Share... partager - - + + Copy private link to clipboard Copier le lien privé vers le presse-papier - + Send private link by email... Envoyer le lien privé par courriel... - + Resharing this file is not allowed Le repartage de ce fichier n'est pas permis - + Resharing this folder is not allowed Le repartage de ce dossier n'est pas autorisé - + Create and copy public link to clipboard Créer un nouveau lien public et le copier dans le presse-papier - + Copy public link to clipboard Copier le lien public dans le presse-papier - + Open in %1 - + Show file versions in web browser - + Rename... Renommer... - + Rename and upload... Renommer et téléverser... - - + + Move and rename... Déplacer et renommer... - + Move, rename and upload... Déplacer, renommer et téléverser... - + Delete local changes Supprimer les changements locaux - + Move and upload... Déplacer et téléverser... - + Delete Supprimer @@ -4253,12 +4259,12 @@ Are you sure you want to proceed? account loading - + Error accessing the configuration file Erreur lors de l'accès au fichier de configuration - + There was an error while accessing the configuration file at %1. Une erreur s'est produite lors de l'accès au fichier de configuration situé dans %1. @@ -4440,7 +4446,7 @@ Are you sure you want to proceed? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 5b2baa9e8bb..3ffa9b5ea14 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage @@ -423,7 +423,7 @@ - + Cancel Cancelar @@ -464,14 +464,15 @@ - + + Add Space - - + + Add Folder Engadir un cartafol @@ -586,47 +587,52 @@ Please authenticate using your browser. Acceder - + Click this button to add a Space. - + Click this button to add a folder to synchronize. Prema nesta botón para engadir un cartafol para sincronizar - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. - + There are folders that were not synchronized because they are too big: Hai cartafoles que non se sincronizaron por ser demasiado grandes: - + There are folders that were not synchronized because they are external storages: Hai cartafoles que non se sincronizaron porque son almacenamentos externos: - + There are folders that were not synchronized because they are too big or external storages: Hai cartafoles que non se sincronizaron porque son demasiado grandes ou almacenamentos externos: - + Confirm Account Removal Confirme a retirada da conta - + <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> <p>De verdade quere retirar a conexión a conta <i>%1</i>?</p><p><b>Aviso:</b> Isto <b>non</b> eliminará ningún ficheiro.</p> - + Remove connection Retirar conexión @@ -797,7 +803,7 @@ The update will be performed in the background, and overwrite the current AppIma OCC::Application - + Quit Saír @@ -867,7 +873,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::CredentialJob - + Failed to parse credentials %1 @@ -3189,48 +3195,48 @@ actualización pode pedir privilexios adicionais durante o procedemento. OCC::SocketApi - + Share with %1 parameter is ownCloud Compartir con %1 - + Context menu share Compartir o menú contextual - + Context menu share %1 Menú contextual compartir %1 - + Confirm deletion Confirmar a eliminación - + Do you want to delete the directory <i>%1</i> and all its contents permanently? Confirma que quere eliminar o directorio <i>%1</i> e todo o seu contido de xeito permanente? - + Do you want to delete the file <i>%1</i> permanently? Confirma que quere eliminar o ficheiro <i>%1</i> de xeito permanente? - + Select new location... Seleccionar nova localización… - + Error Erro - + Moving file failed: %1 @@ -3239,90 +3245,90 @@ actualización pode pedir privilexios adicionais durante o procedemento. - + I shared something with you Compartín algo con vostede - - + + Share... Compartir... - - + + Copy private link to clipboard Copiar a ligazón privada no portapapeis - + Send private link by email... Enviar a ligazón privada por correo... - + Resharing this file is not allowed Non está permitido volver compartir este ficheiro - + Resharing this folder is not allowed Non está permitido volver compartir este cartafol - + Create and copy public link to clipboard - + Copy public link to clipboard Copiar a ligazón pública no portapapeis - + Open in %1 - + Show file versions in web browser - + Rename... Renomear… - + Rename and upload... Renomear e enviar… - - + + Move and rename... Mover e renomear… - + Move, rename and upload... Mover, renomear e enviar… - + Delete local changes Eliminar os cambios locais - + Move and upload... Mover e enviar… - + Delete Eliminar @@ -4253,12 +4259,12 @@ Are you sure you want to proceed? account loading - + Error accessing the configuration file Produciuse un erro ao acceder ao ficheiro de configuración - + There was an error while accessing the configuration file at %1. Produciuse un erro ao acceder ao ficheiro de configuración en %1. @@ -4440,7 +4446,7 @@ Are you sure you want to proceed? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version diff --git a/translations/client_he.ts b/translations/client_he.ts index add36a26e97..ff956e34ceb 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage @@ -423,7 +423,7 @@ - + Cancel ביטול @@ -464,14 +464,15 @@ - + + Add Space - - + + Add Folder הוספת תיקייה @@ -586,47 +587,52 @@ Please authenticate using your browser. כניסה - + Click this button to add a Space. - + Click this button to add a folder to synchronize. יש ללחוץ על כפתור זה להוספת תיקייה לסנכרון. - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. - + There are folders that were not synchronized because they are too big: קיימות תיקיות שלא סונכרנו כיוון שהן גדולות מדי: - + There are folders that were not synchronized because they are external storages: קיימות תיקיות שלא סונכרנו כיוון שהן על אחסון חיצוני: - + There are folders that were not synchronized because they are too big or external storages: קיימות תיקיות שלא סונכרנו כיוון שהן גדולות מדי או שהן על אחסון חיצוני: - + Confirm Account Removal יש לאשר הסרת חשבון - + <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> <p>האם באמת להסיר את החיבור לחשבון <i>%1</i>?</p><p><b>הערה:</b> הפעולה <b>לא</b> תמחק אף קובץ.</p> - + Remove connection הסרת חיבור @@ -797,7 +803,7 @@ The update will be performed in the background, and overwrite the current AppIma OCC::Application - + Quit יציאה @@ -867,7 +873,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::CredentialJob - + Failed to parse credentials %1 @@ -3187,48 +3193,48 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud משתף עם %1 - + Context menu share שיתוף תפריט הקשר - + Context menu share %1 שיתוף תפריט הקשר %1 - + Confirm deletion אישור מחיקה - + Do you want to delete the directory <i>%1</i> and all its contents permanently? האם ברצונך למחוק לצמיתות את תיקייה <i>%1</i> ואת כל התוכן שבתוכה? - + Do you want to delete the file <i>%1</i> permanently? האם למחוק את קובץ <i>%1</i> לצמיתות? - + Select new location... בחירת מיקום חדש... - + Error שגיאה - + Moving file failed: %1 @@ -3237,90 +3243,90 @@ for additional privileges during the process. %1 - + I shared something with you שיתפתי משהו איתך - - + + Share... שיתוף... - - + + Copy private link to clipboard העתקת קישור ציבורי ללוח הגזירים - + Send private link by email... שליחת קישור ציבורי על בסיס דואר אלקטרוני... - + Resharing this file is not allowed שיתוף מחדש של קובץ זה אסור - + Resharing this folder is not allowed שיתוף מחדש של התיקייה אסור - + Create and copy public link to clipboard - + Copy public link to clipboard העתקת קישור ציבורי ללוח הגזירים - + Open in %1 - + Show file versions in web browser - + Rename... שינוי שם... - + Rename and upload... שינוי שם והעלאה... - - + + Move and rename... העברה ושינוי שם... - + Move, rename and upload... העברה, שינוי שם והעלאה... - + Delete local changes מחיקת שינויים מקומיים - + Move and upload... העברה והעלאה... - + Delete מחיקה @@ -4251,12 +4257,12 @@ Are you sure you want to proceed? account loading - + Error accessing the configuration file שגיאה בכניסה לקובץ הגדרות - + There was an error while accessing the configuration file at %1. אירעה שגיאה בכניסה לקובץ ההגדרות ב- %1. @@ -4438,7 +4444,7 @@ Are you sure you want to proceed? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version diff --git a/translations/client_it.ts b/translations/client_it.ts index cc8a875da42..34233772df5 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage Per informazioni aggiuntive, vedi %1 @@ -423,7 +423,7 @@ - + Cancel Annulla @@ -464,14 +464,15 @@ - + + Add Space - - + + Add Folder Aggiungi cartella @@ -586,47 +587,52 @@ Please authenticate using your browser. Accedi - + Click this button to add a Space. - + Click this button to add a folder to synchronize. Fai clic su questo pulsante per aggiungere una cartella da sincronizzare. - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. - + There are folders that were not synchronized because they are too big: Ci sono nuove cartelle che non sono state sincronizzate poiché sono troppo grandi: - + There are folders that were not synchronized because they are external storages: Ci sono nuove cartelle che non sono state sincronizzate poiché sono archiviazioni esterne: - + There are folders that were not synchronized because they are too big or external storages: Ci sono nuove cartelle che non sono state sincronizzate poiché sono troppo grandi o archiviazioni esterne: - + Confirm Account Removal Conferma rimozione account - + <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> <p>Vuoi davvero eliminare la connessione all'account <i>%1</i>?</p><p><b>Nota:</b> ciò <b>non</b> eliminerà alcun file.</p> - + Remove connection Rimuovi connessione @@ -797,7 +803,7 @@ The update will be performed in the background, and overwrite the current AppIma OCC::Application - + Quit Esci @@ -867,7 +873,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::CredentialJob - + Failed to parse credentials %1 Elaborazione delle credenziali %1 fallita @@ -3188,48 +3194,48 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud Condividi con %1 - + Context menu share Menu contestuale condivisione - + Context menu share %1 Menu contestuale condivisione %1 - + Confirm deletion Conferma l'eliminazione - + Do you want to delete the directory <i>%1</i> and all its contents permanently? Vuoi eliminare definitivamente la cartella <i>%1</i> e tutto ciò che contiene? - + Do you want to delete the file <i>%1</i> permanently? Vuoi eliminare definitivamente il file <i>%1</i>? - + Select new location... Seleziona una nuova locazione... - + Error Errore - + Moving file failed: %1 @@ -3238,90 +3244,90 @@ for additional privileges during the process. %1 - + I shared something with you Ho condiviso qualcosa con te - - + + Share... Condividi... - - + + Copy private link to clipboard Copia link privato negli appunti - + Send private link by email... Invia link privato per email - + Resharing this file is not allowed Ricondividere questo file non è permesso - + Resharing this folder is not allowed Ricondividere questa cartella non è permesso - + Create and copy public link to clipboard Crea e copia un link pubblico negli appunti - + Copy public link to clipboard Copia link pubblico negli appunti - + Open in %1 - + Show file versions in web browser - + Rename... Rinomina... - + Rename and upload... Rinomina e carica... - - + + Move and rename... Sposta e rinomina... - + Move, rename and upload... Sposta, rinomina e carica... - + Delete local changes Elimina le modifiche in locale - + Move and upload... Sposta e carica... - + Delete Elimina @@ -4252,12 +4258,12 @@ Are you sure you want to proceed? account loading - + Error accessing the configuration file Errore accedendo al file di configurazione - + There was an error while accessing the configuration file at %1. Si è verificato un errore durante l'accesso al file di configurazione su %1. @@ -4439,7 +4445,7 @@ Are you sure you want to proceed? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version diff --git a/translations/client_ja.ts b/translations/client_ja.ts index b2c6666ec0c..9370577ab58 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage 詳細については、%1 を参照してください。 @@ -423,7 +423,7 @@ - + Cancel キャンセル @@ -464,14 +464,15 @@ - + + Add Space - - + + Add Folder フォルダーを追加 @@ -588,47 +589,52 @@ Please authenticate using your browser. ログイン - + Click this button to add a Space. - + Click this button to add a folder to synchronize. このボタンをクリックして同期フォルダーを追加してください。 - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. - + There are folders that were not synchronized because they are too big: 大きすぎるため同期されなかったフォルダーがあります: - + There are folders that were not synchronized because they are external storages: 外部ストレージにあるため同期されなかったフォルダーがあります: - + There are folders that were not synchronized because they are too big or external storages: 大きすぎたか、外部ストレージにあるため同期されなかったフォルダーがあります: - + Confirm Account Removal アカウント削除確認 - + <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> <p> アカウント <i>%1</i> を本当に削除しますか?</p><p><b>注意:</b> これによりファイルが一切削除されることはありません。</p> - + Remove connection 接続削除 @@ -799,7 +805,7 @@ The update will be performed in the background, and overwrite the current AppIma OCC::Application - + Quit 終了 @@ -869,7 +875,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::CredentialJob - + Failed to parse credentials %1 資格情報 %1 の解析に失敗しました。 @@ -3184,48 +3190,48 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud %1 と共有 - + Context menu share コンテキストメニュー共有 - + Context menu share %1 コンテキストメニュー共有 %1 - + Confirm deletion 削除の確認 - + Do you want to delete the directory <i>%1</i> and all its contents permanently? ディレクトリ <i>%1</i> とその内容をすべて完全に削除しますか？ - + Do you want to delete the file <i>%1</i> permanently? ファイル <i>%1</i> を完全に削除しますか？ - + Select new location... 新しい場所を選択... - + Error エラー - + Moving file failed: %1 @@ -3234,90 +3240,90 @@ for additional privileges during the process. %1 - + I shared something with you あなたと何かを共有しました - - + + Share... 共有... - - + + Copy private link to clipboard クリップボードにプライベートリンクをコピー - + Send private link by email... メールでプライベートリンクを送信 - + Resharing this file is not allowed このファイルの再共有は許可されていません - + Resharing this folder is not allowed このフォルダの再共有は許可されていません - + Create and copy public link to clipboard 公開リンクを作成しクリップボードにコピーする - + Copy public link to clipboard クリップボードに公開リンクをコピー - + Open in %1 %1 を開く - + Show file versions in web browser - + Rename... 名前の変更... - + Rename and upload... 名前の変更とアップロード... - - + + Move and rename... 移動と名前の変更... - + Move, rename and upload... 移動, 名前の変更とアップロード... - + Delete local changes ローカルでの変更を削除する - + Move and upload... 移動とアップロード... - + Delete 削除 @@ -4248,12 +4254,12 @@ Are you sure you want to proceed? account loading - + Error accessing the configuration file 設定ファイルのアクセスでエラーが発生しました - + There was an error while accessing the configuration file at %1. 設定ファイルの %1 行目にアクセスしている時にエラーが発生しました。 @@ -4435,7 +4441,7 @@ Are you sure you want to proceed? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version diff --git a/translations/client_ko.ts b/translations/client_ko.ts index 8c3954b50a9..895c7b5013e 100644 --- a/translations/client_ko.ts +++ b/translations/client_ko.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage 자세히 알아보려면 다음을 참조하세요: %1 @@ -423,7 +423,7 @@ - + Cancel 취소 @@ -464,14 +464,15 @@ - + + Add Space 스페이스 추가 - - + + Add Folder 폴더 추가 @@ -588,47 +589,52 @@ Please authenticate using your browser. 로그인 - + Click this button to add a Space. 스페이스를 추가하려면 이 버튼을 클릭하세요. - + Click this button to add a folder to synchronize. 동기화할 폴더를 추가하려면 이 단추를 누르십시오. - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. 폴더를 추가하려면 연결되어 있어야 합니다. - + There are folders that were not synchronized because they are too big: 이 폴더는 너무 커서 동기화할 수 없습니다: - + There are folders that were not synchronized because they are external storages: 이 폴더는 외부 저장소여서 동기화할 수 없습니다: - + There are folders that were not synchronized because they are too big or external storages: 이 폴더는 너무 크거나 외부 저장소여서 동기화할 수 없습니다: - + Confirm Account Removal 계정 삭제 확인 - + <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> <p>계정 <i>%1</i>의 연결을 삭제하시겠습니까?</p><p><b>메모:</b> 이 작업은 파일을 삭제하지 <b>않습니다.</b></p> - + Remove connection 연결 삭제 @@ -801,7 +807,7 @@ The update will be performed in the background, and overwrite the current AppIma OCC::Application - + Quit 끝내기 @@ -877,7 +883,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::CredentialJob - + Failed to parse credentials %1 %1 인증 정보 해석 실패 @@ -3201,48 +3207,48 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud %1(으)로 공유하기 - + Context menu share 컨텍스트 메뉴 공유 - + Context menu share %1 컨텍스트 메뉴 공유 %1 - + Confirm deletion 삭제 확인 - + Do you want to delete the directory <i>%1</i> and all its contents permanently? <i>%1</i> 디렉터리와 모든 콘텐츠를 영구적으로 삭제하시겠습니까? - + Do you want to delete the file <i>%1</i> permanently? <i>%1</i> 파일을 영구적으로 삭제하시겠습니까? - + Select new location... 새로운 경로 선택... - + Error 오류 - + Moving file failed: %1 @@ -3251,90 +3257,90 @@ for additional privileges during the process. %1 - + I shared something with you 무언가를 여러분과 공유했습니다 - - + + Share... 공유... - - + + Copy private link to clipboard 클립보드에 비밀 링크 복사 - + Send private link by email... 이메일로 비밀 링크 보내기... - + Resharing this file is not allowed 이 파일의 재 공유는 허용되지 않습니다 - + Resharing this folder is not allowed 이 폴더는 재공유가 허가되지 않음 - + Create and copy public link to clipboard 공공 링크를 생성하고 클립보드에 복사 - + Copy public link to clipboard 공공 링크를 클립보드에 복사 - + Open in %1 %1에서 열기 - + Show file versions in web browser - + Rename... 이름변경... - + Rename and upload... 이름 변경 후 업로드... - - + + Move and rename... 이동 + 이름변경... - + Move, rename and upload... 이동, 개명과 업로드... - + Delete local changes 로컬 변경 내용 삭제 - + Move and upload... 이동과 업로드... - + Delete 삭제 @@ -4272,12 +4278,12 @@ Are you sure you want to proceed? account loading - + Error accessing the configuration file 설정 파일 접근 오류 - + There was an error while accessing the configuration file at %1. %1에 있는 설정 파일에 접근하는 중 오류가 발생했습니다. @@ -4459,7 +4465,7 @@ Are you sure you want to proceed? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version diff --git a/translations/client_nl.ts b/translations/client_nl.ts index d70c4339d02..cabbabcaa60 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage Voor moor informatie, zie %1 @@ -423,7 +423,7 @@ - + Cancel Annuleren @@ -464,14 +464,15 @@ - + + Add Space Space toevoegen - - + + Add Folder Voeg map toe @@ -588,47 +589,52 @@ Hernieuw de authenticatie met de web browser. Meld u aan - + Click this button to add a Space. Klik op deze knop om een Space toe te voegen. - + Click this button to add a folder to synchronize. Klik op deze knop om een te synchroniseren map toe te voegen. - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. U moet verbonden zijn om een map toe te voegen - + There are folders that were not synchronized because they are too big: Er zijn mappen die niet gesynchroniseerd werden, omdat ze te groot zijn: - + There are folders that were not synchronized because they are external storages: Er zijn mappen die niet gesynchroniseerd werden, omdat ze op externe opslag staan: - + There are folders that were not synchronized because they are too big or external storages: Er zijn mappen die niet gesynchroniseerd werden, omdat ze te groot zijn of op externe opslag staan: - + Confirm Account Removal Bevestig verwijderen account - + <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> <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> - + Remove connection Verwijderen verbinding @@ -801,7 +807,7 @@ De update wordt uitgevoerd op de achtergrond en zal het bestaande AppImage besta OCC::Application - + Quit Afsluiten @@ -877,7 +883,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d OCC::CredentialJob - + Failed to parse credentials %1 Kon inloggegevens niet verwerken %1 @@ -3203,48 +3209,48 @@ vragen om extra autorisaties tijdens installatie. OCC::SocketApi - + Share with %1 parameter is ownCloud Delen met %1 - + Context menu share Contextmenu delen - + Context menu share %1 Contextmenu delen %1 - + Confirm deletion Bevestig verwijderen - + Do you want to delete the directory <i>%1</i> and all its contents permanently? Wil je de map <i>%1</i> en de inhoud daarvan permanent verwijderen? - + Do you want to delete the file <i>%1</i> permanently? Wil je het bestand <i>%1</i> permanent verwijderen? - + Select new location... Selecteer nieuwe locatie... - + Error Fout - + Moving file failed: %1 @@ -3253,90 +3259,90 @@ vragen om extra autorisaties tijdens installatie. %1 - + I shared something with you Ik deelde iets met u - - + + Share... Delen... - - + + Copy private link to clipboard Kopiëren privé-link naar klembord - + Send private link by email... Verstuur privélink per e-mail - + Resharing this file is not allowed Opnieuw delen van dit bestand is niet toegestaan - + Resharing this folder is not allowed Opnieuw delen van deze map is niet toegestaan - + Create and copy public link to clipboard Kopieer openbare link naar klembord - + Copy public link to clipboard Kopieer openbare link naar klembord - + Open in %1 Open in %1 - + Show file versions in web browser - + Rename... Hernoemen... - + Rename and upload... Hernoemen en uploaden... - - + + Move and rename... Verplaatsen en hernoemen... - + Move, rename and upload... Verplaatsen, hernoemen en uploaden... - + Delete local changes Verwijder lokale wijzigingen - + Move and upload... Verplaatsen en uploaden... - + Delete Verwijderen @@ -4274,12 +4280,12 @@ Weet U zeker dat U verder wilt gaan? account loading - + Error accessing the configuration file Fout bij benaderen configuratiebestand - + There was an error while accessing the configuration file at %1. Er trad een fout op bij het benaderen configuratiebestand op %1 @@ -4461,7 +4467,7 @@ Weet U zeker dat U verder wilt gaan? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index e6ecbfe7f17..ccdb4f090d3 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage Para mais informações, veja %1 @@ -423,7 +423,7 @@ - + Cancel Cancelar @@ -464,14 +464,15 @@ - + + Add Space Add Space - - + + Add Folder Adicionar Pasta @@ -588,47 +589,52 @@ Por favor, autentique usando seu navegador. Entrar - + Click this button to add a Space. Click this button to add a Space. - + Click this button to add a folder to synchronize. Clique nesse botão para adicionar uma pasta para sincronizar. - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. You need to be connected to add a folder. - + There are folders that were not synchronized because they are too big: Existem pastas que não foram sincronizadas porque são muito grandes: - + There are folders that were not synchronized because they are external storages: Existem pastas que não foram sincronizadas porque são armazenamentos externos: - + There are folders that were not synchronized because they are too big or external storages: Existem pastas que não foram sincronizadas porque são muito grandes ou armazenamentos externos: - + Confirm Account Removal Confirmar a Remoção da Conta - + <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> <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> - + Remove connection Remover conexão @@ -801,7 +807,7 @@ A atualização será executada em segundo plano e substituirá o arquivo AppIma OCC::Application - + Quit Sair @@ -877,7 +883,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, informe quaisquer p OCC::CredentialJob - + Failed to parse credentials %1 Falha ao analisar as credenciais %1 @@ -3200,48 +3206,48 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud Compartilhar com %1 - + Context menu share Compartilhar contexto do menu - + Context menu share %1 Compartilhar o contexto do menu %1 - + Confirm deletion Confirme a exclusão - + Do you want to delete the directory <i>%1</i> and all its contents permanently? Você deseja excluir o diretório <i>%1</i> e todo o seu conteúdo permanentemente? - + Do you want to delete the file <i>%1</i> permanently? Você quer apagar o arquivo <i>%1</i> permanentemente? - + Select new location... Selecione um novo local... - + Error Erro - + Moving file failed: %1 @@ -3250,90 +3256,90 @@ for additional privileges during the process. %1 - + I shared something with you Eu compartilhei algo com você - - + + Share... Compartilhar... - - + + Copy private link to clipboard Copie o linque privado para a área de transferência - + Send private link by email... Envie o linque privado por e-mail... - + Resharing this file is not allowed Não é permitido compartilhar novamente este arquivo - + Resharing this folder is not allowed Não é permitido compartilhar novamente esta pasta - + Create and copy public link to clipboard Criar e copiar linque público para a área de transferência - + Copy public link to clipboard Copiar linque público para a área de transferência - + Open in %1 Aberto em %1 - + Show file versions in web browser Mostrar versões de arquivos no navegador da web - + Rename... Renomear - + Rename and upload... Renomeie e faça o upload... - - + + Move and rename... Mover e renomear... - + Move, rename and upload... Mova, renomeie e faça o upload... - + Delete local changes Excluir alterações locais - + Move and upload... Mover e enviar... - + Delete Excluir @@ -4271,12 +4277,12 @@ Tem certeza de que deseja continuar? account loading - + Error accessing the configuration file Erro acessando o arquivo de configuração - + There was an error while accessing the configuration file at %1. Ocorreu um erro ao acessar o arquivo de configuração em %1. @@ -4458,7 +4464,7 @@ Tem certeza de que deseja continuar? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version Algumas configurações foram definidas em versões mais recentes deste cliente e utilizam recursos que não estão disponíveis nesta versão diff --git a/translations/client_ru.ts b/translations/client_ru.ts index e54833691d5..690bb4ac443 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage @@ -423,7 +423,7 @@ - + Cancel Отмена @@ -464,14 +464,15 @@ - + + Add Space - - + + Add Folder Добавить каталог @@ -586,47 +587,52 @@ Please authenticate using your browser. Войти - + Click this button to add a Space. - + Click this button to add a folder to synchronize. Нажмите на эту кнопку для добавления каталога к синхронизации. - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. - + There are folders that were not synchronized because they are too big: Есть каталоги, которые не были синхронизированы, так как они слишком большие: - + There are folders that were not synchronized because they are external storages: Есть каталоги, которые не были синхронизированы, так как они являются внешними хранилищами: - + There are folders that were not synchronized because they are too big or external storages: Есть каталоги, которые не были синхронизированы, так как они слишком велики или являются внешними хранилищами: - + Confirm Account Removal Подтверждение удаления учетной записи - + <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> <p>Вы действительно желаете удалить подключение к учетной записи <i>%1</i>?</p><p><b>Примечание:</b> Это действие <b>НЕ</b> удалит ваши файлы.</p> - + Remove connection Удалить подключение @@ -797,7 +803,7 @@ The update will be performed in the background, and overwrite the current AppIma OCC::Application - + Quit Выход @@ -867,7 +873,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::CredentialJob - + Failed to parse credentials %1 Не удалось разобрать учётные данные %1 @@ -3189,48 +3195,48 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud Поделиться с %1 - + Context menu share Доступ через контекстное меню - + Context menu share %1 Доступ через контекстное меню к %1 - + Confirm deletion Подтвердите удаление - + Do you want to delete the directory <i>%1</i> and all its contents permanently? Хотите окончательно удалить каталог <i>%1</i>, и всё его содержимое? - + Do you want to delete the file <i>%1</i> permanently? Хотите окончательно удалить файл <i>%1</i>? - + Select new location... Выберите новое местоположение… - + Error Ошибка - + Moving file failed: %1 @@ -3239,90 +3245,90 @@ for additional privileges during the process. %1 - + I shared something with you Я поделился с тобой - - + + Share... Поделиться... - - + + Copy private link to clipboard Копировать приватную ссылку в буфер обмена... - + Send private link by email... Отправить приватную ссылку по email... - + Resharing this file is not allowed Повторное предоставление доступа к этому файлу не разрешено - + Resharing this folder is not allowed Повторное предоставление доступа к этому каталогу не разрешено - + Create and copy public link to clipboard Создать общедоступную ссылку и скопировать её в буфер обмена - + Copy public link to clipboard Копировать общую ссылку в буфер обмена - + Open in %1 - + Show file versions in web browser - + Rename... Переименовать… - + Rename and upload... Переименовать и закачать… - - + + Move and rename... Переместить и переименовать… - + Move, rename and upload... Переместить, переименовать, и закачать… - + Delete local changes Удалить локальные изменения - + Move and upload... Переместить и закачать… - + Delete Удалить @@ -4253,12 +4259,12 @@ Are you sure you want to proceed? account loading - + Error accessing the configuration file Ошибка при доступе к файлу конфигурации - + There was an error while accessing the configuration file at %1. При обращении к файлу конфигурации %1 произошла ошибка. @@ -4440,7 +4446,7 @@ Are you sure you want to proceed? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version diff --git a/translations/client_si.ts b/translations/client_si.ts index ae8502cbf98..f3568927263 100644 --- a/translations/client_si.ts +++ b/translations/client_si.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage වැඩි විස්තර සඳහා, %1බලන්න @@ -423,7 +423,7 @@ - + Cancel අවලංගු කරන්න @@ -464,14 +464,15 @@ - + + Add Space - - + + Add Folder @@ -586,47 +587,52 @@ Please authenticate using your browser. ඇතුල් වන්න - + Click this button to add a Space. - + Click this button to add a folder to synchronize. සමමුහුර්ත කිරීමට ෆෝල්ඩරයක් එක් කිරීමට මෙම බොත්තම ක්ලික් කරන්න. - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. - + There are folders that were not synchronized because they are too big: ඒවා විශාල වැඩි නිසා සමමුහුර්ත නොකළ ෆෝල්ඩර තිබේ: - + There are folders that were not synchronized because they are external storages: බාහිර ගබඩා නිසා සමමුහුර්ත නොකළ ෆෝල්ඩර තිබේ: - + There are folders that were not synchronized because they are too big or external storages: ඒවා විශාල හෝ බාහිර ගබඩා නිසා සමමුහුර්ත නොකළ ෆෝල්ඩර ඇත: - + Confirm Account Removal ගිණුම ඉවත් කිරීම තහවුරු කරන්න - + <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> <p>ඔබට ඇත්තටම <i>%1</i>ගිණුමට ඇති සම්බන්ධතාවය ඉවත් කිරීමට අවශ්‍යද?</p><p><b>සටහන:</b> මෙය <b></b> කිසිඳු ගොනුවක් මකන්නේ නැත.</p> - + Remove connection සම්බන්ධතාවය ඉවත් කරන්න @@ -797,7 +803,7 @@ The update will be performed in the background, and overwrite the current AppIma OCC::Application - + Quit ඉවත් @@ -867,7 +873,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::CredentialJob - + Failed to parse credentials %1 අක්තපත්‍ර %1විග්‍රහ කිරීමට අසමත් විය @@ -3189,48 +3195,48 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud %1සමඟ බෙදා ගන්න - + Context menu share සන්දර්භය මෙනුව බෙදාගැනීම - + Context menu share %1 සන්දර්භය මෙනුව බෙදාගැනීම %1 - + Confirm deletion මකාදැමීම තහවුරු කරන්න - + Do you want to delete the directory <i>%1</i> and all its contents permanently? ඔබට ඩිරෙක්ටරිය <i>%1</i> සහ එහි සියලුම අන්තර්ගතයන් ස්ථිරවම මකා දැමීමට අවශ්‍යද? - + Do you want to delete the file <i>%1</i> permanently? ඔබට <i>%1</i> ගොනුව ස්ථිරවම මකා දැමීමට අවශ්‍යද? - + Select new location... නව ස්ථානය තෝරන්න... - + Error දෝෂයකි - + Moving file failed: %1 @@ -3239,90 +3245,90 @@ for additional privileges during the process. %1 - + I shared something with you මම ඔබ සමඟ යමක් බෙදාගත්තා - - + + Share... බෙදාගන්න... - - + + Copy private link to clipboard පුද්ගලික සබැඳිය පසුරු පුවරුවට පිටපත් කරන්න - + Send private link by email... පුද්ගලික සබැඳිය විද්‍යුත් තැපෑලෙන් යවන්න... - + Resharing this file is not allowed මෙම ගොනුව නැවත බෙදා ගැනීමට අවසර නැත - + Resharing this folder is not allowed මෙම ෆෝල්ඩරය නැවත බෙදා ගැනීමට අවසර නැත - + Create and copy public link to clipboard පොදු සබැඳිය පසුරු පුවරුවට සාදා පිටපත් කරන්න - + Copy public link to clipboard පොදු සබැඳිය පසුරු පුවරුවට පිටපත් කරන්න - + Open in %1 - + Show file versions in web browser - + Rename... නැවත නම් කරන්න... - + Rename and upload... නැවත නම් කර උඩුගත කරන්න... - - + + Move and rename... ගෙන ගොස් නැවත නම් කරන්න... - + Move, rename and upload... ගෙන යන්න, නැවත නම් කරන්න සහ උඩුගත කරන්න... - + Delete local changes දේශීය වෙනස්කම් මකන්න - + Move and upload... ගෙන ගොස් උඩුගත කරන්න... - + Delete මකන්න @@ -4253,12 +4259,12 @@ Are you sure you want to proceed? account loading - + Error accessing the configuration file වින්‍යාස ගොනුවට ප්‍රවේශ වීමේ දෝෂයකි - + There was an error while accessing the configuration file at %1. %1හි වින්‍යාස ගොනුවට ප්‍රවේශ වීමේදී දෝෂයක් ඇති විය. @@ -4440,7 +4446,7 @@ Are you sure you want to proceed? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version diff --git a/translations/client_sq.ts b/translations/client_sq.ts index 5fc9909de65..75c90be0469 100644 --- a/translations/client_sq.ts +++ b/translations/client_sq.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage Për më tepër hollësi, shihni %1 @@ -423,7 +423,7 @@ - + Cancel Anuloje @@ -464,14 +464,15 @@ - + + Add Space Shtoni Hapësirë - - + + Add Folder Shtoni Dosje @@ -588,47 +589,52 @@ Ju lutemi, mirëfilltësojeni duke përdorur shfletuesin tuaj. Hyni - + Click this button to add a Space. Klikoni mbi këtë buton që të shtoni një Hapësirë. - + Click this button to add a folder to synchronize. Klikoni mbi këtë buton që të shtoni një dosje për njëkohësim. - + + You need to be connected to add a Space. + Që të shtoni një hapësirë, lypset të jeni i lidhur. + + + You need to be connected to add a folder. Lypset të jeni i lidhur, që të shtoni një dosje. - + There are folders that were not synchronized because they are too big: Ka dosje që s’u njëkohësuan, ngaqë janë shumë të mëdha: - + There are folders that were not synchronized because they are external storages: Ka dosje që s’u njëkohësuan, ngaqë janë depozita të jashtme: - + There are folders that were not synchronized because they are too big or external storages: Ka dosje që s’u njëkohësuan, ngaqë janë shumë të mëdha ose janë depozita të jashtme: - + Confirm Account Removal Ripohoni Heqjen e Llogarisë - + <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> <p>Doni vërtet të hiqet lidhja për te llogaria <i>%1</i>?</p><p><b>Shënim:</b> Kjo <b>nuk</b> do të fshijë ndonjë kartelë.</p> - + Remove connection Hiqe lidhjen @@ -801,7 +807,7 @@ Përditësimi do të kryhet në prapaskenë dhe do të mbishkruajë kartelën e OCC::Application - + Quit Dilni @@ -877,7 +883,7 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju OCC::CredentialJob - + Failed to parse credentials %1 S’u arrit të përtypen kredencialet %1 @@ -3202,48 +3208,48 @@ Gjatë procesit përditësuesi mund të kërkojë privilegje shtesë. OCC::SocketApi - + Share with %1 parameter is ownCloud Ndajeni me %1 - + Context menu share Ndarje përmes menuje konteksti - + Context menu share %1 Ndarje përmes menuje konteksti %1 - + Confirm deletion Ripohoni fshirjen - + Do you want to delete the directory <i>%1</i> and all its contents permanently? Doni të fshihet përgjithmonë drejtoria <i>%1</i> dhe krejt lënda e saj? - + Do you want to delete the file <i>%1</i> permanently? Doni të fshihet përgjithnjë kartela <i>%1</i>? - + Select new location... Përzgjidhni vendndodhje të re… - + Error Gabim - + Moving file failed: %1 @@ -3252,90 +3258,90 @@ Gjatë procesit përditësuesi mund të kërkojë privilegje shtesë. - + I shared something with you Ndava diçka me ju - - + + Share... Ndani me të tjerë… - - + + Copy private link to clipboard Kopjoje lidhjen private në të papastër - + Send private link by email... Dërgoni lidhje private me email… - + Resharing this file is not allowed Rindarja e kësaj kartelë s’është e lejuar - + Resharing this folder is not allowed Nuk lejohet rindarja e kësaj dosjeje - + Create and copy public link to clipboard Krijoni dhe kopjojeni lidhjen publike në të papastër - + Copy public link to clipboard Kopjoje lidhjen publike në të papastër - + Open in %1 Hape me %1 - + Show file versions in web browser Shfaq në shfletues versione kartelash - + Rename... Riemërtoni… - + Rename and upload... Riemërtoni dhe ngarkoni… - - + + Move and rename... Zhvendosni dhe riemërtoni… - + Move, rename and upload... Zhvendosni, riemërtoni dhe ngarkoni… - + Delete local changes Fshiji ndryshimet vendore - + Move and upload... Zhvendosni dhe ngarkoni… - + Delete Fshije @@ -4273,12 +4279,12 @@ Jeni i sigurt se doni të ecet më tej? account loading - + Error accessing the configuration file Gabim gjatë hyrjes në kartelën e formësimit - + There was an error while accessing the configuration file at %1. Pati një gabim teksa hyhej te kartela e formësimit në %1. @@ -4460,7 +4466,7 @@ Jeni i sigurt se doni të ecet më tej? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version Disa rregullime qenë formësuar në versione më të rinj të këtij klienti dhe përdorin veçori që s’janë të pranishme në këtë version diff --git a/translations/client_th.ts b/translations/client_th.ts index c13e23c6afb..8fc3f67a889 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage @@ -423,7 +423,7 @@ - + Cancel ยกเลิก @@ -464,14 +464,15 @@ - + + Add Space - - + + Add Folder เพิ่มโฟลเดอร์ @@ -586,47 +587,52 @@ Please authenticate using your browser. เข้าสู่ระบบ - + Click this button to add a Space. - + Click this button to add a folder to synchronize. คลิกที่ปุ่มนี้เพื่อเพิ่มโฟลเดอร์ที่ต้องการประสานข้อมูล - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. - + There are folders that were not synchronized because they are too big: บางโฟลเดอร์จะไม่ถูกประสานข้อมูลเพราะขนาดของมันใหญ่เกินไป: - + There are folders that were not synchronized because they are external storages: มีบางโฟลเดอร์จะไม่ถูกประสานข้อมูลเพราะเป็นพื้นที่จัดเก็บข้อมูลภายนอก - + There are folders that were not synchronized because they are too big or external storages: มีบางโฟลเดอร์จะไม่ถูกประสานข้อมูลเพราะเป็นพื้นที่จัดเก็บข้อมูลภายนอกหรือมีขนาดที่ใหญ่เกินไป - + Confirm Account Removal ยืนยันการลบบัญชี - + <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> <p>คุณต้องการลบการเชื่อมต่อกับบัญชี<i>%1</i>?</p><p><b>หมายเหตุ:</b> นี้จะ <b>ไม่</b> ลบไฟล์ใดๆ</p> - + Remove connection ลบการเชื่อมต่อ @@ -797,7 +803,7 @@ The update will be performed in the background, and overwrite the current AppIma OCC::Application - + Quit ออก @@ -867,7 +873,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::CredentialJob - + Failed to parse credentials %1 แยกวิเคราะห์ข้อมูลประจำตัวไม่สำเร็จ %1 @@ -3184,48 +3190,48 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud แชร์กับ %1 - + Context menu share แชร์เมนูบริบท - + Context menu share %1 แชร์เมนูบริบท %1 - + Confirm deletion ยืนยันการลบ - + Do you want to delete the directory <i>%1</i> and all its contents permanently? คุณต้องการลบไดเรกทอรี <i>%1</i> และเนื้อหาทั้งหมดอย่างถาวร? - + Do you want to delete the file <i>%1</i> permanently? คุณต้องการลบไฟล์ <i>%1</i> แบบถาวร? - + Select new location... เลือกตำแหน่งใหม่... - + Error ข้อผิดพลาด - + Moving file failed: %1 @@ -3234,90 +3240,90 @@ for additional privileges during the process. %1 - + I shared something with you ฉันแชร์บางอย่างกับคุณ - - + + Share... แชร์... - - + + Copy private link to clipboard คัดลอกลิงก์ส่วนตัวไปยังคลิปบอร์ด - + Send private link by email... ส่งลิงก์ส่วนตัวทางอีเมล... - + Resharing this file is not allowed การแชร์ไฟล์นี้ต่อไม่ได้รับอนุญาต - + Resharing this folder is not allowed ไม่อนุญาตให้แชร์โฟลเดอร์นี้ต่อ - + Create and copy public link to clipboard สร้างและคัดลอกลิงก์สาธารณะไปยังคลิปบอร์ด - + Copy public link to clipboard คัดลอกลิงก์สาธารณะไปยังคลิปบอร์ด - + Open in %1 - + Show file versions in web browser - + Rename... เปลี่ยนชื่อ... - + Rename and upload... ปลี่ยนชื่อและอัปโหลด... - - + + Move and rename... ย้ายและเปลี่ยนชื่อ... - + Move, rename and upload... ย้าย เปลี่ยนชื่อและอัปโหลด... - + Delete local changes ลบการเปลี่ยนแปลงในเครื่อง - + Move and upload... ย้ายและอัปโหลด... - + Delete ลบ @@ -4248,12 +4254,12 @@ Are you sure you want to proceed? account loading - + Error accessing the configuration file เกิดข้อผิดพลาดขณะกำลังเข้าถึงไฟล์กำหนดค่า - + There was an error while accessing the configuration file at %1. เกิดข้อผิดพลาดขณะกำลังเข้าถึงไฟล์กำหนดค่า %1 @@ -4435,7 +4441,7 @@ Are you sure you want to proceed? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version diff --git a/translations/client_tr.ts b/translations/client_tr.ts index ab375b12dc8..4a260d55841 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage Daha fazla bilgi için, bkz: %1 @@ -423,7 +423,7 @@ - + Cancel İptal @@ -464,14 +464,15 @@ - + + Add Space Alan Ekle - - + + Add Folder Klasör Ekle @@ -588,47 +589,52 @@ Lütfen tarayıcınızı kullanarak kimliğinizi doğrulayın. Giriş yap - + Click this button to add a Space. Bir alan eklemek için bu butona tıklayın. - + Click this button to add a folder to synchronize. Bir klasörü eşitlemeye dahil etmek için bu düğmeye tıklayın. - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. Bir klasör eklemek için bağlı olmanız gerekir. - + There are folders that were not synchronized because they are too big: Çok büyük oldukları için eşitlenmeyen klasörler var: - + There are folders that were not synchronized because they are external storages: Harici depolama diskinde oldukları için eşitlenmeyen klasörler var: - + There are folders that were not synchronized because they are too big or external storages: Çok büyük oldukları ya da harici depolama alanında oldukları için eşitlenmeyen klasörler var: - + Confirm Account Removal Hesap Silinmesini Onaylayın - + <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> <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> - + Remove connection Bağlantıyı kaldır @@ -801,7 +807,7 @@ Güncelleme arka planda gerçekleştirilecek ve mevcut AppImage dosyasının üz OCC::Application - + Quit Çıkış @@ -877,7 +883,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka OCC::CredentialJob - + Failed to parse credentials %1 %1 kimlik bilgileri ayrıştırılamadı @@ -3201,48 +3207,48 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud %1 ile paylaş - + Context menu share İçerik menüsü paylaşımı - + Context menu share %1 İçerik menüsü paylaşımı %1 - + Confirm deletion Silmeyi onayla - + Do you want to delete the directory <i>%1</i> and all its contents permanently? <i>%1</i> dizinini ve tüm içeriğini kalıcı olarak silmek istiyor musunuz? - + Do you want to delete the file <i>%1</i> permanently? <i>%1</i> dosyasını kalıcı olarak silmek istiyor musunuz? - + Select new location... Yeni konum seçin... - + Error Hata - + Moving file failed: %1 @@ -3251,90 +3257,90 @@ for additional privileges during the process. %1 - + I shared something with you Seninle bir şey paylaştım - - + + Share... Paylaş... - - + + Copy private link to clipboard Özel bağlantıyı panoya kopyala - + Send private link by email... Özel bağlantıyı e-posta ile gönder... - + Resharing this file is not allowed Bu dosyanın yeniden paylaşılmasına izin verilmiyor - + Resharing this folder is not allowed Bu klasörün yeniden paylaşılmasına izin verilmiyor - + Create and copy public link to clipboard Herkese açık bağlantı oluştur ve panoya kopyala - + Copy public link to clipboard Herkese açık bağlantıyı panoya kopyala - + Open in %1 %1'de Aç - + Show file versions in web browser Dosya versiyonlarını web tarayıcıda göster - + Rename... Yeniden adlandır... - + Rename and upload... Yeniden adlandır ve yükle... - - + + Move and rename... Taşı ve yeniden adlandır... - + Move, rename and upload... Taşı, yeniden adlandır ve yükle... - + Delete local changes Yerel değişiklikleri sil - + Move and upload... Taşı ve yükle... - + Delete Sil @@ -4272,12 +4278,12 @@ Devam etmek istediğinizden emin misiniz? account loading - + Error accessing the configuration file Konfigürasyon dosyasına erişimde hata - + There was an error while accessing the configuration file at %1. Konfigürasyon dosyası %1 satırına erişimde hata @@ -4459,7 +4465,7 @@ Devam etmek istediğinizden emin misiniz? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version Bazı ayarlar bu istemcinin daha yeni sürümlerinde yapılandırılmış ve bu sürümde bulunmayan özellikler kullanılıyor diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index a8e02c3cdfd..f83ebb99ac1 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage 有关详细信息，请参阅 %1 @@ -423,7 +423,7 @@ - + Cancel 取消 @@ -464,14 +464,15 @@ - + + Add Space - - + + Add Folder 增加目录 @@ -586,47 +587,52 @@ Please authenticate using your browser. 登录 - + Click this button to add a Space. - + Click this button to add a folder to synchronize. 点击选择进行同步的本地文件夹。 - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. - + There are folders that were not synchronized because they are too big: 以下目录由于太大而没有同步： - + There are folders that were not synchronized because they are external storages: 以下目录由于是外部存储而没有同步： - + There are folders that were not synchronized because they are too big or external storages: 以下目录由于太大或是外部存储而没有同步： - + Confirm Account Removal 确认删除账号 - + <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> <p>你确定要删除账号的连接？ <i>%1</i>?</p><p><b>Note:</b> 这 <b>不会</b> 删除任何文件</p> - + Remove connection 删除连接 @@ -797,7 +803,7 @@ The update will be performed in the background, and overwrite the current AppIma OCC::Application - + Quit 退出 @@ -867,7 +873,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::CredentialJob - + Failed to parse credentials %1 解析凭证 %1 失败 @@ -3189,48 +3195,48 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud 使用 %1 共享 - + Context menu share 上下文菜单分享 - + Context menu share %1 上下文菜单共享 %1 - + Confirm deletion 确认删除 - + Do you want to delete the directory <i>%1</i> and all its contents permanently? 您想永久删除目录 <i>%1</i> 及其所有内容吗？ - + Do you want to delete the file <i>%1</i> permanently? 是否要永久删除文件 <i>%1</i>？ - + Select new location... 选择一个新的位置.... - + Error 错误 - + Moving file failed: %1 @@ -3239,90 +3245,90 @@ for additional privileges during the process. %1 - + I shared something with you 我给你分享了一些东西 - - + + Share... 分享到... - - + + Copy private link to clipboard 将私有链接复制到剪切板 - + Send private link by email... 通过email发送私有链接 - + Resharing this file is not allowed 再次分享这个文件是不被允许的 - + Resharing this folder is not allowed 再次分享这个文件夹是不被允许的 - + Create and copy public link to clipboard 创建并复制公共链接到剪贴板 - + Copy public link to clipboard 复制公共链接到剪切板 - + Open in %1 - + Show file versions in web browser - + Rename... 重命名... - + Rename and upload... 重命名并上传 - - + + Move and rename... 重命名并移动... - + Move, rename and upload... 重命名，移动并上传... - + Delete local changes 删除本地改动 - + Move and upload... 移动并上传... - + Delete 删除 @@ -4253,12 +4259,12 @@ Are you sure you want to proceed? account loading - + Error accessing the configuration file 访问配置文件时发生错误 - + There was an error while accessing the configuration file at %1. 访问配置文件 %1 时发生错误。 @@ -4440,7 +4446,7 @@ Are you sure you want to proceed? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index dd382c2ca70..e52d02af007 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -103,7 +103,7 @@ CommandLine - + For more information, see %1 link to homepage @@ -423,7 +423,7 @@ - + Cancel 取消 @@ -464,14 +464,15 @@ - + + Add Space - - + + Add Folder 新增資料夾 @@ -586,47 +587,52 @@ Please authenticate using your browser. 登入 - + Click this button to add a Space. - + Click this button to add a folder to synchronize. 點擊此按鈕來新增同步資料夾 - + + You need to be connected to add a Space. + + + + You need to be connected to add a folder. - + There are folders that were not synchronized because they are too big: 有部份的資料夾因為容量太大沒有辦法同步: - + There are folders that were not synchronized because they are external storages: 有部分資料夾因為是外部存儲沒有辦法同步: - + There are folders that were not synchronized because they are too big or external storages: 有部分資料夾因為容量太大或是外部存儲沒有辦法同步: - + Confirm Account Removal 確認移除帳號 - + <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> <p>您確定要中斷此帳號 <i>%1</i> 的連線?</p><p><b>注意:</b>此操作 <b>不會</b> 刪除任何的檔案。</p> - + Remove connection 移除連線 @@ -797,7 +803,7 @@ The update will be performed in the background, and overwrite the current AppIma OCC::Application - + Quit 離開 @@ -867,7 +873,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::CredentialJob - + Failed to parse credentials %1 @@ -3187,48 +3193,48 @@ for additional privileges during the process. OCC::SocketApi - + Share with %1 parameter is ownCloud 與 %1 分享 - + Context menu share 語境選單分享 - + Context menu share %1 上下文選單分享％1 - + Confirm deletion 確認刪除 - + Do you want to delete the directory <i>%1</i> and all its contents permanently? 您是否要刪除資料夾<i>%1</i>及其所有內容永久？ - + Do you want to delete the file <i>%1</i> permanently? 您要刪除檔案嗎<i>%1</i>永久性? - + Select new location... 選擇新位置... - + Error 錯誤 - + Moving file failed: %1 @@ -3237,90 +3243,90 @@ for additional privileges during the process. %1 - + I shared something with you 我與您已分享的了一些東西 - - + + Share... 分享... - - + + Copy private link to clipboard 將私人連結複製到剪貼簿 - + Send private link by email... 通過電子郵件發送私人連結... - + Resharing this file is not allowed 不允許重新共享此檔案 - + Resharing this folder is not allowed 不允許重新共享此目錄 - + Create and copy public link to clipboard - + Copy public link to clipboard 複製公開的連結到剪貼簿 - + Open in %1 - + Show file versions in web browser - + Rename... 改名... - + Rename and upload... 重命名並上傳... - - + + Move and rename... 移動並重命名... - + Move, rename and upload... 移動，重命名和上傳... - + Delete local changes 刪除本地端更改 - + Move and upload... 移動並上傳... - + Delete 刪除 @@ -4251,12 +4257,12 @@ Are you sure you want to proceed? account loading - + Error accessing the configuration file 存取配置文件時錯誤 - + There was an error while accessing the configuration file at %1. 訪問％1處的配置檔案時錯誤。 @@ -4438,7 +4444,7 @@ Are you sure you want to proceed? version check - + Some settings were configured in newer versions of this client and use features that are not available in this version