mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-24 05:55:59 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into action-colors

Browse source
This commit is contained in:
Roeland Jago Douma 2018-11-13 07:41:53 +01:00 committed by GitHub
commit e2c813bfca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
43 changed files with 564 additions and 543 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.tx/nextcloud.client-desktop/de_translation
View file

@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
# Translations
Comment[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
Icon[de_DE]=@APPLICATION_ICON_NAME@
Name[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
GenericName[de_DE]=Synchronisationsordner
Comment[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
Icon[de]=@APPLICATION_ICON_NAME@
Name[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
GenericName[de]=Synchronisationsordner

8
src/gui/settingsdialog.cpp
View file

@ -93,10 +93,6 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
_actionGroup->setExclusive(true);
connect(_actionGroup, &QActionGroup::triggered, this, &SettingsDialog::slotSwitchPage);
foreach(auto ai, AccountManager::instance()->accounts()) {
accountAdded(ai.data());
}
_actionBefore = new QAction(this);
_toolBar->addAction(_actionBefore);
@ -121,6 +117,10 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
_actionGroupWidgets.insert(generalAction, generalSettings);
_actionGroupWidgets.insert(networkAction, networkSettings);
foreach(auto ai, AccountManager::instance()->accounts()) {
accountAdded(ai.data());
}
QTimer::singleShot(1, this, &SettingsDialog::showFirstPage);
QAction *showLogWindow = new QAction(this);

4
src/libsync/abstractnetworkjob.cpp
View file

@ -50,7 +50,7 @@ AbstractNetworkJob::AbstractNetworkJob(AccountPtr account, const QString &path,
, _followRedirects(true)
, _account(account)
, _ignoreCredentialFailure(false)
, _reply(0)
, _reply(nullptr)
, _path(path)
, _redirectCount(0)
{
@ -279,7 +279,7 @@ QString AbstractNetworkJob::errorStringParsingBody(QByteArray *body)
AbstractNetworkJob::~AbstractNetworkJob()
{
setReply(0);
setReply(nullptr);
}
void AbstractNetworkJob::start()

8
src/libsync/abstractnetworkjob.h
View file

@ -39,7 +39,7 @@ class OWNCLOUDSYNC_EXPORT AbstractNetworkJob : public QObject
{
Q_OBJECT
public:
explicit AbstractNetworkJob(AccountPtr account, const QString &path, QObject *parent = 0);
explicit AbstractNetworkJob(AccountPtr account, const QString &path, QObject *parent = nullptr);
virtual ~AbstractNetworkJob();
virtual void start();
@ -86,7 +86,7 @@ public:
*
* Warning: Needs to call reply()->readAll().
*/
QString errorStringParsingBody(QByteArray *body = 0);
QString errorStringParsingBody(QByteArray *body = nullptr);
/** static variable the HTTP timeout (in seconds). If set to 0, the default will be used
*/
@ -120,14 +120,14 @@ protected:
*/
QNetworkReply *sendRequest(const QByteArray &verb, const QUrl &url,
QNetworkRequest req = QNetworkRequest(),
QIODevice *requestBody = 0);
QIODevice *requestBody = nullptr);
// sendRequest does not take a relative path instead of an url,
// but the old API allowed that. We have this undefined overload
// to help catch usage errors
QNetworkReply *sendRequest(const QByteArray &verb, const QString &relativePath,
QNetworkRequest req = QNetworkRequest(),
QIODevice *requestBody = 0);
QIODevice *requestBody = nullptr);
/** Makes this job drive a pre-made QNetworkReply
*

4
src/libsync/accessmanager.h
View file

@ -32,12 +32,12 @@ class OWNCLOUDSYNC_EXPORT AccessManager : public QNetworkAccessManager
Q_OBJECT
public:
AccessManager(QObject *parent = 0);
AccessManager(QObject *parent = nullptr);
void setRawCookie(const QByteArray &rawCookie, const QUrl &url);
protected:
QNetworkReply *createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData = 0) Q_DECL_OVERRIDE;
QNetworkReply *createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData = nullptr) override;
};
} // namespace OCC

4
src/libsync/account.cpp
View file

@ -152,10 +152,10 @@ AbstractCredentials *Account::credentials() const
void Account::setCredentials(AbstractCredentials *cred)
{
// set active credential manager
QNetworkCookieJar *jar = 0;
QNetworkCookieJar *jar = nullptr;
if (_am) {
jar = _am->cookieJar();
jar->setParent(0);
jar->setParent(nullptr);
_am = QSharedPointer<QNetworkAccessManager>();
}

6
src/libsync/account.h
View file

@ -140,7 +140,7 @@ public:
QNetworkReply *sendRawRequest(const QByteArray &verb,
const QUrl &url,
QNetworkRequest req = QNetworkRequest(),
QIODevice *data = 0);
QIODevice *data = nullptr);
/** Create and start network job for a simple one-off request.
*
@ -149,7 +149,7 @@ public:
SimpleNetworkJob *sendRequest(const QByteArray &verb,
const QUrl &url,
QNetworkRequest req = QNetworkRequest(),
QIODevice *data = 0);
QIODevice *data = nullptr);
/** The ssl configuration during the first connection */
QSslConfiguration getOrCreateSslConfig();
@ -267,7 +267,7 @@ protected Q_SLOTS:
void slotCredentialsAsked();
private:
Account(QObject *parent = 0);
Account(QObject *parent = nullptr);
void setSharedThis(AccountPtr sharedThis);
QWeakPointer<Account> _sharedThis;

16
src/libsync/bandwidthmanager.cpp
View file

@ -47,10 +47,10 @@ static qint64 relativeLimitMeasuringTimerIntervalMsec = 1000 * 2;
BandwidthManager::BandwidthManager(OwncloudPropagator *p)
: QObject()
, _propagator(p)
, _relativeLimitCurrentMeasuredDevice(0)
, _relativeLimitCurrentMeasuredDevice(nullptr)
, _relativeUploadLimitProgressAtMeasuringRestart(0)
, _currentUploadLimit(0)
, _relativeLimitCurrentMeasuredJob(0)
, _relativeLimitCurrentMeasuredJob(nullptr)
, _currentDownloadLimit(0)
{
_currentUploadLimit = _propagator->_uploadLimit.fetchAndAddAcquire(0);
@ -115,7 +115,7 @@ void BandwidthManager::unregisterUploadDevice(QObject *o)
_absoluteUploadDeviceList.removeAll(p);
_relativeUploadDeviceList.removeAll(p);
if (p == _relativeLimitCurrentMeasuredDevice) {
_relativeLimitCurrentMeasuredDevice = 0;
_relativeLimitCurrentMeasuredDevice = nullptr;
_relativeUploadLimitProgressAtMeasuringRestart = 0;
}
}
@ -142,7 +142,7 @@ void BandwidthManager::unregisterDownloadJob(QObject *o)
GETFileJob *j = reinterpret_cast<GETFileJob *>(o); // note, we might already be in the ~QObject
_downloadJobList.removeAll(j);
if (_relativeLimitCurrentMeasuredJob == j) {
_relativeLimitCurrentMeasuredJob = 0;
_relativeLimitCurrentMeasuredJob = nullptr;
_relativeDownloadLimitProgressAtMeasuringRestart = 0;
}
}
@ -155,7 +155,7 @@ void BandwidthManager::relativeUploadMeasuringTimerExpired()
_relativeUploadDelayTimer.start();
return;
}
if (_relativeLimitCurrentMeasuredDevice == 0) {
if (_relativeLimitCurrentMeasuredDevice == nullptr) {
qCDebug(lcBandwidthManager) << "No device set, just waiting 1 sec";
_relativeUploadDelayTimer.setInterval(1000);
_relativeUploadDelayTimer.start();
@ -201,7 +201,7 @@ void BandwidthManager::relativeUploadMeasuringTimerExpired()
ud->giveBandwidthQuota(quotaPerDevice);
qCDebug(lcBandwidthManager) << "Gave" << quotaPerDevice / 1024.0 << "kB to" << ud;
}
_relativeLimitCurrentMeasuredDevice = 0;
_relativeLimitCurrentMeasuredDevice = nullptr;
}
void BandwidthManager::relativeUploadDelayTimerExpired()
@ -249,7 +249,7 @@ void BandwidthManager::relativeDownloadMeasuringTimerExpired()
_relativeDownloadDelayTimer.start();
return;
}
if (_relativeLimitCurrentMeasuredJob == 0) {
if (_relativeLimitCurrentMeasuredJob == nullptr) {
qCDebug(lcBandwidthManager) << "No job set, just waiting 1 sec";
_relativeDownloadDelayTimer.setInterval(1000);
_relativeDownloadDelayTimer.start();
@ -295,7 +295,7 @@ void BandwidthManager::relativeDownloadMeasuringTimerExpired()
gfj->giveBandwidthQuota(quotaPerJob);
qCDebug(lcBandwidthManager) << "Gave" << quotaPerJob / 1024.0 << "kB to" << gfj;
}
_relativeLimitCurrentMeasuredDevice = 0;
_relativeLimitCurrentMeasuredDevice = nullptr;
}
void BandwidthManager::relativeDownloadDelayTimerExpired()

52
src/libsync/clientsideencryption.cpp
View file

@ -150,7 +150,7 @@ QByteArray encryptPrivateKey(
}
/* Initialise the decryption operation. */
if(!EVP_EncryptInit_ex(ctx, EVP_aes_256_gcm(), NULL, NULL, NULL)) {
if(!EVP_EncryptInit_ex(ctx, EVP_aes_256_gcm(), nullptr, nullptr, nullptr)) {
qCInfo(lcCse()) << "Error initializing context with aes_256";
handleErrors();
}
@ -159,13 +159,13 @@ QByteArray encryptPrivateKey(
EVP_CIPHER_CTX_set_padding(ctx, 0);
/* Set IV length. */
if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), NULL)) {
if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), nullptr)) {
qCInfo(lcCse()) << "Error setting iv length";
handleErrors();
}
/* Initialise key and IV */
if(!EVP_EncryptInit_ex(ctx, NULL, NULL, (unsigned char *)key.constData(), (unsigned char *)iv.constData())) {
if(!EVP_EncryptInit_ex(ctx, nullptr, nullptr, (unsigned char *)key.constData(), (unsigned char *)iv.constData())) {
qCInfo(lcCse()) << "Error initialising key and iv";
handleErrors();
}
@ -242,21 +242,21 @@ QByteArray decryptPrivateKey(const QByteArray& key, const QByteArray& data) {
}
/* Initialise the decryption operation. */
if(!EVP_DecryptInit_ex(ctx, EVP_aes_256_gcm(), NULL, NULL, NULL)) {
if(!EVP_DecryptInit_ex(ctx, EVP_aes_256_gcm(), nullptr, nullptr, nullptr)) {
qCInfo(lcCse()) << "Error initialising context with aes 256";
EVP_CIPHER_CTX_free(ctx);
return QByteArray();
}
/* Set IV length. Not necessary if this is 12 bytes (96 bits) */
if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), NULL)) {
if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), nullptr)) {
qCInfo(lcCse()) << "Error setting IV size";
EVP_CIPHER_CTX_free(ctx);
return QByteArray();
}
/* Initialise key and IV */
if(!EVP_DecryptInit_ex(ctx, NULL, NULL, (unsigned char *)key.constData(), (unsigned char *)iv.constData())) {
if(!EVP_DecryptInit_ex(ctx, nullptr, nullptr, (unsigned char *)key.constData(), (unsigned char *)iv.constData())) {
qCInfo(lcCse()) << "Error initialising key and iv";
EVP_CIPHER_CTX_free(ctx);
return QByteArray();
@ -331,21 +331,21 @@ QByteArray decryptStringSymmetric(const QByteArray& key, const QByteArray& data)
}
/* Initialise the decryption operation. */
if(!EVP_DecryptInit_ex(ctx, EVP_aes_128_gcm(), NULL, NULL, NULL)) {
if(!EVP_DecryptInit_ex(ctx, EVP_aes_128_gcm(), nullptr, nullptr, nullptr)) {
qCInfo(lcCse()) << "Error initialising context with aes 128";
EVP_CIPHER_CTX_free(ctx);
return QByteArray();
}
/* Set IV length. Not necessary if this is 12 bytes (96 bits) */
if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), NULL)) {
if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), nullptr)) {
qCInfo(lcCse()) << "Error setting IV size";
EVP_CIPHER_CTX_free(ctx);
return QByteArray();
}
/* Initialise key and IV */
if(!EVP_DecryptInit_ex(ctx, NULL, NULL, (unsigned char *)key.constData(), (unsigned char *)iv.constData())) {
if(!EVP_DecryptInit_ex(ctx, nullptr, nullptr, (unsigned char *)key.constData(), (unsigned char *)iv.constData())) {
qCInfo(lcCse()) << "Error initialising key and iv";
EVP_CIPHER_CTX_free(ctx);
return QByteArray();
@ -394,10 +394,10 @@ QByteArray decryptStringSymmetric(const QByteArray& key, const QByteArray& data)
QByteArray privateKeyToPem(const QByteArray key) {
BIO *privateKeyBio = BIO_new(BIO_s_mem());
BIO_write(privateKeyBio, key.constData(), key.size());
EVP_PKEY *pkey = PEM_read_bio_PrivateKey(privateKeyBio, NULL, NULL, NULL);
EVP_PKEY *pkey = PEM_read_bio_PrivateKey(privateKeyBio, nullptr, nullptr, nullptr);
BIO *pemBio = BIO_new(BIO_s_mem());
PEM_write_bio_PKCS8PrivateKey(pemBio, pkey, NULL, NULL, 0, NULL, NULL);
PEM_write_bio_PKCS8PrivateKey(pemBio, pkey, nullptr, nullptr, 0, nullptr, nullptr);
QByteArray pem = BIO2ByteArray(pemBio);
BIO_free_all(privateKeyBio);
@ -419,7 +419,7 @@ QByteArray encryptStringSymmetric(const QByteArray& key, const QByteArray& data)
}
/* Initialise the decryption operation. */
if(!EVP_EncryptInit_ex(ctx, EVP_aes_128_gcm(), NULL, NULL, NULL)) {
if(!EVP_EncryptInit_ex(ctx, EVP_aes_128_gcm(), nullptr, nullptr, nullptr)) {
qCInfo(lcCse()) << "Error initializing context with aes_128";
handleErrors();
return {};
@ -429,14 +429,14 @@ QByteArray encryptStringSymmetric(const QByteArray& key, const QByteArray& data)
EVP_CIPHER_CTX_set_padding(ctx, 0);
/* Set IV length. */
if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), NULL)) {
if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), nullptr)) {
qCInfo(lcCse()) << "Error setting iv length";
handleErrors();
return {};
}
/* Initialise key and IV */
if(!EVP_EncryptInit_ex(ctx, NULL, NULL, (unsigned char *)key.constData(), (unsigned char *)iv.constData())) {
if(!EVP_EncryptInit_ex(ctx, nullptr, nullptr, (unsigned char *)key.constData(), (unsigned char *)iv.constData())) {
qCInfo(lcCse()) << "Error initialising key and iv";
handleErrors();
return {};
@ -523,7 +523,7 @@ QByteArray decryptStringAsymmetric(EVP_PKEY *privateKey, const QByteArray& data)
}
size_t outlen = 0;
err = EVP_PKEY_decrypt(ctx, NULL, &outlen, (unsigned char *)data.constData(), data.size());
err = EVP_PKEY_decrypt(ctx, nullptr, &outlen, (unsigned char *)data.constData(), data.size());
if (err <= 0) {
qCInfo(lcCseDecryption()) << "Could not determine the buffer length";
handleErrors();
@ -584,7 +584,7 @@ QByteArray encryptStringAsymmetric(EVP_PKEY *publicKey, const QByteArray& data)
}
size_t outLen = 0;
if (EVP_PKEY_encrypt(ctx, NULL, &outLen, (unsigned char *)data.constData(), data.size()) != 1) {
if (EVP_PKEY_encrypt(ctx, nullptr, &outLen, (unsigned char *)data.constData(), data.size()) != 1) {
qCInfo(lcCse()) << "Error retrieving the size of the encrypted data";
exit(1);
} else {
@ -834,7 +834,7 @@ void ClientSideEncryption::generateKeyPair()
EVP_PKEY *localKeyPair = nullptr;
// Init RSA
EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, NULL);
EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, nullptr);
if(EVP_PKEY_keygen_init(ctx) <= 0) {
qCInfo(lcCse()) << "Couldn't initialize the key generator";
@ -855,7 +855,7 @@ void ClientSideEncryption::generateKeyPair()
qCInfo(lcCse()) << "Storing keys locally";
BIO *privKey = BIO_new(BIO_s_mem());
if (PEM_write_bio_PrivateKey(privKey, localKeyPair, NULL, NULL, 0, NULL, NULL) <= 0) {
if (PEM_write_bio_PrivateKey(privKey, localKeyPair, nullptr, nullptr, 0, nullptr, nullptr) <= 0) {
qCInfo(lcCse()) << "Could not read private key from bio.";
return;
}
@ -1218,7 +1218,7 @@ QByteArray FolderMetadata::encryptMetadataKey(const QByteArray& data) const {
BIO *publicKeyBio = BIO_new(BIO_s_mem());
QByteArray publicKeyPem = _account->e2e()->_publicKey.toPem();
BIO_write(publicKeyBio, publicKeyPem.constData(), publicKeyPem.size());
EVP_PKEY *publicKey = PEM_read_bio_PUBKEY(publicKeyBio, NULL, NULL, NULL);
EVP_PKEY *publicKey = PEM_read_bio_PUBKEY(publicKeyBio, nullptr, nullptr, nullptr);
// The metadata key is binary so base64 encode it first
auto ret = EncryptionHelper::encryptStringAsymmetric(publicKey, data.toBase64());
@ -1231,7 +1231,7 @@ QByteArray FolderMetadata::decryptMetadataKey(const QByteArray& encryptedMetadat
BIO *privateKeyBio = BIO_new(BIO_s_mem());
QByteArray privateKeyPem = _account->e2e()->_privateKey;
BIO_write(privateKeyBio, privateKeyPem.constData(), privateKeyPem.size());
EVP_PKEY *key = PEM_read_bio_PrivateKey(privateKeyBio, NULL, NULL, NULL);
EVP_PKEY *key = PEM_read_bio_PrivateKey(privateKeyBio, nullptr, nullptr, nullptr);
// Also base64 decode the result
QByteArray decryptResult = EncryptionHelper::decryptStringAsymmetric(
@ -1382,7 +1382,7 @@ bool EncryptionHelper::fileEncryption(const QByteArray &key, const QByteArray &i
}
/* Initialise the decryption operation. */
if(!EVP_EncryptInit_ex(ctx, EVP_aes_128_gcm(), NULL, NULL, NULL)) {
if(!EVP_EncryptInit_ex(ctx, EVP_aes_128_gcm(), nullptr, nullptr, nullptr)) {
qCInfo(lcCse()) << "Could not init cipher";
return false;
}
@ -1390,13 +1390,13 @@ bool EncryptionHelper::fileEncryption(const QByteArray &key, const QByteArray &i
EVP_CIPHER_CTX_set_padding(ctx, 0);
/* Set IV length. */
if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), NULL)) {
if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), nullptr)) {
qCInfo(lcCse()) << "Could not set iv length";
return false;
}
/* Initialise key and IV */
if(!EVP_EncryptInit_ex(ctx, NULL, NULL, (const unsigned char *)key.constData(), (const unsigned char *)iv.constData())) {
if(!EVP_EncryptInit_ex(ctx, nullptr, nullptr, (const unsigned char *)key.constData(), (const unsigned char *)iv.constData())) {
qCInfo(lcCse()) << "Could not set key and iv";
return false;
}
@ -1467,7 +1467,7 @@ bool EncryptionHelper::fileDecryption(const QByteArray &key, const QByteArray& i
}
/* Initialise the decryption operation. */
if(!EVP_DecryptInit_ex(ctx, EVP_aes_128_gcm(), NULL, NULL, NULL)) {
if(!EVP_DecryptInit_ex(ctx, EVP_aes_128_gcm(), nullptr, nullptr, nullptr)) {
qCInfo(lcCse()) << "Could not init cipher";
return false;
}
@ -1475,13 +1475,13 @@ bool EncryptionHelper::fileDecryption(const QByteArray &key, const QByteArray& i
EVP_CIPHER_CTX_set_padding(ctx, 0);
/* Set IV length. */
if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), NULL)) {
if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), nullptr)) {
qCInfo(lcCse()) << "Could not set iv length";
return false;
}
/* Initialise key and IV */
if(!EVP_DecryptInit_ex(ctx, NULL, NULL, (const unsigned char *) key.constData(), (const unsigned char *) iv.constData())) {
if(!EVP_DecryptInit_ex(ctx, nullptr, nullptr, (const unsigned char *) key.constData(), (const unsigned char *) iv.constData())) {
qCInfo(lcCse()) << "Could not set key and iv";
return false;
}

20
src/libsync/clientsideencryptionjobs.h
View file

@ -28,7 +28,7 @@ class OWNCLOUDSYNC_EXPORT SignPublicKeyApiJob : public AbstractNetworkJob
{
Q_OBJECT
public:
explicit SignPublicKeyApiJob(const AccountPtr &account, const QString &path, QObject *parent = 0);
explicit SignPublicKeyApiJob(const AccountPtr &account, const QString &path, QObject *parent = nullptr);
/**
* @brief setCsr - the CSR with the public key.
@ -71,7 +71,7 @@ class OWNCLOUDSYNC_EXPORT StorePrivateKeyApiJob : public AbstractNetworkJob
{
Q_OBJECT
public:
explicit StorePrivateKeyApiJob(const AccountPtr &account, const QString &path, QObject *parent = 0);
explicit StorePrivateKeyApiJob(const AccountPtr &account, const QString &path, QObject *parent = nullptr);
/**
* @brief setCsr - the CSR with the public key.
@ -114,7 +114,7 @@ class OWNCLOUDSYNC_EXPORT SetEncryptionFlagApiJob : public AbstractNetworkJob
{
Q_OBJECT
public:
explicit SetEncryptionFlagApiJob(const AccountPtr &account, const QByteArray& fileId, QObject *parent = 0);
explicit SetEncryptionFlagApiJob(const AccountPtr &account, const QByteArray& fileId, QObject *parent = nullptr);
public slots:
void start() override;
@ -134,7 +134,7 @@ class OWNCLOUDSYNC_EXPORT LockEncryptFolderApiJob : public AbstractNetworkJob
{
Q_OBJECT
public:
explicit LockEncryptFolderApiJob(const AccountPtr &account, const QByteArray& fileId, QObject *parent = 0);
explicit LockEncryptFolderApiJob(const AccountPtr &account, const QByteArray& fileId, QObject *parent = nullptr);
public slots:
void start() override;
@ -159,7 +159,7 @@ public:
const AccountPtr &account,
const QByteArray& fileId,
const QByteArray& token,
QObject *parent = 0);
QObject *parent = nullptr);
public slots:
void start() override;
@ -186,7 +186,7 @@ public:
const AccountPtr &account,
const QByteArray& fileId,
const QByteArray& b64Metadata,
QObject *parent = 0);
QObject *parent = nullptr);
public slots:
void start() override;
@ -212,7 +212,7 @@ public:
const QByteArray& fileId,
const QByteArray& b64Metadata,
const QByteArray& lockedToken,
QObject *parent = 0);
QObject *parent = nullptr);
public slots:
void start() override;
@ -238,7 +238,7 @@ public:
explicit GetMetadataApiJob (
const AccountPtr &account,
const QByteArray& fileId,
QObject *parent = 0);
QObject *parent = nullptr);
public slots:
void start() override;
@ -261,7 +261,7 @@ public:
explicit DeleteMetadataApiJob (
const AccountPtr &account,
const QByteArray& fileId,
QObject *parent = 0);
QObject *parent = nullptr);
public slots:
void start() override;
@ -284,7 +284,7 @@ class OWNCLOUDSYNC_EXPORT GetFolderEncryptStatusJob : public AbstractNetworkJob
{
Q_OBJECT
public:
explicit GetFolderEncryptStatusJob (const AccountPtr &account, const QString& folder, QObject *parent = 0);
explicit GetFolderEncryptStatusJob (const AccountPtr &account, const QString& folder, QObject *parent = nullptr);
public slots:
void start() override;

2
src/libsync/configfile.h
View file

@ -159,7 +159,7 @@ public:
/** Returns a new settings pre-set in a specific group. The Settings will be created
with the given parent. If no parent is specified, the caller must destroy the settings */
static std::unique_ptr<QSettings> settingsWithGroup(const QString &group, QObject *parent = 0);
static std::unique_ptr<QSettings> settingsWithGroup(const QString &group, QObject *parent = nullptr);
/// Add the system and user exclude file path to the ExcludedFiles instance.
static void setupDefaultExcludeFilePaths(ExcludedFiles &excludedFiles);

6
src/libsync/cookiejar.h
View file

@ -29,10 +29,10 @@ class OWNCLOUDSYNC_EXPORT CookieJar : public QNetworkCookieJar
{
Q_OBJECT
public:
explicit CookieJar(QObject *parent = 0);
explicit CookieJar(QObject *parent = nullptr);
~CookieJar();
bool setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url) Q_DECL_OVERRIDE;
QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const Q_DECL_OVERRIDE;
bool setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url) override;
QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const override;
void clearSessionCookies();

2
src/libsync/creds/abstractcredentials.cpp
View file

@ -24,7 +24,7 @@ namespace OCC {
Q_LOGGING_CATEGORY(lcCredentials, "nextcloud.sync.credentials", QtInfoMsg)
AbstractCredentials::AbstractCredentials()
: _account(0)
: _account(nullptr)
, _wasFetched(false)
{
}

20
src/libsync/creds/dummycredentials.h
View file

@ -26,16 +26,16 @@ class OWNCLOUDSYNC_EXPORT DummyCredentials : public AbstractCredentials
public:
QString _user;
QString _password;
QString authType() const Q_DECL_OVERRIDE;
QString user() const Q_DECL_OVERRIDE;
QNetworkAccessManager *createQNAM() const Q_DECL_OVERRIDE;
bool ready() const Q_DECL_OVERRIDE;
bool stillValid(QNetworkReply *reply) Q_DECL_OVERRIDE;
void fetchFromKeychain() Q_DECL_OVERRIDE;
void askFromUser() Q_DECL_OVERRIDE;
void persist() Q_DECL_OVERRIDE;
void invalidateToken() Q_DECL_OVERRIDE {}
void forgetSensitiveData() Q_DECL_OVERRIDE{};
QString authType() const override;
QString user() const override;
QNetworkAccessManager *createQNAM() const override;
bool ready() const override;
bool stillValid(QNetworkReply *reply) override;
void fetchFromKeychain() override;
void askFromUser() override;
void persist() override;
void invalidateToken() override {}
void forgetSensitiveData() override{};
};
} // namespace OCC

4
src/libsync/creds/httpcredentials.cpp
View file

@ -50,14 +50,14 @@ namespace {
class HttpCredentialsAccessManager : public AccessManager
{
public:
HttpCredentialsAccessManager(const HttpCredentials *cred, QObject *parent = 0)
HttpCredentialsAccessManager(const HttpCredentials *cred, QObject *parent = nullptr)
: AccessManager(parent)
, _cred(cred)
{
}
protected:
QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData) Q_DECL_OVERRIDE
QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData) override
{
QNetworkRequest req(request);
if (!req.attribute(HttpCredentials::DontAddCredentialsAttribute).toBool()) {

20
src/libsync/creds/httpcredentials.h
View file

@ -82,17 +82,17 @@ public:
explicit HttpCredentials();
HttpCredentials(const QString &user, const QString &password, const QSslCertificate &certificate = QSslCertificate(), const QSslKey &key = QSslKey());
QString authType() const Q_DECL_OVERRIDE;
QNetworkAccessManager *createQNAM() const Q_DECL_OVERRIDE;
bool ready() const Q_DECL_OVERRIDE;
void fetchFromKeychain() Q_DECL_OVERRIDE;
bool stillValid(QNetworkReply *reply) Q_DECL_OVERRIDE;
void persist() Q_DECL_OVERRIDE;
QString user() const Q_DECL_OVERRIDE;
QString authType() const override;
QNetworkAccessManager *createQNAM() const override;
bool ready() const override;
void fetchFromKeychain() override;
bool stillValid(QNetworkReply *reply) override;
void persist() override;
QString user() const override;
// the password or token
QString password() const;
void invalidateToken() Q_DECL_OVERRIDE;
void forgetSensitiveData() Q_DECL_OVERRIDE;
void invalidateToken() override;
void forgetSensitiveData() override;
QString fetchUser();
virtual bool sslIsTrusted() { return false; }
@ -102,7 +102,7 @@ public:
bool refreshAccessToken();
// To fetch the user name as early as possible
void setAccount(Account *account) Q_DECL_OVERRIDE;
void setAccount(Account *account) override;
// Whether we are using OAuth
bool isUsingOAuth() const { return !_refreshToken.isNull(); }

20
src/libsync/creds/tokencredentials.h
View file

@ -39,16 +39,16 @@ public:
TokenCredentials();
TokenCredentials(const QString &user, const QString &password, const QString &token);
QString authType() const Q_DECL_OVERRIDE;
QNetworkAccessManager *createQNAM() const Q_DECL_OVERRIDE;
bool ready() const Q_DECL_OVERRIDE;
void askFromUser() Q_DECL_OVERRIDE;
void fetchFromKeychain() Q_DECL_OVERRIDE;
bool stillValid(QNetworkReply *reply) Q_DECL_OVERRIDE;
void persist() Q_DECL_OVERRIDE;
QString user() const Q_DECL_OVERRIDE;
void invalidateToken() Q_DECL_OVERRIDE;
void forgetSensitiveData() Q_DECL_OVERRIDE;
QString authType() const override;
QNetworkAccessManager *createQNAM() const override;
bool ready() const override;
void askFromUser() override;
void fetchFromKeychain() override;
bool stillValid(QNetworkReply *reply) override;
void persist() override;
QString user() const override;
void invalidateToken() override;
void forgetSensitiveData() override;
QString password() const;
private Q_SLOTS:

26
src/libsync/discoveryphase.cpp
View file

@ -528,7 +528,7 @@ void DiscoveryMainThread::singleDirectoryJobResultSlot()
qCDebug(lcDiscovery) << "Have" << _currentDiscoveryDirectoryResult->list.size() << "results for " << _currentDiscoveryDirectoryResult->path;
_currentDiscoveryDirectoryResult = 0; // the sync thread owns it now
_currentDiscoveryDirectoryResult = nullptr; // the sync thread owns it now
if (!_firstFolderProcessed) {
_firstFolderProcessed = true;
@ -549,7 +549,7 @@ void DiscoveryMainThread::singleDirectoryJobFinishedWithErrorSlot(int csyncErrno
_currentDiscoveryDirectoryResult->code = csyncErrnoCode;
_currentDiscoveryDirectoryResult->msg = msg;
_currentDiscoveryDirectoryResult = 0; // the sync thread owns it now
_currentDiscoveryDirectoryResult = nullptr; // the sync thread owns it now
_discoveryJob->_vioMutex.lock();
_discoveryJob->_vioWaitCondition.wakeAll();
@ -598,7 +598,7 @@ void DiscoveryMainThread::slotGetSizeFinishedWithError()
qCWarning(lcDiscovery) << "Error getting the size of the directory";
// just let let the discovery job continue then
_currentGetSizeResult = 0;
_currentGetSizeResult = nullptr;
QMutexLocker locker(&_discoveryJob->_vioMutex);
_discoveryJob->_vioWaitCondition.wakeAll();
}
@ -611,7 +611,7 @@ void DiscoveryMainThread::slotGetSizeResult(const QVariantMap &map)
*_currentGetSizeResult = map.value(QLatin1String("size")).toLongLong();
qCDebug(lcDiscovery) << "Size of folder:" << *_currentGetSizeResult;
_currentGetSizeResult = 0;
_currentGetSizeResult = nullptr;
QMutexLocker locker(&_discoveryJob->_vioMutex);
_discoveryJob->_vioWaitCondition.wakeAll();
}
@ -630,13 +630,13 @@ void DiscoveryMainThread::abort()
if (_discoveryJob->_vioMutex.tryLock()) {
_currentDiscoveryDirectoryResult->msg = tr("Aborted by the user"); // Actually also created somewhere else by sync engine
_currentDiscoveryDirectoryResult->code = EIO;
_currentDiscoveryDirectoryResult = 0;
_currentDiscoveryDirectoryResult = nullptr;
_discoveryJob->_vioWaitCondition.wakeAll();
_discoveryJob->_vioMutex.unlock();
}
}
if (_currentGetSizeResult) {
_currentGetSizeResult = 0;
_currentGetSizeResult = nullptr;
QMutexLocker locker(&_discoveryJob->_vioMutex);
_discoveryJob->_vioWaitCondition.wakeAll();
}
@ -666,12 +666,12 @@ csync_vio_handle_t *DiscoveryJob::remote_vio_opendir_hook(const char *url,
errno = directoryResult->code;
// save the error string to the context
discoveryJob->_csync_ctx->error_string = qstrdup(directoryResult->msg.toUtf8().constData());
return NULL;
return nullptr;
}
return directoryResult.take();
}
return NULL;
return nullptr;
}
@ -687,7 +687,7 @@ std::unique_ptr<csync_file_stat_t> DiscoveryJob::remote_vio_readdir_hook(csync_v
return file_stat;
}
}
return NULL;
return nullptr;
}
void DiscoveryJob::remote_vio_closedir_hook(csync_vio_handle_t *dhandle, void *userdata)
@ -719,10 +719,10 @@ void DiscoveryJob::start()
_lastUpdateProgressCallbackCall.invalidate();
int ret = csync_update(_csync_ctx);
_csync_ctx->callbacks.checkSelectiveSyncNewFolderHook = 0;
_csync_ctx->callbacks.checkSelectiveSyncBlackListHook = 0;
_csync_ctx->callbacks.update_callback = 0;
_csync_ctx->callbacks.update_callback_userdata = 0;
_csync_ctx->callbacks.checkSelectiveSyncNewFolderHook = nullptr;
_csync_ctx->callbacks.checkSelectiveSyncBlackListHook = nullptr;
_csync_ctx->callbacks.update_callback = nullptr;
_csync_ctx->callbacks.update_callback_userdata = nullptr;
emit finished(ret);
deleteLater();

8
src/libsync/discoveryphase.h
View file

@ -59,7 +59,7 @@ class DiscoverySingleDirectoryJob : public QObject
{
Q_OBJECT
public:
explicit DiscoverySingleDirectoryJob(const AccountPtr &account, const QString &path, QObject *parent = 0);
explicit DiscoverySingleDirectoryJob(const AccountPtr &account, const QString &path, QObject *parent = nullptr);
// Specify thgat this is the root and we need to check the data-fingerprint
void setIsRootPath() { _isRootPath = true; }
void start();
@ -117,8 +117,8 @@ public:
DiscoveryMainThread(AccountPtr account)
: QObject()
, _account(account)
, _currentDiscoveryDirectoryResult(0)
, _currentGetSizeResult(0)
, _currentDiscoveryDirectoryResult(nullptr)
, _currentGetSizeResult(nullptr)
, _firstFolderProcessed(false)
{
}
@ -187,7 +187,7 @@ class DiscoveryJob : public QObject
public:
explicit DiscoveryJob(CSYNC *ctx, QObject *parent = 0)
explicit DiscoveryJob(CSYNC *ctx, QObject *parent = nullptr)
: QObject(parent)
, _csync_ctx(ctx)
{

2
src/libsync/logger.cpp
View file

@ -141,7 +141,7 @@ void Logger::setLogFile(const QString &name)
{
QMutexLocker locker(&_mutex);
if (_logstream) {
_logstream.reset(0);
_logstream.reset(nullptr);
_logFile.close();
}

2
src/libsync/logger.h
View file

@ -94,7 +94,7 @@ public slots:
void enterNextLogFile();
private:
Logger(QObject *parent = 0);
Logger(QObject *parent = nullptr);
~Logger();
QList<Log> _logs;
bool _showTime;

74
src/libsync/networkjobs.h
View file

@ -35,14 +35,14 @@ class OWNCLOUDSYNC_EXPORT EntityExistsJob : public AbstractNetworkJob
{
Q_OBJECT
public:
explicit EntityExistsJob(AccountPtr account, const QString &path, QObject *parent = 0);
void start() Q_DECL_OVERRIDE;
explicit EntityExistsJob(AccountPtr account, const QString &path, QObject *parent = nullptr);
void start() override;
signals:
void exists(QNetworkReply *);
private slots:
virtual bool finished() Q_DECL_OVERRIDE;
bool finished() override;
};
/**
@ -56,14 +56,14 @@ class OWNCLOUDSYNC_EXPORT DeleteApiJob : public AbstractNetworkJob
{
Q_OBJECT
public:
explicit DeleteApiJob(AccountPtr account, const QString &path, QObject *parent = 0);
explicit DeleteApiJob(AccountPtr account, const QString &path, QObject *parent = nullptr);
void start() override;
signals:
void result(int httpCode);
private slots:
virtual bool finished() override;
bool finished() override;
};
struct ExtraFolderInfo {
@ -96,9 +96,9 @@ class OWNCLOUDSYNC_EXPORT LsColJob : public AbstractNetworkJob
{
Q_OBJECT
public:
explicit LsColJob(AccountPtr account, const QString &path, QObject *parent = 0);
explicit LsColJob(AccountPtr account, const QUrl &url, QObject *parent = 0);
void start() Q_DECL_OVERRIDE;
explicit LsColJob(AccountPtr account, const QString &path, QObject *parent = nullptr);
explicit LsColJob(AccountPtr account, const QUrl &url, QObject *parent = nullptr);
void start() override;
QHash<QString, ExtraFolderInfo> _folderInfos;
/**
@ -119,7 +119,7 @@ signals:
void finishedWithoutError();
private slots:
virtual bool finished() Q_DECL_OVERRIDE;
bool finished() override;
private:
QList<QByteArray> _properties;
@ -140,8 +140,8 @@ class OWNCLOUDSYNC_EXPORT PropfindJob : public AbstractNetworkJob
{
Q_OBJECT
public:
explicit PropfindJob(AccountPtr account, const QString &path, QObject *parent = 0);
void start() Q_DECL_OVERRIDE;
explicit PropfindJob(AccountPtr account, const QString &path, QObject *parent = nullptr);
void start() override;
/**
* Used to specify which properties shall be retrieved.
@ -156,10 +156,10 @@ public:
signals:
void result(const QVariantMap &values);
void finishedWithError(QNetworkReply *reply = 0);
void finishedWithError(QNetworkReply *reply = nullptr);
private slots:
virtual bool finished() Q_DECL_OVERRIDE;
bool finished() override;
private:
QList<QByteArray> _properties;
@ -181,9 +181,9 @@ public:
* @param userId The user for which to obtain the avatar
* @param size The size of the avatar (square so size*size)
*/
explicit AvatarJob(AccountPtr account, const QString &userId, int size, QObject *parent = 0);
explicit AvatarJob(AccountPtr account, const QString &userId, int size, QObject *parent = nullptr);
void start() Q_DECL_OVERRIDE;
void start() override;
/** The retrieved avatar images don't have the circle shape by default */
static QImage makeCircularAvatar(const QImage &baseAvatar);
@ -196,7 +196,7 @@ signals:
void avatarPixmap(const QImage &);
private slots:
virtual bool finished() Q_DECL_OVERRIDE;
bool finished() override;
private:
QUrl _avatarUrl;
@ -216,8 +216,8 @@ class OWNCLOUDSYNC_EXPORT ProppatchJob : public AbstractNetworkJob
{
Q_OBJECT
public:
explicit ProppatchJob(AccountPtr account, const QString &path, QObject *parent = 0);
void start() Q_DECL_OVERRIDE;
explicit ProppatchJob(AccountPtr account, const QString &path, QObject *parent = nullptr);
void start() override;
/**
* Used to specify which properties shall be set.
@ -235,7 +235,7 @@ signals:
void finishedWithError();
private slots:
virtual bool finished() Q_DECL_OVERRIDE;
bool finished() override;
private:
QMap<QByteArray, QByteArray> _properties;
@ -252,16 +252,16 @@ class OWNCLOUDSYNC_EXPORT MkColJob : public AbstractNetworkJob
QMap<QByteArray, QByteArray> _extraHeaders;
public:
explicit MkColJob(AccountPtr account, const QString &path, QObject *parent = 0);
explicit MkColJob(AccountPtr account, const QString &path, QObject *parent = nullptr);
explicit MkColJob(AccountPtr account, const QUrl &url,
const QMap<QByteArray, QByteArray> &extraHeaders, QObject *parent = 0);
void start() Q_DECL_OVERRIDE;
const QMap<QByteArray, QByteArray> &extraHeaders, QObject *parent = nullptr);
void start() override;
signals:
void finished(QNetworkReply::NetworkError);
private slots:
virtual bool finished() Q_DECL_OVERRIDE;
bool finished() override;
};
/**
@ -272,8 +272,8 @@ class OWNCLOUDSYNC_EXPORT CheckServerJob : public AbstractNetworkJob
{
Q_OBJECT
public:
explicit CheckServerJob(AccountPtr account, QObject *parent = 0);
void start() Q_DECL_OVERRIDE;
explicit CheckServerJob(AccountPtr account, QObject *parent = nullptr);
void start() override;
static QString version(const QJsonObject &info);
static QString versionString(const QJsonObject &info);
@ -300,8 +300,8 @@ signals:
void timeout(const QUrl &url);
private:
bool finished() Q_DECL_OVERRIDE;
void onTimedOut() Q_DECL_OVERRIDE;
bool finished() override;
void onTimedOut() override;
private slots:
virtual void metaDataChangedSlot();
virtual void encryptedSlot();
@ -329,14 +329,14 @@ class OWNCLOUDSYNC_EXPORT RequestEtagJob : public AbstractNetworkJob
{
Q_OBJECT
public:
explicit RequestEtagJob(AccountPtr account, const QString &path, QObject *parent = 0);
void start() Q_DECL_OVERRIDE;
explicit RequestEtagJob(AccountPtr account, const QString &path, QObject *parent = nullptr);
void start() override;
signals:
void etagRetreived(const QString &etag);
private slots:
virtual bool finished() Q_DECL_OVERRIDE;
bool finished() override;
};
/**
@ -358,7 +358,7 @@ class OWNCLOUDSYNC_EXPORT JsonApiJob : public AbstractNetworkJob
{
Q_OBJECT
public:
explicit JsonApiJob(const AccountPtr &account, const QString &path, QObject *parent = 0);
explicit JsonApiJob(const AccountPtr &account, const QString &path, QObject *parent = nullptr);
/**
* @brief addQueryParams - add more parameters to the ocs call
@ -374,10 +374,10 @@ public:
void addRawHeader(const QByteArray &headerName, const QByteArray &value);
public slots:
void start() Q_DECL_OVERRIDE;
void start() override;
protected:
bool finished() Q_DECL_OVERRIDE;
bool finished() override;
signals:
/**
@ -415,7 +415,7 @@ public:
WebViewFlow
};
explicit DetermineAuthTypeJob(AccountPtr account, QObject *parent = 0);
explicit DetermineAuthTypeJob(AccountPtr account, QObject *parent = nullptr);
void start();
signals:
void authType(AuthType);
@ -440,16 +440,16 @@ class OWNCLOUDSYNC_EXPORT SimpleNetworkJob : public AbstractNetworkJob
{
Q_OBJECT
public:
explicit SimpleNetworkJob(AccountPtr account, QObject *parent = 0);
explicit SimpleNetworkJob(AccountPtr account, QObject *parent = nullptr);
QNetworkReply *startRequest(const QByteArray &verb, const QUrl &url,
QNetworkRequest req = QNetworkRequest(),
QIODevice *requestBody = 0);
QIODevice *requestBody = nullptr);
signals:
void finishedSignal(QNetworkReply *reply);
private slots:
bool finished() Q_DECL_OVERRIDE;
bool finished() override;
};
/**

8
src/libsync/nextcloudtheme.h
View file

@ -30,11 +30,11 @@ public:
NextcloudTheme();
#ifndef TOKEN_AUTH_ONLY
QVariant customMedia(CustomMediaType type) Q_DECL_OVERRIDE;
QVariant customMedia(CustomMediaType type) override;
QColor wizardHeaderBackgroundColor() const Q_DECL_OVERRIDE;
QColor wizardHeaderTitleColor() const Q_DECL_OVERRIDE;
QPixmap wizardHeaderLogo() const Q_DECL_OVERRIDE;
QColor wizardHeaderBackgroundColor() const override;
QColor wizardHeaderTitleColor() const override;
QPixmap wizardHeaderLogo() const override;
#endif
private:

6
src/libsync/owncloudpropagator.cpp
View file

@ -334,7 +334,7 @@ PropagateItemJob *OwncloudPropagator::createJob(const SyncFileItemPtr &item)
job->setDeleteExistingFolder(deleteExisting);
return job;
} else {
PropagateUploadFileCommon *job = 0;
PropagateUploadFileCommon *job = nullptr;
if (item->_size > syncOptions()._initialChunkSize && account()->capabilities().chunkingNg()) {
// Item is above _initialChunkSize, thus will be classified as to be chunked
job = new PropagateUploadFileNG(this, item);
@ -354,9 +354,9 @@ PropagateItemJob *OwncloudPropagator::createJob(const SyncFileItemPtr &item)
case CSYNC_INSTRUCTION_ERROR:
return new PropagateIgnoreJob(this, item);
default:
return 0;
return nullptr;
}
return 0;
return nullptr;
}
quint64 OwncloudPropagator::smallFileSize()

22
src/libsync/owncloudpropagator.h
View file

@ -186,7 +186,7 @@ public:
}
~PropagateItemJob();
bool scheduleSelfOrChild() Q_DECL_OVERRIDE
bool scheduleSelfOrChild() override
{
if (_state != NotYetStarted) {
return false;
@ -238,15 +238,15 @@ public:
_tasksToDo.append(item);
}
virtual bool scheduleSelfOrChild() Q_DECL_OVERRIDE;
virtual JobParallelism parallelism() Q_DECL_OVERRIDE;
bool scheduleSelfOrChild() override;
JobParallelism parallelism() override;
/*
* Abort synchronously or asynchronously - some jobs
* require to be finished without immediete abort (abort on job might
* cause conflicts/duplicated files - owncloud/client/issues/5949)
*/
virtual void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE
void abort(PropagatorJob::AbortType abortType) override
{
if (!_runningJobs.empty()) {
_abortsCount = _runningJobs.size();
@ -262,7 +262,7 @@ public:
}
}
qint64 committedDiskSpace() const Q_DECL_OVERRIDE;
qint64 committedDiskSpace() const override;
private slots:
void slotSubJobAbortFinished();
@ -304,9 +304,9 @@ public:
_subJobs.appendTask(item);
}
virtual bool scheduleSelfOrChild() Q_DECL_OVERRIDE;
virtual JobParallelism parallelism() Q_DECL_OVERRIDE;
virtual void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE
bool scheduleSelfOrChild() override;
JobParallelism parallelism() override;
void abort(PropagatorJob::AbortType abortType) override
{
if (_firstJob)
// Force first job to abort synchronously
@ -325,7 +325,7 @@ public:
}
qint64 committedDiskSpace() const Q_DECL_OVERRIDE
qint64 committedDiskSpace() const override
{
return _subJobs.committedDiskSpace();
}
@ -350,7 +350,7 @@ public:
: PropagateItemJob(propagator, item)
{
}
void start() Q_DECL_OVERRIDE
void start() override
{
SyncFileItem::Status status = _item->_status;
done(status == SyncFileItem::NoStatus ? SyncFileItem::FileIgnored : status, _item->_errorString);
@ -565,7 +565,7 @@ class CleanupPollsJob : public QObject
public:
explicit CleanupPollsJob(const QVector<SyncJournalDb::PollInfo> &pollInfos, AccountPtr account,
SyncJournalDb *journal, const QString &localPath, QObject *parent = 0)
SyncJournalDb *journal, const QString &localPath, QObject *parent = nullptr)
: QObject(parent)
, _pollInfos(pollInfos)
, _account(account)

2
src/libsync/owncloudpropagator_p.h
View file

@ -60,7 +60,7 @@ inline QByteArray getEtagFromReply(QNetworkReply *reply)
*/
inline SyncFileItem::Status classifyError(QNetworkReply::NetworkError nerror,
int httpCode,
bool *anotherSyncNeeded = NULL)
bool *anotherSyncNeeded = nullptr)
{
Q_ASSERT(nerror != QNetworkReply::NoError); // we should only be called when there is an error

2
src/libsync/progressdispatcher.cpp
View file

@ -20,7 +20,7 @@
namespace OCC {
ProgressDispatcher *ProgressDispatcher::_instance = 0;
ProgressDispatcher *ProgressDispatcher::_instance = nullptr;
QString Progress::asResultString(const SyncFileItem &item)
{

2
src/libsync/progressdispatcher.h
View file

@ -305,7 +305,7 @@ protected:
void setProgressInfo(const QString &folder, const ProgressInfo &progress);
private:
ProgressDispatcher(QObject *parent = 0);
ProgressDispatcher(QObject *parent = nullptr);
QElapsedTimer _timer;
static ProgressDispatcher *_instance;

4
src/libsync/propagatedownload.cpp
View file

@ -80,7 +80,7 @@ GETFileJob::GETFileJob(AccountPtr account, const QString &path, QFile *device,
, _bandwidthLimited(false)
, _bandwidthChoked(false)
, _bandwidthQuota(0)
, _bandwidthManager(0)
, _bandwidthManager(nullptr)
, _hasEmittedFinishedSignal(false)
, _lastModified()
{
@ -100,7 +100,7 @@ GETFileJob::GETFileJob(AccountPtr account, const QUrl &url, QFile *device,
, _bandwidthLimited(false)
, _bandwidthChoked(false)
, _bandwidthQuota(0)
, _bandwidthManager(0)
, _bandwidthManager(nullptr)
, _hasEmittedFinishedSignal(false)
, _lastModified()
{

18
src/libsync/propagatedownload.h
View file

@ -52,11 +52,11 @@ public:
// DOES NOT take ownership of the device.
explicit GETFileJob(AccountPtr account, const QString &path, QFile *device,
const QMap<QByteArray, QByteArray> &headers, const QByteArray &expectedEtagForResume,
quint64 resumeStart, QObject *parent = 0);
quint64 resumeStart, QObject *parent = nullptr);
// For directDownloadUrl:
explicit GETFileJob(AccountPtr account, const QUrl &url, QFile *device,
const QMap<QByteArray, QByteArray> &headers, const QByteArray &expectedEtagForResume,
quint64 resumeStart, QObject *parent = 0);
quint64 resumeStart, QObject *parent = nullptr);
virtual ~GETFileJob()
{
if (_bandwidthManager) {
@ -64,8 +64,8 @@ public:
}
}
virtual void start() Q_DECL_OVERRIDE;
virtual bool finished() Q_DECL_OVERRIDE
void start() override;
bool finished() override
{
if (reply()->bytesAvailable()) {
return false;
@ -95,7 +95,7 @@ public:
SyncFileItem::Status errorStatus() { return _errorStatus; }
void setErrorStatus(const SyncFileItem::Status &s) { _errorStatus = s; }
void onTimedOut() Q_DECL_OVERRIDE;
void onTimedOut() override;
QByteArray &etag() { return _etag; }
quint64 resumeStart() { return _resumeStart; }
@ -159,11 +159,11 @@ public:
, _deleteExisting(false)
{
}
void start() Q_DECL_OVERRIDE;
qint64 committedDiskSpace() const Q_DECL_OVERRIDE;
void start() override;
qint64 committedDiskSpace() const override;
// We think it might finish quickly because it is a small file.
bool isLikelyFinishedQuickly() Q_DECL_OVERRIDE { return _item->_size < propagator()->smallFileSize(); }
bool isLikelyFinishedQuickly() override { return _item->_size < propagator()->smallFileSize(); }
/**
* Whether an existing folder with the same name may be deleted before
@ -192,7 +192,7 @@ private slots:
/// Called when it's time to update the db metadata
void updateMetadata(bool isConflict);
void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE;
void abort(PropagatorJob::AbortType abortType) override;
void slotDownloadProgress(qint64, qint64);
void slotChecksumFail(const QString &errMsg);

14
src/libsync/propagateremotedelete.h
View file

@ -27,11 +27,11 @@ class DeleteJob : public AbstractNetworkJob
Q_OBJECT
QUrl _url; // Only used if the constructor taking a url is taken.
public:
explicit DeleteJob(AccountPtr account, const QString &path, QObject *parent = 0);
explicit DeleteJob(AccountPtr account, const QUrl &url, QObject *parent = 0);
explicit DeleteJob(AccountPtr account, const QString &path, QObject *parent = nullptr);
explicit DeleteJob(AccountPtr account, const QUrl &url, QObject *parent = nullptr);
void start() Q_DECL_OVERRIDE;
bool finished() Q_DECL_OVERRIDE;
void start() override;
bool finished() override;
signals:
void finishedSignal();
@ -51,11 +51,11 @@ public:
: PropagateItemJob(propagator, item)
{
}
void start() Q_DECL_OVERRIDE;
void start() override;
void createDeleteJob(const QString &filename);
void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE;
void abort(PropagatorJob::AbortType abortType) override;
bool isLikelyFinishedQuickly() Q_DECL_OVERRIDE { return !_item->isDirectory(); }
bool isLikelyFinishedQuickly() override { return !_item->isDirectory(); }
private slots:
void slotDeleteJobFinished();

6
src/libsync/propagateremotemkdir.h
View file

@ -34,11 +34,11 @@ public:
, _deleteExisting(false)
{
}
void start() Q_DECL_OVERRIDE;
void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE;
void start() override;
void abort(PropagatorJob::AbortType abortType) override;
// Creating a directory should be fast.
bool isLikelyFinishedQuickly() Q_DECL_OVERRIDE { return true; }
bool isLikelyFinishedQuickly() override { return true; }
/**
* Whether an existing entity with the same name may be deleted before

14
src/libsync/propagateremotemove.h
View file

@ -30,12 +30,12 @@ class MoveJob : public AbstractNetworkJob
QMap<QByteArray, QByteArray> _extraHeaders;
public:
explicit MoveJob(AccountPtr account, const QString &path, const QString &destination, QObject *parent = 0);
explicit MoveJob(AccountPtr account, const QString &path, const QString &destination, QObject *parent = nullptr);
explicit MoveJob(AccountPtr account, const QUrl &url, const QString &destination,
QMap<QByteArray, QByteArray> _extraHeaders, QObject *parent = 0);
QMap<QByteArray, QByteArray> _extraHeaders, QObject *parent = nullptr);
void start() Q_DECL_OVERRIDE;
bool finished() Q_DECL_OVERRIDE;
void start() override;
bool finished() override;
signals:
void finishedSignal();
@ -55,9 +55,9 @@ public:
: PropagateItemJob(propagator, item)
{
}
void start() Q_DECL_OVERRIDE;
void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE;
JobParallelism parallelism() Q_DECL_OVERRIDE { return _item->isDirectory() ? WaitForFinished : FullParallelism; }
void start() override;
void abort(PropagatorJob::AbortType abortType) override;
JobParallelism parallelism() override { return _item->isDirectory() ? WaitForFinished : FullParallelism; }
/**
* Rename the directory in the selective sync list

2
src/libsync/propagateupload.cpp
View file

@ -69,7 +69,7 @@ static bool fileIsStillChanging(const SyncFileItem &item)
PUTFileJob::~PUTFileJob()
{
// Make sure that we destroy the QNetworkReply before our _device of which it keeps an internal pointer.
setReply(0);
setReply(nullptr);
}
void PUTFileJob::start()

40
src/libsync/propagateupload.h
View file

@ -42,13 +42,13 @@ public:
/** Reads the data from the file and opens the device */
bool prepareAndOpen(const QString &fileName, qint64 start, qint64 size);
qint64 writeData(const char *, qint64) Q_DECL_OVERRIDE;
qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE;
bool atEnd() const Q_DECL_OVERRIDE;
qint64 size() const Q_DECL_OVERRIDE;
qint64 bytesAvailable() const Q_DECL_OVERRIDE;
bool isSequential() const Q_DECL_OVERRIDE;
bool seek(qint64 pos) Q_DECL_OVERRIDE;
qint64 writeData(const char *, qint64) override;
qint64 readData(char *data, qint64 maxlen) override;
bool atEnd() const override;
qint64 size() const override;
qint64 bytesAvailable() const override;
bool isSequential() const override;
bool seek(qint64 pos) override;
void setBandwidthLimited(bool);
bool isBandwidthLimited() { return _bandwidthLimited; }
@ -93,7 +93,7 @@ private:
public:
// Takes ownership of the device
explicit PUTFileJob(AccountPtr account, const QString &path, QIODevice *device,
const QMap<QByteArray, QByteArray> &headers, int chunk, QObject *parent = 0)
const QMap<QByteArray, QByteArray> &headers, int chunk, QObject *parent = nullptr)
: AbstractNetworkJob(account, path, parent)
, _device(device)
, _headers(headers)
@ -102,7 +102,7 @@ public:
_device->setParent(this);
}
explicit PUTFileJob(AccountPtr account, const QUrl &url, QIODevice *device,
const QMap<QByteArray, QByteArray> &headers, int chunk, QObject *parent = 0)
const QMap<QByteArray, QByteArray> &headers, int chunk, QObject *parent = nullptr)
: AbstractNetworkJob(account, QString(), parent)
, _device(device)
, _headers(headers)
@ -115,9 +115,9 @@ public:
int _chunk;
virtual void start() Q_DECL_OVERRIDE;
void start() override;
virtual bool finished() Q_DECL_OVERRIDE
bool finished() override
{
qCInfo(lcPutJob) << "PUT of" << reply()->request().url().toString() << "FINISHED WITH STATUS"
<< replyStatusString()
@ -174,8 +174,8 @@ public:
{
}
void start() Q_DECL_OVERRIDE;
bool finished() Q_DECL_OVERRIDE;
void start() override;
bool finished() override;
signals:
void finishedSignal();
@ -232,7 +232,7 @@ public:
: PropagateItemJob(propagator, item)
, _finished(false)
, _deleteExisting(false)
, _uploadEncryptedHelper(0)
, _uploadEncryptedHelper(nullptr)
, _uploadingEncrypted(false)
{
}
@ -246,12 +246,12 @@ public:
void setDeleteExisting(bool enabled);
/* start should setup the file, path and size that will be send to the server */
void start() Q_DECL_OVERRIDE;
void start() override;
void setupEncryptedFile(const QString& path, const QString& filename, quint64 size);
void setupUnencryptedFile();
void startUploadFile();
void callUnlockFolder();
bool isLikelyFinishedQuickly() Q_DECL_OVERRIDE { return _item->_size < propagator()->smallFileSize(); }
bool isLikelyFinishedQuickly() override { return _item->_size < propagator()->smallFileSize(); }
private slots:
void slotComputeContentChecksum();
@ -352,9 +352,9 @@ public:
{
}
void doStartUpload() Q_DECL_OVERRIDE;
void doStartUpload() override;
public slots:
void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE;
void abort(PropagatorJob::AbortType abortType) override;
private slots:
void startNextChunk();
void slotPutFinished();
@ -398,13 +398,13 @@ public:
{
}
void doStartUpload() Q_DECL_OVERRIDE;
void doStartUpload() override;
private:
void startNewUpload();
void startNextChunk();
public slots:
void abort(AbortType abortType) Q_DECL_OVERRIDE;
void abort(AbortType abortType) override;
private slots:
void slotPropfindFinished();
void slotPropfindFinishedWithError();

8
src/libsync/propagatorjobs.h
View file

@ -39,7 +39,7 @@ public:
: PropagateItemJob(propagator, item)
{
}
void start() Q_DECL_OVERRIDE;
void start() override;
private:
bool removeRecursively(const QString &path);
@ -60,7 +60,7 @@ public:
, _deleteExistingFile(false)
{
}
void start() Q_DECL_OVERRIDE;
void start() override;
/**
* Whether an existing file with the same name may be deleted before
@ -86,7 +86,7 @@ public:
: PropagateItemJob(propagator, item)
{
}
void start() Q_DECL_OVERRIDE;
JobParallelism parallelism() Q_DECL_OVERRIDE { return _item->isDirectory() ? WaitForFinished : FullParallelism; }
void start() override;
JobParallelism parallelism() override { return _item->isDirectory() ? WaitForFinished : FullParallelism; }
};
}

4
src/libsync/theme.cpp
View file

@ -37,7 +37,7 @@
namespace OCC {
Theme *Theme::_instance = 0;
Theme *Theme::_instance = nullptr;
Theme *Theme::instance()
{
@ -201,7 +201,7 @@ QString Theme::hidpiFileName(const QString &fileName, QPaintDevice *dev)
#endif
Theme::Theme()
: QObject(0)
: QObject(nullptr)
, _mono(false)
{
}

2
src/libsync/theme.h
View file

@ -87,7 +87,7 @@ public:
virtual QString configFileName() const;
#ifndef TOKEN_AUTH_ONLY
static QString hidpiFileName(const QString &fileName, QPaintDevice *dev = 0);
static QString hidpiFileName(const QString &fileName, QPaintDevice *dev = nullptr);
/**
* get an sync state icon

245
translations/client_cs.ts
View file

@ -4,42 +4,42 @@
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="107"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
<translation>%1 (%2, %3)</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="124"/>
<source>Checking for changes in &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Zjišťování případných změn v „%1“</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="129"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
<translation>Synchronizuje se %1 z %2 (%3 zbývá)</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="134"/>
<source>Syncing %1 of %2</source>
<translation type="unfinished"/>
<translation>Synchronizuje se %1 z %2</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="141"/>
<source>Syncing %1 (%2 left)</source>
<translation type="unfinished"/>
<translation>Synchronizuje se %1 (zbývá %2)</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="144"/>
<source>Syncing %1</source>
<translation type="unfinished"/>
<translation>Synchronizuje se %1</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="186"/>
<source>Sync paused</source>
<translation type="unfinished"/>
<translation>Synchronizace pozastavena</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="189"/>
<source>Syncing</source>
<translation type="unfinished"/>
<translation>Synchronizuje se</translation>
</message>
</context>
<context>
@ -47,12 +47,12 @@
<message>
<location filename="../src/gui/mnemonicdialog.ui" line="23"/>
<source>Dialog</source>
<translation type="unfinished"/>
<translation>Dialog</translation>
</message>
<message>
<location filename="../src/gui/mnemonicdialog.ui" line="58"/>
<source>Label</source>
<translation type="unfinished"/>
<translation>Štítek</translation>
</message>
</context>
<context>
@ -60,18 +60,18 @@
<message>
<location filename="../src/common/filesystembase.cpp" line="445"/>
<source>Could not make directories in trash</source>
<translation type="unfinished"/>
<translation>V Koši není možné vytvářet složky</translation>
</message>
<message>
<location filename="../src/common/filesystembase.cpp" line="459"/>
<location filename="../src/common/filesystembase.cpp" line="465"/>
<source>Could not move &apos;%1&apos; to &apos;%2&apos;</source>
<translation type="unfinished"/>
<translation>„%1“ se nedaří přesunout do „%2“</translation>
</message>
<message>
<location filename="../src/common/filesystembase.cpp" line="502"/>
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
<translation>Přesun do koše není na této platformě implementováno</translation>
</message>
</context>
<context>
@ -148,12 +148,12 @@
<message>
<location filename="../src/gui/accountmanager.cpp" line="342"/>
<source>End to end encryption mnemonic</source>
<translation type="unfinished"/>
<translation>Mnemonická šifrování mezi koncovými body</translation>
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="343"/>
<source>To protect your Cryptocraphic Identity, we encrypt it with a mnemonic of 12 dictionary words.Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
<translation>Pro ochranu vaší kryptografické identity ji šifrujeme pomocí mnemonické 12 slovy ze slovníku. Poznamenejte si je někam bezpečně. Budou potřebné pro přidání dalších zařízení k vašemu účtu (jako je mobilní telefon či notebook).</translation>
</message>
</context>
<context>
@ -233,12 +233,12 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Show E2E mnemonic</source>
<translation type="unfinished"/>
<translation>Zobrazit E2E mnemotechnickou</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="542"/>
<source>Encrypt</source>
<translation type="unfinished"/>
<translation>Šífrovat</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="583"/>
@ -476,27 +476,27 @@
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="131"/>
<source>%1</source>
<translation type="unfinished"/>
<translation>%1</translation>
</message>
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="179"/>
<source>More information</source>
<translation type="unfinished"/>
<translation>Více informací</translation>
</message>
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="180"/>
<source>Accept</source>
<translation type="unfinished"/>
<translation>Přijmout</translation>
</message>
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="181"/>
<source>Join</source>
<translation type="unfinished"/>
<translation>Připojit se</translation>
</message>
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="198"/>
<source>Open Browser</source>
<translation type="unfinished"/>
<translation>Otevřít prohlížeč</translation>
</message>
</context>
<context>
@ -514,17 +514,17 @@
<message>
<location filename="../src/gui/activitywidget.cpp" line="56"/>
<source>Accept</source>
<translation type="unfinished"/>
<translation>Přijmout</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="182"/>
<source>Synced </source>
<translation type="unfinished"/>
<translation>Synchronizováno</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="217"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
<translation>Zkusit znovu všechna nahrání</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="332"/>
@ -624,12 +624,12 @@
<message>
<location filename="../src/libsync/clientsideencryption.cpp" line="992"/>
<source>Please enter your end to end encryption passphrase:&lt;br&gt;&lt;br&gt;User: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
<translation type="unfinished"/>
<translation>Zadejte heslovou frázi pro šifrování mezi koncovými body: &lt;br&gt;&lt;br&gt;Uživatel: %2&lt;br&gt;Účet: %3&lt;br&gt;</translation>
</message>
<message>
<location filename="../src/libsync/clientsideencryption.cpp" line="1000"/>
<source>Enter E2E passphrase</source>
<translation type="unfinished"/>
<translation>Zadejte E2E heslovou frázi</translation>
</message>
</context>
<context>
@ -678,7 +678,7 @@
<message>
<location filename="../src/libsync/discoveryphase.cpp" line="392"/>
<source>The server file discovery reply is missing data.</source>
<translation type="unfinished"/>
<translation>Odpověď ze serveru na objevování souboru postrádá data.</translation>
</message>
</context>
<context>
@ -803,12 +803,12 @@
<message>
<location filename="../src/gui/folder.cpp" line="1012"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
<translation>Složka %1 byla vytvořena ale byla dříve vynechána ze synchronizace. Nebude synchronizována.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1015"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
<translation>Soubor %1 byl vytvořen ale byl dříve byl vynechán ze synchronizace. Nebude synchronizován.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1026"/>
@ -817,7 +817,11 @@
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
%1</source>
<translation type="unfinished"/>
<translation>Změny v synchronizovaných složkách se nedaří spolehlivě sledovat.
To znamená, že synchronizační klient nemusí místní změny okamžitě nahrát a namísto toho bude pouze skenovat pro lokální změny a nahrávat je příležitostně (výchozí je každé dvě hodiny).
%1</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1071"/>
@ -825,22 +829,25 @@ This means that the synchronization client might not upload local changes immedi
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
<translation type="unfinished"/>
<translation>Všechny soubory v synchronizační složce „%1“ byly smazány na serveru.
Tato smazání budou synchronizována do místní synchronizační složky, takže tyto soubory nebudou dostupné, pokud nemáte oprávnění na obnovu.
Pokud se rozhodnete soubory ponechat, budou znovu synchronizovány se serverem pokud na to máte oprávnění.
Pokud se soubory rozhodnete smazat, nebudou vám dostupné, pokud nejste vlastník.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1080"/>
<source>Download new files?</source>
<translation type="unfinished"/>
<translation>Stáhnout nové soubory?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1083"/>
<source>Download new files</source>
<translation type="unfinished"/>
<translation>Stáhnout nové soubory</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1084"/>
<source>Keep local files</source>
<translation type="unfinished"/>
<translation>Ponechat místní soubory</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1076"/>
@ -921,7 +928,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
<message>
<location filename="../src/gui/folderman.cpp" line="1220"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
<translation>Synchronizace byla úspěšná, nevyřešené konflikty.</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1222"/>
@ -931,7 +938,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
<message>
<location filename="../src/gui/folderman.cpp" line="1312"/>
<source>The local folder %1 contains a symbolic link. The link target contains an already synced folder. Please pick another one!</source>
<translation type="unfinished"/>
<translation>Místní složka %1 obsahuje symbolický odkaz. Cíl odkazu obsahuje složku, která už byla synchronizována. Zvolte jinou!</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1228"/>
@ -999,7 +1006,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="249"/>
<source>Synchronized with local folder</source>
<translation type="unfinished"/>
<translation>Synchronizováno s místní složkou</translation>
</message>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="296"/>
@ -1090,22 +1097,22 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Zjišťují se změny ve vzdáleném „%1“</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="923"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Zjišťují se změny v místním „%1“</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1000"/>
<source>↓ %1/s</source>
<translation type="unfinished"/>
<translation>↓ %1/s</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>↑ %1/s</source>
<translation type="unfinished"/>
<translation>↑ %1/s</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
@ -1157,7 +1164,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
<message>
<location filename="../src/gui/folderwatcher_linux.cpp" line="87"/>
<source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source>
<translation type="unfinished"/>
<translation>Tento problém obvykle nastává když jsou překročeny kapacity sledování změn na souborovém systému (inotify). Podrobnosti naleznete v často kladených dotazech (FAQ).</translation>
</message>
</context>
<context>
@ -1285,7 +1292,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
<message>
<location filename="../src/gui/generalsettings.ui" line="41"/>
<source>Legal notice</source>
<translation type="unfinished"/>
<translation>Právní upozornění</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="66"/>
@ -1300,7 +1307,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
<message>
<location filename="../src/gui/generalsettings.ui" line="89"/>
<source>Show Server &amp;Notifications</source>
<translation type="unfinished"/>
<translation>Zobrazovat &amp;upozornění serveru</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="163"/>
@ -1341,7 +1348,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
<message>
<location filename="../src/gui/generalsettings.ui" line="250"/>
<source>Show sync folders in &amp;Explorer&apos;s Navigation Pane</source>
<translation type="unfinished"/>
<translation>Zobrazit synchronizované složky v panelu navigac&amp;e Průzkumníka</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="267"/>
@ -1367,7 +1374,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
<message>
<location filename="../src/gui/generalsettings.cpp" line="49"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
<translation>Oznámení serveru která vyžadují pozornost.</translation>
</message>
</context>
<context>
@ -1375,14 +1382,16 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
<message>
<location filename="../src/gui/socketapi.cpp" line="520"/>
<source>Sharing error</source>
<translation type="unfinished"/>
<translation>Chyba sdílení</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="521"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
<translation type="unfinished"/>
<translation>Nedaří se získat nebo vytvořit sdílení veřejným odkazem. Chyba:
%1</translation>
</message>
</context>
<context>
@ -1438,7 +1447,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="126"/>
<source>Remove all</source>
<translation type="unfinished"/>
<translation>Odebrat vše</translation>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="93"/>
@ -1495,32 +1504,32 @@ Položky u kterých je povoleno smazání budou vymazány, pokud by bránily ods
<message>
<location filename="../src/gui/legalnotice.ui" line="14"/>
<source>Dialog</source>
<translation type="unfinished"/>
<translation>Dialog</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.ui" line="26"/>
<source>Legal notice</source>
<translation type="unfinished"/>
<translation>Právní upozornění</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.ui" line="36"/>
<source>TextLabel</source>
<translation type="unfinished"/>
<translation>TextovýŠtítek</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.ui" line="58"/>
<source>Close</source>
<translation type="unfinished"/>
<translation>Zavřít</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.cpp" line="27"/>
<source>&lt;p&gt;Copyright 2017-2018 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2018 ownCloud GmbH&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;Copyright 2017-2018 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2018 ownCloud GmbH&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.cpp" line="30"/>
<source>&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0 or any later version.&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;Licencováno pod GNU General Public License (GPL) verze 2.0 nebo jakékoli novější.&lt;/p&gt;</translation>
</message>
</context>
<context>
@ -1548,14 +1557,16 @@ Položky u kterých je povoleno smazání budou vymazány, pokud by bránily ods
<message>
<location filename="../src/gui/logbrowser.cpp" line="101"/>
<source>Permanently save logs</source>
<translation type="unfinished"/>
<translation>Ukládat záznamy událostí trvale</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="103"/>
<source>When this option is enabled and no other logging is configured, logs will be written to a temporary folder and expire after a few hours. This setting persists across client restarts.
Logs will be written to %1</source>
<translation type="unfinished"/>
<translation>Když je tato volba zapnutá a není nastavené žádné další zaznamenávání událostí, záznam událostí bude zapisován do dočasné složky a po několika hodinách jeho platnost skončí. Toto nastavení přetrvá přes restarty klienta.
Záznamy událostí budou zapisovány do %1</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="115"/>
@ -1958,22 +1969,22 @@ můžete být požádáni o dodatečná oprávnění.</translation>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="83"/>
<source>Keep your data secure and under your control</source>
<translation type="unfinished"/>
<translation>Mějte svá data zabezpečená a pod svou kontrolou</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="84"/>
<source>Secure collaboration &amp; file exchange</source>
<translation type="unfinished"/>
<translation>Zabezpečená spolupráce a výměna souborů</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="85"/>
<source>Easy-to-use web mail, calendaring &amp; contacts</source>
<translation type="unfinished"/>
<translation>Snadno použitelný webový e-mailový klient, kalendáře a kontakty</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="86"/>
<source>Screensharing, online meetings &amp; web conferences</source>
<translation type="unfinished"/>
<translation>Sdílení obrazovky, online schůzky a webové konference</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="198"/>
@ -1995,7 +2006,7 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="414"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation type="unfinished"/>
<translation>Certifikát není možné načíst. Nejspíš je chybné heslo?</translation>
</message>
</context>
<context>
@ -2200,7 +2211,7 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="364"/>
<source>File %1 can not be downloaded because encryption information is missing.</source>
<translation type="unfinished"/>
<translation>Soubor %1 není možné stáhnout z důvodu chybějících informací o šifrování</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="434"/>
@ -2377,7 +2388,7 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="334"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
<translation>Soubor odebrán (zahájit nahrávání) %1</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="684"/>
@ -2596,7 +2607,7 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/gui/sharedialog.ui" line="162"/>
<source>Icon</source>
<translation type="unfinished"/>
<translation>Ikona</translation>
</message>
<message>
<location filename="../src/gui/sharedialog.cpp" line="101"/>
@ -2629,22 +2640,22 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="122"/>
<source>&amp;Share link</source>
<translation type="unfinished"/>
<translation>Odkaz pro &amp;sdílení</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="145"/>
<source>Enable</source>
<translation type="unfinished"/>
<translation>Zapnout</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="259"/>
<source>Password:</source>
<translation type="unfinished"/>
<translation>Heslo:</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="383"/>
<source>Expiration date:</source>
<translation type="unfinished"/>
<translation>Datum skončení platnosti:</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="508"/>
@ -2659,42 +2670,42 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="189"/>
<source>Allow Editing</source>
<translation type="unfinished"/>
<translation>Umožnit upravování</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="195"/>
<source>Read only</source>
<translation type="unfinished"/>
<translation>Pouze pro čtení</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
<source>Allow Upload &amp;&amp; Editing</source>
<translation type="unfinished"/>
<translation>Umožnit nahrávání a upravování</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="208"/>
<source>File Drop (Upload Only)</source>
<translation type="unfinished"/>
<translation>Přetažení souboru (pouze nahrání)</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="215"/>
<source>Copy link</source>
<translation type="unfinished"/>
<translation>Zkopírovat odkaz</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="228"/>
<source>Password Protect</source>
<translation type="unfinished"/>
<translation>Chránit heslem</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="245"/>
<source>Expiration Date</source>
<translation type="unfinished"/>
<translation>Datum skončení platnosti</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="265"/>
<source>Unshare</source>
<translation type="unfinished"/>
<translation>Přestat sdílet</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
@ -2732,7 +2743,7 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="248"/>
<source>Copy link</source>
<translation type="unfinished"/>
<translation>Zkopírovat odkaz</translation>
</message>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="258"/>
@ -2755,7 +2766,7 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/gui/shareuserline.ui" line="114"/>
<source>User name</source>
<translation type="unfinished"/>
<translation>Uživatelské jméno</translation>
</message>
<message>
<location filename="../src/gui/shareuserline.ui" line="155"/>
@ -2765,22 +2776,22 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="388"/>
<source>Can reshare</source>
<translation type="unfinished"/>
<translation>Může sdílet dál</translation>
</message>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="398"/>
<source>Can create</source>
<translation type="unfinished"/>
<translation>Může vytvářet</translation>
</message>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="404"/>
<source>Can change</source>
<translation type="unfinished"/>
<translation>Může měnit</translation>
</message>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
<source>Can delete</source>
<translation type="unfinished"/>
<translation>Může mazat</translation>
</message>
</context>
<context>
@ -2830,7 +2841,7 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/gui/socketapi.cpp" line="491"/>
<source>Context menu share</source>
<translation type="unfinished"/>
<translation>Sdílení kontextové nabídky</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="612"/>
@ -2857,18 +2868,18 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/gui/socketapi.cpp" line="653"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
<translation>Sdílet tento soubor dál není dovoleno</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="666"/>
<location filename="../src/gui/socketapi.cpp" line="668"/>
<source>Copy public link to clipboard</source>
<translation type="unfinished"/>
<translation>Zkopírovat veřejný odkaz do schránky</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="722"/>
<source>Open in browser</source>
<translation type="unfinished"/>
<translation>Otevřít v prohlížeči</translation>
</message>
</context>
<context>
@ -3162,32 +3173,32 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>Failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
<translation>Nepodařilo načíst nebo vytvořit soubor žurnálu. Ověřte, že máte oprávnění pro čtení a zápis do místní synchronizační složky.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>Discovery step failed.</source>
<translation type="unfinished"/>
<translation>Krok objevování se nezdařil.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>Permission denied.</source>
<translation type="unfinished"/>
<translation>Oprávnění zamítnuto.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>File or directory not found:</source>
<translation type="unfinished"/>
<translation>Soubor nebo adresář nenalezen:</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>Tried to create a folder that already exists.</source>
<translation type="unfinished"/>
<translation>Pokus o vytvoření složky, která už existuje.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>No space on %1 server available.</source>
<translation type="unfinished"/>
<translation>Na %1 serveru není k dispozici volné místo.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="154"/>
@ -3358,7 +3369,7 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/libsync/theme.cpp" line="341"/>
<source>&lt;p&gt;This release was supplied by the Nextcloud GmbH&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;Toto vydání bylo poskytnuto společností Nextcloud GmbH&lt;/p&gt;</translation>
</message>
</context>
<context>
@ -3366,12 +3377,12 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/gui/creds/webflowcredentials.cpp" line="122"/>
<source>You have been logged out of %1 as user %2. Please login again</source>
<translation type="unfinished"/>
<translation>Byli jste odhlášeni z %1 jako uživatel %2. Znovu se přihlaste</translation>
</message>
<message>
<location filename="../src/gui/creds/webflowcredentials.cpp" line="139"/>
<source>Please login with the user: %1</source>
<translation type="unfinished"/>
<translation>Přihlaste se pomocí uživatele: %1</translation>
</message>
</context>
<context>
@ -3505,7 +3516,7 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="356"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
<translation>Nevyřešené konflikty</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="363"/>
@ -3561,7 +3572,7 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="841"/>
<source>Apps</source>
<translation type="unfinished"/>
<translation>Aplikace</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="898"/>
@ -3571,12 +3582,12 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="920"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Zjišťují se změny ve vzdáleném „%1“</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="923"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Zjišťují se změny v místním „%1“</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="938"/>
@ -3722,7 +3733,7 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/>
<source>An error occurred while connecting. Please try again.</source>
<translation type="unfinished"/>
<translation>Při připojování došlo k chybě. Zkuste to znovu.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/>
@ -3746,22 +3757,22 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/>
<source>&lt;a href=&quot;https://docs.nextcloud.com/server/13/admin_manual/installation/index.html#installation&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Host your own server&lt;/span&gt;&lt;/a&gt;</source>
<translation type="unfinished"/>
<translation>&lt;a href=&quot;https://docs.nextcloud.com/server/13/admin_manual/installation/index.html#installation&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Hostujte svůj vlastní server&lt;/span&gt;&lt;/a&gt;</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="143"/>
<source>Register with a provider</source>
<translation type="unfinished"/>
<translation>Zaregistrovat se u poskytovatele</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="165"/>
<source>Log in</source>
<translation type="unfinished"/>
<translation>Přihlásit</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="241"/>
<source>SlideshowLabel</source>
<translation type="unfinished"/>
<translation>ŠtítekPrezentace</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="316"/>
@ -3813,22 +3824,22 @@ Nedoporučuje se jí používat.</translation>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="437"/>
<source>%n day ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>před %n dnem</numerusform><numerusform>před %n dny</numerusform><numerusform>před %n dny</numerusform><numerusform>před %n dny</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="439"/>
<source>%n days ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>Před %n dnem</numerusform><numerusform>Před %n dny</numerusform><numerusform>Před %n dny</numerusform><numerusform>Před %n dny</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="449"/>
<source>%n hour ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>před %n hodinou</numerusform><numerusform>před %n hodinami</numerusform><numerusform>před %n hodinami</numerusform><numerusform>před %n hodinami</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="451"/>
<source>%n hours ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>před %n hodinou</numerusform><numerusform>před %n hodinami</numerusform><numerusform>před %n hodinami</numerusform><numerusform>před %n hodinami</numerusform></translation>
</message>
<message>
<location filename="../src/common/utility.cpp" line="458"/>
@ -3843,12 +3854,12 @@ Nedoporučuje se jí používat.</translation>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="464"/>
<source>%n minute ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>před %n minutou</numerusform><numerusform>před %n minutami</numerusform><numerusform>před %n minutami</numerusform><numerusform>před %n minutami</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="466"/>
<source>%n minutes ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>před %n minutou</numerusform><numerusform>před %n minutami</numerusform><numerusform>před %n minutami</numerusform><numerusform>před %n minutami</numerusform></translation>
</message>
<message>
<location filename="../src/common/utility.cpp" line="470"/>
@ -3925,17 +3936,17 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/common/checksums.cpp" line="233"/>
<source>The checksum header is malformed.</source>
<translation type="unfinished"/>
<translation>Hlavička kontrolního součtu je poškozena.</translation>
</message>
<message>
<location filename="../src/common/checksums.cpp" line="248"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Hlavička kontrolního součtu obsahovala neznámý typ součtu „%1“</translation>
</message>
<message>
<location filename="../src/common/checksums.cpp" line="252"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation type="unfinished"/>
<translation>Stažený soubor neodpovídá kontrolnímu součtu, bude znovu stažen.</translation>
</message>
</context>
<context>
@ -3943,7 +3954,7 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/gui/wizard/webview.ui" line="26"/>
<source>Form</source>
<translation type="unfinished"/>
<translation>Formulář</translation>
</message>
</context>
<context>
@ -3964,7 +3975,7 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/libsync/theme.cpp" line="320"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;&lt;small&gt;Sestaveno z Git revize &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; na %3, %4 s použitím Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
</context>
<context>

139
translations/client_is.ts
View file

@ -39,7 +39,7 @@
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="189"/>
<source>Syncing</source>
<translation type="unfinished"/>
<translation>Samstilli</translation>
</message>
</context>
<context>
@ -47,12 +47,12 @@
<message>
<location filename="../src/gui/mnemonicdialog.ui" line="23"/>
<source>Dialog</source>
<translation type="unfinished"/>
<translation>Samskiptagluggi</translation>
</message>
<message>
<location filename="../src/gui/mnemonicdialog.ui" line="58"/>
<source>Label</source>
<translation type="unfinished"/>
<translation>Skýring</translation>
</message>
</context>
<context>
@ -66,7 +66,7 @@
<location filename="../src/common/filesystembase.cpp" line="459"/>
<location filename="../src/common/filesystembase.cpp" line="465"/>
<source>Could not move &apos;%1&apos; to &apos;%2&apos;</source>
<translation type="unfinished"/>
<translation>Gat ekki fært &apos;%1&apos; yfir í &apos;%2&apos;</translation>
</message>
<message>
<location filename="../src/common/filesystembase.cpp" line="502"/>
@ -239,7 +239,7 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="542"/>
<source>Encrypt</source>
<translation type="unfinished"/>
<translation>Dulrita</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="583"/>
@ -482,27 +482,27 @@ skráakerfið eða sameignarmöppur, gætu verið með önnur takmörk.</transla
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="131"/>
<source>%1</source>
<translation type="unfinished"/>
<translation>%1</translation>
</message>
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="179"/>
<source>More information</source>
<translation type="unfinished"/>
<translation>Nánari upplýsingar</translation>
</message>
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="180"/>
<source>Accept</source>
<translation type="unfinished"/>
<translation>Samþykkja</translation>
</message>
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="181"/>
<source>Join</source>
<translation type="unfinished"/>
<translation>Taka þátt</translation>
</message>
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="198"/>
<source>Open Browser</source>
<translation type="unfinished"/>
<translation>Opna vafra</translation>
</message>
</context>
<context>
@ -520,17 +520,17 @@ skráakerfið eða sameignarmöppur, gætu verið með önnur takmörk.</transla
<message>
<location filename="../src/gui/activitywidget.cpp" line="56"/>
<source>Accept</source>
<translation type="unfinished"/>
<translation>Samþykkja</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="182"/>
<source>Synced </source>
<translation type="unfinished"/>
<translation>Samstillt</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="217"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
<translation>Prófa aftur allar innsendingar</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="332"/>
@ -839,17 +839,17 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<message>
<location filename="../src/gui/folder.cpp" line="1080"/>
<source>Download new files?</source>
<translation type="unfinished"/>
<translation>Sækja nýjar skrár?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1083"/>
<source>Download new files</source>
<translation type="unfinished"/>
<translation>Sækja nýjar skrár</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1084"/>
<source>Keep local files</source>
<translation type="unfinished"/>
<translation>Halda skrám á tölvu</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1076"/>
@ -1005,7 +1005,7 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana.</translation>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="249"/>
<source>Synchronized with local folder</source>
<translation type="unfinished"/>
<translation>Samstillt við möppu á tölvunni</translation>
</message>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="296"/>
@ -1096,22 +1096,22 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana.</translation>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Athuga með breytingar í fjartengdri &apos;%1&apos;</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="923"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Athuga með breytingar í staðværri &apos;%1&apos;</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1000"/>
<source>↓ %1/s</source>
<translation type="unfinished"/>
<translation>↓ %1/s</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>↑ %1/s</source>
<translation type="unfinished"/>
<translation>↑ %1/s</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
@ -1291,7 +1291,7 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana.</translation>
<message>
<location filename="../src/gui/generalsettings.ui" line="41"/>
<source>Legal notice</source>
<translation type="unfinished"/>
<translation>Lagaleg atriði</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="66"/>
@ -1444,7 +1444,7 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana.</translation>
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="126"/>
<source>Remove all</source>
<translation type="unfinished"/>
<translation>Fjarlægja allt</translation>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="93"/>
@ -1499,12 +1499,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/legalnotice.ui" line="14"/>
<source>Dialog</source>
<translation type="unfinished"/>
<translation>Samskiptagluggi</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.ui" line="26"/>
<source>Legal notice</source>
<translation type="unfinished"/>
<translation>Lagaleg atriði</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.ui" line="36"/>
@ -1514,17 +1514,17 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/legalnotice.ui" line="58"/>
<source>Close</source>
<translation type="unfinished"/>
<translation>Loka</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.cpp" line="27"/>
<source>&lt;p&gt;Copyright 2017-2018 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2018 ownCloud GmbH&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;Höfundarréttur 2017-2018 Nextcloud GmbH&lt;br /&gt;Höfundarréttur 2012-2018 ownCloud GmbH&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.cpp" line="30"/>
<source>&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0 or any later version.&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;Gefið út með almenna GNU General Public License (GPL) útgáfu 2.0 eða nýrri.&lt;/p&gt;</translation>
</message>
</context>
<context>
@ -1963,22 +1963,22 @@ aðgerð til að leysa málið!&lt;/small&gt;&lt;/p&gt;</translation>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="83"/>
<source>Keep your data secure and under your control</source>
<translation type="unfinished"/>
<translation>Haltu gögnum þínum öruggum og undir þinni stjórn</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="84"/>
<source>Secure collaboration &amp; file exchange</source>
<translation type="unfinished"/>
<translation>Örugg samvinna og skráaskipti</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="85"/>
<source>Easy-to-use web mail, calendaring &amp; contacts</source>
<translation type="unfinished"/>
<translation>Einfaldur og auðveldur vefpóstur, dagatal og tengiliðir</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="86"/>
<source>Screensharing, online meetings &amp; web conferences</source>
<translation type="unfinished"/>
<translation>Skjádeiling, netfundir og vefráðstefnur</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="198"/>
@ -2603,7 +2603,7 @@ Ekki er mælt með því að hún sé notuð.
<message>
<location filename="../src/gui/sharedialog.ui" line="162"/>
<source>Icon</source>
<translation type="unfinished"/>
<translation>Táknmynd</translation>
</message>
<message>
<location filename="../src/gui/sharedialog.cpp" line="101"/>
@ -2636,22 +2636,22 @@ Ekki er mælt með því að hún sé notuð.
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="122"/>
<source>&amp;Share link</source>
<translation type="unfinished"/>
<translation>&amp;Deilitengill</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="145"/>
<source>Enable</source>
<translation type="unfinished"/>
<translation>Virkja</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="259"/>
<source>Password:</source>
<translation type="unfinished"/>
<translation>Lykilorð:</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="383"/>
<source>Expiration date:</source>
<translation type="unfinished"/>
<translation>Gildistími:</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="508"/>
@ -2666,42 +2666,42 @@ Ekki er mælt með því að hún sé notuð.
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="189"/>
<source>Allow Editing</source>
<translation type="unfinished"/>
<translation>Leyfa breytingar</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="195"/>
<source>Read only</source>
<translation type="unfinished"/>
<translation>Skrifvarið</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
<source>Allow Upload &amp;&amp; Editing</source>
<translation type="unfinished"/>
<translation>Leyfa innsendingu og breytingar</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="208"/>
<source>File Drop (Upload Only)</source>
<translation type="unfinished"/>
<translation>Slepping skráa (einungis innsending)</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="215"/>
<source>Copy link</source>
<translation type="unfinished"/>
<translation>Afrita tengil</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="228"/>
<source>Password Protect</source>
<translation type="unfinished"/>
<translation>Verja með lykilorði</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="245"/>
<source>Expiration Date</source>
<translation type="unfinished"/>
<translation>Gildir til</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="265"/>
<source>Unshare</source>
<translation type="unfinished"/>
<translation>Hætta deilingu</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
@ -2740,7 +2740,7 @@ Ekki er mælt með því að hún sé notuð.
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="248"/>
<source>Copy link</source>
<translation type="unfinished"/>
<translation>Afrita tengil</translation>
</message>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="258"/>
@ -2763,7 +2763,7 @@ Ekki er mælt með því að hún sé notuð.
<message>
<location filename="../src/gui/shareuserline.ui" line="114"/>
<source>User name</source>
<translation type="unfinished"/>
<translation>Notandanafn</translation>
</message>
<message>
<location filename="../src/gui/shareuserline.ui" line="155"/>
@ -2773,22 +2773,22 @@ Ekki er mælt með því að hún sé notuð.
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="388"/>
<source>Can reshare</source>
<translation type="unfinished"/>
<translation>Getur endurdeilt</translation>
</message>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="398"/>
<source>Can create</source>
<translation type="unfinished"/>
<translation>Getur búið til</translation>
</message>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="404"/>
<source>Can change</source>
<translation type="unfinished"/>
<translation>Getur breytt</translation>
</message>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
<source>Can delete</source>
<translation type="unfinished"/>
<translation>Getur eytt</translation>
</message>
</context>
<context>
@ -2866,18 +2866,18 @@ Ekki er mælt með því að hún sé notuð.
<message>
<location filename="../src/gui/socketapi.cpp" line="653"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
<translation>Endurdeiling þessarar skráar er ekki leyfð</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="666"/>
<location filename="../src/gui/socketapi.cpp" line="668"/>
<source>Copy public link to clipboard</source>
<translation type="unfinished"/>
<translation>Afrita opinberan tengil á klippispjald</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="722"/>
<source>Open in browser</source>
<translation type="unfinished"/>
<translation>Opna í vafra</translation>
</message>
</context>
<context>
@ -3181,12 +3181,12 @@ Ekki er mælt með því að hún sé notuð.
<message>
<location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>Permission denied.</source>
<translation type="unfinished"/>
<translation>Heimild fæst ekki.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>File or directory not found:</source>
<translation type="unfinished"/>
<translation>Skrá eða mappa fannst ekki:</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="142"/>
@ -3570,7 +3570,7 @@ Ekki er mælt með því að hún sé notuð.
<message>
<location filename="../src/gui/owncloudgui.cpp" line="841"/>
<source>Apps</source>
<translation type="unfinished"/>
<translation>Forrit</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="898"/>
@ -3580,12 +3580,12 @@ Ekki er mælt með því að hún sé notuð.
<message>
<location filename="../src/gui/owncloudgui.cpp" line="920"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Athuga með breytingar í fjartengdri &apos;%1&apos;</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="923"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Athuga með breytingar í staðværri &apos;%1&apos;</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="938"/>
@ -3755,17 +3755,17 @@ Ekki er mælt með því að hún sé notuð.
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/>
<source>&lt;a href=&quot;https://docs.nextcloud.com/server/13/admin_manual/installation/index.html#installation&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Host your own server&lt;/span&gt;&lt;/a&gt;</source>
<translation type="unfinished"/>
<translation>&lt;a href=&quot;https://docs.nextcloud.com/server/13/admin_manual/installation/index.html#installation&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Hýstu þinn eigin þjón&lt;/span&gt;&lt;/a&gt;</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="143"/>
<source>Register with a provider</source>
<translation type="unfinished"/>
<translation>Skráðu þig hjá þjónustu</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="165"/>
<source>Log in</source>
<translation type="unfinished"/>
<translation>Skrá inn</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="241"/>
@ -3822,22 +3822,22 @@ Ekki er mælt með því að hún sé notuð.
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="437"/>
<source>%n day ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>fyrir %n degi síðan</numerusform><numerusform>fyrir %n dögum síðan</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="439"/>
<source>%n days ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>fyrir %n degi síðan</numerusform><numerusform>fyrir %n dögum síðan</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="449"/>
<source>%n hour ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>fyrir %n klukkustund síðan</numerusform><numerusform>fyrir %n klukkustundum síðan</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="451"/>
<source>%n hours ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>fyrir %n klukkustund síðan</numerusform><numerusform>fyrir %n klukkustundum síðan</numerusform></translation>
</message>
<message>
<location filename="../src/common/utility.cpp" line="458"/>
@ -3852,12 +3852,12 @@ Ekki er mælt með því að hún sé notuð.
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="464"/>
<source>%n minute ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>fyrir %n mínútu síðan</numerusform><numerusform>fyrir %n mínútum síðan</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="466"/>
<source>%n minutes ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>fyrir %n mínútu síðan</numerusform><numerusform>fyrir %n mínútum síðan</numerusform></translation>
</message>
<message>
<location filename="../src/common/utility.cpp" line="470"/>
@ -3976,7 +3976,8 @@ borð við &apos;trayer&apos; og reyna síðan aftur.</translation>
<message>
<location filename="../src/libsync/theme.cpp" line="320"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;&lt;small&gt;Byggt með Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; á %3, %4 með Qt %5,
%6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
</context>
<context>

2
translations/client_ja.ts
View file

@ -481,7 +481,7 @@
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="179"/>
<source>More information</source>
<translation type="unfinished"/>
<translation>詳細情報</translation>
</message>
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="180"/>

97
translations/client_ru.ts
View file

@ -153,7 +153,7 @@
<message>
<location filename="../src/gui/accountmanager.cpp" line="343"/>
<source>To protect your Cryptocraphic Identity, we encrypt it with a mnemonic of 12 dictionary words.Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
<translation>Для защиты личного идентификатора сквозного шифрования используется мнемофраза, состоящая из двенадцати слов. Мнемофразу следует записать и сохранить запись в надёжном месте, она потребуется для подключения к учётной записи ваших дополнительных устройств.</translation>
</message>
</context>
<context>
@ -524,7 +524,7 @@
<message>
<location filename="../src/gui/activitywidget.cpp" line="217"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
<translation>Повторить передачу файлов на сервер</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="332"/>
@ -678,7 +678,7 @@
<message>
<location filename="../src/libsync/discoveryphase.cpp" line="392"/>
<source>The server file discovery reply is missing data.</source>
<translation type="unfinished"/>
<translation>Сервер вернул ответ, не содержащих данных о файле.</translation>
</message>
</context>
<context>
@ -804,12 +804,12 @@
<message>
<location filename="../src/gui/folder.cpp" line="1012"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Папка «%1» создана, но она ранее была исключена из синхронизации. Данные внутри этой папки не будут синхронизированы.</translation>
<translation>Создана папка «%1» создана, но ранее она была исключена из синхронизации. Данные внутри этой папки не будут синхронизированы.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1015"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Файл «%1» создан, но она ранее был исключён из синхронизации. Этот файл не будет синхронизирован.</translation>
<translation>Создан файл «%1», но ранее он был исключён из синхронизации. Этот файл не будет синхронизирован.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1026"/>
@ -818,7 +818,10 @@
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
%1</source>
<translation type="unfinished"/>
<translation>Невозможно надёжным способом отслеживать изменения в синхронизируемых папках.
Это означает, что приложение для синхронизации не может выполнять синхронизацию локальных изменений с сервером немедленно. Вместо этого будет выполняться периодическое (по умолчанию каждые два часа) сканирование локальных папок и синхронизация обнаруженных изменений с сервером.
%1</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1071"/>
@ -1508,7 +1511,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/legalnotice.ui" line="36"/>
<source>TextLabel</source>
<translation type="unfinished"/>
<translation>TextLabel</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.ui" line="58"/>
@ -1518,12 +1521,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/legalnotice.cpp" line="27"/>
<source>&lt;p&gt;Copyright 2017-2018 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2018 ownCloud GmbH&lt;/p&gt;</source>
<translation>&lt;p&gt;Copyright 2017-2018 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2018 ownCloud GmbH&lt;/p&gt;</translation>
<translation>&lt;p&gt;© Nextcloud GmbH, 2017-2018 &lt;br /&gt;© ownCloud GmbH, 2012-2018&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.cpp" line="30"/>
<source>&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0 or any later version.&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;Лицензируется в соответствии со Стандартной Общественной Лицензией GNU (GPL) версии 2.0 или любой более поздней версией.&lt;/p&gt;</translation>
</message>
</context>
<context>
@ -1795,7 +1798,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
<source>Downloading version %1. Please wait...</source>
<translation>Загрузка версии %1. Пожалуйста, подождите...</translation>
<translation>Дождитесь окончания загрузки версии %1…</translation>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="147"/>
@ -1868,7 +1871,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="164"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Внимание:&lt;/strong&gt; Локальная папка не пуста. Выберите действие!&lt;/small&gt;&lt;/p&gt;</translation>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Предупреждение:&lt;/strong&gt; Локальная папка не пуста, требуется выбор действия:&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
@ -1902,7 +1905,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="62"/>
<source>Retry unencrypted over HTTP (insecure)</source>
<translation>Попробовать без шифрования через HTTP (не безопасно)</translation>
<translation>Попробовать без шифрования по протоколу HTTP (небезопасно)</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="69"/>
@ -1943,7 +1946,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="44"/>
<source>Login in your browser</source>
<translation>Вход в ваш браузер</translation>
<translation>Выполнить вход в браузере</translation>
</message>
</context>
<context>
@ -1976,7 +1979,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="86"/>
<source>Screensharing, online meetings &amp; web conferences</source>
<translation>Публикация экрана, онлайн общение и веб-конференции</translation>
<translation>Доступ к изображению на экране, онлайн общение и веб-конференции</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="198"/>
@ -2161,7 +2164,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/>
<source>Skip folders configuration</source>
<translation>Пропустить настройку каталогов</translation>
<translation>Пропустить настройку папок</translation>
</message>
</context>
<context>
@ -2187,7 +2190,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="140"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Не правильный JSON ответ на сформированный URL</translation>
<translation>С опрашиваемого адреса получен неверный ответ в формате JSON</translation>
</message>
</context>
<context>
@ -2274,7 +2277,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="185"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Внимание, возможен конфликт чувствительности к регистру с %1</translation>
<translation>Внимание, возможен конфликт чувствительности к регистру имён с «%1»</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="191"/>
@ -2324,7 +2327,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/propagateremotedelete.cpp" line="130"/>
<source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
<translation>Сервер ответил не правильным HTTP кодом. Ожидался 204, но получен &quot;%1 %2&quot;.</translation>
<translation>Сервер ответил неправильным кодом HTTP. Ожидался 204, но получен «%1 %2».</translation>
</message>
</context>
<context>
@ -2332,7 +2335,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/propagateremotemkdir.cpp" line="99"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Сервер ответил не правильным HTTP кодом. Ожидался 201, но получен &quot;%1 %2&quot;.</translation>
<translation>Сервер ответил неправильным кодом HTTP . Ожидался 201, но получен «%1 %2».</translation>
</message>
<message>
<location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
@ -2345,7 +2348,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/propagateremotemove.cpp" line="134"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Сервер ответил не правильным HTTP кодом. Ожидался 201, но получен &quot;%1 %2&quot;.</translation>
<translation>Сервер ответил неправильным кодом HTTP. Ожидался 201, но получен «%1 %2».</translation>
</message>
<message>
<location filename="../src/libsync/propagateremotemove.cpp" line="166"/>
@ -2359,7 +2362,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="214"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>Невозможно загрузить файл «%1», так как уже существует файл с тем же именем, но отличающимся только регистром символов</translation>
<translation>Невозможно загрузить файл «%1», так как уже существует файл с тем же именем, но отличающимся регистром символов</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="348"/>
@ -2369,13 +2372,13 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="362"/>
<source>Local file changed during sync.</source>
<translation>Локальный файл изменился в процессе синхронизации.</translation>
<translation>Локальный файл был изменён во время синхронизации.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="225"/>
<location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>Закачка %1 превышает квоту для каталога</translation>
<translation>Передача «%1» на сервер превысит заданную для папки квоту</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="334"/>
@ -2490,7 +2493,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/selectivesyncdialog.cpp" line="79"/>
<source>Deselect remote folders you do not wish to synchronize.</source>
<translation>Снимите выбор с удалённых папок, котрые вы не хотите синхронизировать.</translation>
<translation>Снимите отметки с папок, которые не нужно синхронизировать.</translation>
</message>
<message>
<location filename="../src/gui/selectivesyncdialog.cpp" line="95"/>
@ -2506,12 +2509,12 @@ It is not advisable to use it.</source>
<location filename="../src/gui/selectivesyncdialog.cpp" line="227"/>
<location filename="../src/gui/selectivesyncdialog.cpp" line="277"/>
<source>No subfolders currently on the server.</source>
<translation>Нет подкаталогов на сервере на данный момент.</translation>
<translation>Сейчас на сервере нет вложенных папок.</translation>
</message>
<message>
<location filename="../src/gui/selectivesyncdialog.cpp" line="279"/>
<source>An error occurred while loading the list of sub folders.</source>
<translation>Произошла ошибка во время загрузки списка подпапок.</translation>
<translation>Ошибка получения списка вложенных папок.</translation>
</message>
</context>
<context>
@ -2519,7 +2522,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/servernotificationhandler.cpp" line="150"/>
<source>Dismiss</source>
<translation>Убрать</translation>
<translation>Отклонить</translation>
</message>
</context>
<context>
@ -2527,7 +2530,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/settingsdialog.ui" line="14"/>
<source>Settings</source>
<translation>Настройки</translation>
<translation>Параметры</translation>
</message>
<message>
<location filename="../src/gui/settingsdialog.cpp" line="204"/>
@ -2547,7 +2550,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/settingsdialog.cpp" line="227"/>
<source>Account</source>
<translation>Уч.запись</translation>
<translation>Учётная запись</translation>
</message>
</context>
<context>
@ -2576,7 +2579,7 @@ It is not advisable to use it.</source>
<location filename="../src/gui/settingsdialogmac.cpp" line="138"/>
<location filename="../src/gui/settingsdialogmac.cpp" line="231"/>
<source>Account</source>
<translation>Уч.запись</translation>
<translation>Учётная запись</translation>
</message>
</context>
<context>
@ -2594,7 +2597,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/sharedialog.ui" line="91"/>
<source>ownCloud Path:</source>
<translation>Путь к OwnCloud:</translation>
<translation>Путь ownCloud:</translation>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="162"/>
@ -2604,7 +2607,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/sharedialog.cpp" line="101"/>
<source>%1 Sharing</source>
<translation>Вы поделились %1 </translation>
<translation>Предоставление общего доступа к «%1»</translation>
</message>
<message>
<location filename="../src/gui/sharedialog.cpp" line="77"/>
@ -2614,12 +2617,12 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/sharedialog.cpp" line="98"/>
<source>Folder: %2</source>
<translation>Папка: %2</translation>
<translation>Папка: «%2»</translation>
</message>
<message>
<location filename="../src/gui/sharedialog.cpp" line="191"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Невозможно предоставить общий доступ к файлу: нет разрешения на предоставление общего доступа.</translation>
<translation>Невозможно предоставить общий доступ: отсутствуют разрешения на предоставление общего доступа.</translation>
</message>
</context>
<context>
@ -2632,12 +2635,12 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="122"/>
<source>&amp;Share link</source>
<translation type="unfinished"/>
<translation>П&amp;редоставить доступ по ссылке</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="145"/>
<source>Enable</source>
<translation>Включить</translation>
<translation>Использовать </translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="259"/>
@ -2647,7 +2650,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="383"/>
<source>Expiration date:</source>
<translation>Дата истечения:</translation>
<translation>Срок действия:</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="508"/>
@ -2833,7 +2836,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/socketapi.cpp" line="491"/>
<source>Context menu share</source>
<translation type="unfinished"/>
<translation>Контекстное меню предоставления общего доступа</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="612"/>
@ -2939,7 +2942,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/sslbutton.cpp" line="107"/>
<source>&lt;h3&gt;Fingerprints&lt;/h3&gt;</source>
<translation>&lt;h3&gt;Отпечаток&lt;/ h3&gt;</translation>
<translation>&lt;h3&gt;Отпечатки&lt;/h3&gt;</translation>
</message>
<message>
<location filename="../src/gui/sslbutton.cpp" line="111"/>
@ -3170,7 +3173,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>Discovery step failed.</source>
<translation type="unfinished"/>
<translation>Ошибка на этапе поиска.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="136"/>
@ -3361,7 +3364,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/theme.cpp" line="341"/>
<source>&lt;p&gt;This release was supplied by the Nextcloud GmbH&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;Этот выпуск подготовлен Nextcloud GmbH&lt;/p&gt;</translation>
</message>
</context>
<context>
@ -3369,7 +3372,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/creds/webflowcredentials.cpp" line="122"/>
<source>You have been logged out of %1 as user %2. Please login again</source>
<translation type="unfinished"/>
<translation>Выполнен выход пользователя %2 из системы %1. Войдите заново</translation>
</message>
<message>
<location filename="../src/gui/creds/webflowcredentials.cpp" line="139"/>
@ -3382,7 +3385,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="302"/>
<source>Please sign in</source>
<translation>Пожалуйста войдите в систему</translation>
<translation>Войдите в систему</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="348"/>
@ -3392,7 +3395,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="366"/>
<source>There are no sync folders configured.</source>
<translation>Нет настроенных каталогов для синхронизации</translation>
<translation>Синхронизация папок не настроена.</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="375"/>
@ -3508,7 +3511,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="356"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
<translation>Неразрешённые конфликты</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="363"/>
@ -3749,7 +3752,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/>
<source>&lt;a href=&quot;https://docs.nextcloud.com/server/13/admin_manual/installation/index.html#installation&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Host your own server&lt;/span&gt;&lt;/a&gt;</source>
<translation type="unfinished"/>
<translation>&lt;a href=&quot;https://docs.nextcloud.com/server/13/admin_manual/installation/index.html#installation&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Развернуть собственный сервер&lt;/span&gt;&lt;/a&gt;</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="143"/>
@ -3764,7 +3767,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="241"/>
<source>SlideshowLabel</source>
<translation type="unfinished"/>
<translation>SlideshowLabel</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="316"/>

154
translations/client_sk.ts
View file

@ -34,12 +34,12 @@
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="186"/>
<source>Sync paused</source>
<translation type="unfinished"/>
<translation>Synchronizácia je pozastavená</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="189"/>
<source>Syncing</source>
<translation type="unfinished"/>
<translation>Synchronizuje sa</translation>
</message>
</context>
<context>
@ -52,7 +52,7 @@
<message>
<location filename="../src/gui/mnemonicdialog.ui" line="58"/>
<source>Label</source>
<translation type="unfinished"/>
<translation>Štítok</translation>
</message>
</context>
<context>
@ -60,18 +60,18 @@
<message>
<location filename="../src/common/filesystembase.cpp" line="445"/>
<source>Could not make directories in trash</source>
<translation type="unfinished"/>
<translation>Nie je možné vytvárať adresáre v koši</translation>
</message>
<message>
<location filename="../src/common/filesystembase.cpp" line="459"/>
<location filename="../src/common/filesystembase.cpp" line="465"/>
<source>Could not move &apos;%1&apos; to &apos;%2&apos;</source>
<translation type="unfinished"/>
<translation>Nie je možne presunúť &apos;%1&apos; do &apos;%2&apos;</translation>
</message>
<message>
<location filename="../src/common/filesystembase.cpp" line="502"/>
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
<translation>Presuúvanie do koša nie je na tejto platforme k dispozícii</translation>
</message>
</context>
<context>
@ -148,7 +148,7 @@
<message>
<location filename="../src/gui/accountmanager.cpp" line="342"/>
<source>End to end encryption mnemonic</source>
<translation type="unfinished"/>
<translation>End-to-end kódovanie mnemotechnické</translation>
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="343"/>
@ -238,7 +238,7 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="542"/>
<source>Encrypt</source>
<translation type="unfinished"/>
<translation>Zašifrovať</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="583"/>
@ -476,27 +476,27 @@
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="131"/>
<source>%1</source>
<translation type="unfinished"/>
<translation>%1</translation>
</message>
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="179"/>
<source>More information</source>
<translation type="unfinished"/>
<translation>Viac informácií</translation>
</message>
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="180"/>
<source>Accept</source>
<translation type="unfinished"/>
<translation>Prijať</translation>
</message>
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="181"/>
<source>Join</source>
<translation type="unfinished"/>
<translation>Pripojiť</translation>
</message>
<message>
<location filename="../src/gui/activityitemdelegate.cpp" line="198"/>
<source>Open Browser</source>
<translation type="unfinished"/>
<translation>Otvoriť prehliadač</translation>
</message>
</context>
<context>
@ -514,17 +514,17 @@
<message>
<location filename="../src/gui/activitywidget.cpp" line="56"/>
<source>Accept</source>
<translation type="unfinished"/>
<translation>Prijať</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="182"/>
<source>Synced </source>
<translation type="unfinished"/>
<translation>Zosynchronizované</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="217"/>
<source>Retry all uploads</source>
<translation type="unfinished"/>
<translation>Zopakovať všetky nahrávania</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="332"/>
@ -629,7 +629,7 @@
<message>
<location filename="../src/libsync/clientsideencryption.cpp" line="1000"/>
<source>Enter E2E passphrase</source>
<translation type="unfinished"/>
<translation>Zadajte E2E prístupovú frázu</translation>
</message>
</context>
<context>
@ -831,24 +831,26 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<message>
<location filename="../src/gui/folder.cpp" line="1080"/>
<source>Download new files?</source>
<translation type="unfinished"/>
<translation>Stiahnuť nové súbory?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1083"/>
<source>Download new files</source>
<translation type="unfinished"/>
<translation>Stiahnuť nové súbory</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1084"/>
<source>Keep local files</source>
<translation type="unfinished"/>
<translation>Ponechať lokálne súbory</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1076"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
<translation type="unfinished"/>
<translation>Všetky súbory vo vašej lokálnej synchronizovanom priečinku &apos;%1&apos; boli vymazané. Tieto súbory budú vymazané aj na serveri a teda už viac nebudú dostupné až kým ich neobnovíte.
Ste si istí, že chcete tieto akcie synchronizovať so serverom?
Ak to bol omyl a chcete si tieto súbory ponechať, budú opäť synchronizované zo servera.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1101"/>
@ -918,7 +920,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/folderman.cpp" line="1220"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
<translation>Synchronizácia bola úspešná s nevyriešenými konfliktmi.</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1222"/>
@ -928,7 +930,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/folderman.cpp" line="1312"/>
<source>The local folder %1 contains a symbolic link. The link target contains an already synced folder. Please pick another one!</source>
<translation type="unfinished"/>
<translation>Lokálny priečinok %1 obsahuje symbolický odkaz. Tento odkazuje na už zosynchronizovaný priečinok. Vyberte prosím niektorý iný.</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1228"/>
@ -1282,7 +1284,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/generalsettings.ui" line="41"/>
<source>Legal notice</source>
<translation type="unfinished"/>
<translation>Právne upozornenie</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="66"/>
@ -1292,12 +1294,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/generalsettings.ui" line="72"/>
<source>For System Tray</source>
<translation type="unfinished"/>
<translation>Pre oznamovaciu oblasť systémového panela</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="89"/>
<source>Show Server &amp;Notifications</source>
<translation type="unfinished"/>
<translation>Zobraziť &amp;hlásenia zo servera</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="163"/>
@ -1307,7 +1309,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/generalsettings.ui" line="195"/>
<source>Ask for confirmation before synchronizing folders larger than</source>
<translation type="unfinished"/>
<translation>Požiadať o potvrdenie pred synchronizáciou zložiek väčších než</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="215"/>
@ -1318,7 +1320,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/generalsettings.ui" line="239"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation type="unfinished"/>
<translation>Požiadajte o potvrdenie pred synchronizáciou externých úložísk</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="82"/>
@ -1343,7 +1345,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/generalsettings.ui" line="267"/>
<source>S&amp;how crash reporter</source>
<translation type="unfinished"/>
<translation>Z&amp;obraziť hlásenia o pádoch</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="20"/>
@ -1364,7 +1366,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/generalsettings.cpp" line="49"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
<translation>Zobrazovať hlásenie, ktoré vyžadujú pozornosť.</translation>
</message>
</context>
<context>
@ -1372,14 +1374,16 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/socketapi.cpp" line="520"/>
<source>Sharing error</source>
<translation type="unfinished"/>
<translation>Chyba sprístupnenia</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="521"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
<translation type="unfinished"/>
<translation>Nie je možné získať alebo vytvoriť verejný odkaz pre sprístupnenie. Chyba:
%1</translation>
</message>
</context>
<context>
@ -1387,12 +1391,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/creds/httpcredentialsgui.cpp" line="100"/>
<source>Please enter %1 password:&lt;br&gt;&lt;br&gt;User: %2&lt;br&gt;Account: %3&lt;br&gt;</source>
<translation type="unfinished"/>
<translation>Zadajte prosím heslo %1:&lt;br&gt;&lt;br&gt;Používateľ: %2&lt;br&gt;Účet: %3&lt;br&gt;</translation>
</message>
<message>
<location filename="../src/gui/creds/httpcredentialsgui.cpp" line="114"/>
<source>Reading from keychain failed with error: &apos;%1&apos;</source>
<translation type="unfinished"/>
<translation>Čítanie z kľúčenky sa nepodarilo s chybou: &apos;%1&apos;</translation>
</message>
<message>
<location filename="../src/gui/creds/httpcredentialsgui.cpp" line="120"/>
@ -1402,7 +1406,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/creds/httpcredentialsgui.cpp" line="156"/>
<source>&lt;a href=&quot;%1&quot;&gt;Click here&lt;/a&gt; to request an app password from the web interface.</source>
<translation type="unfinished"/>
<translation>&lt;a href=&quot;%1&quot;&gt;Kliknite sem&lt;/a&gt; pre vyžiadanie hesla aplikácie z webového rozhrania.</translation>
</message>
</context>
<context>
@ -1415,7 +1419,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="20"/>
<source>Global Ignore Settings</source>
<translation type="unfinished"/>
<translation>Globálne nastavenia pre ignorovanie</translation>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="26"/>
@ -1425,7 +1429,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="36"/>
<source>Files Ignored by Patterns</source>
<translation type="unfinished"/>
<translation>Ignorovať súbory podľa masky</translation>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="119"/>
@ -1435,7 +1439,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="126"/>
<source>Remove all</source>
<translation type="unfinished"/>
<translation>Odstrániť všetko</translation>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="93"/>
@ -1457,7 +1461,9 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
<translation>Súbory alebo priečinky vyhovujúce maske nebudu synchronizované.
Položky u ktorých je povolené mazanie sa vymažú ak by bránili odstráneniu priečinka. Toto je užitočne napr. pre matadáta.</translation>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
@ -1490,12 +1496,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/legalnotice.ui" line="14"/>
<source>Dialog</source>
<translation type="unfinished"/>
<translation>Dialóg</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.ui" line="26"/>
<source>Legal notice</source>
<translation type="unfinished"/>
<translation>Právne upozornenie</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.ui" line="36"/>
@ -1505,7 +1511,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/legalnotice.ui" line="58"/>
<source>Close</source>
<translation type="unfinished"/>
<translation>Zatvoriť</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.cpp" line="27"/>
@ -1742,7 +1748,7 @@ Logs will be written to %1</source>
<message>
<location filename="../src/gui/creds/oauth.cpp" line="112"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation type="unfinished"/>
<translation>Chyba vrátená zo servera: &lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
<location filename="../src/gui/creds/oauth.cpp" line="115"/>
@ -1935,7 +1941,7 @@ môžu byť vyžadované dodatočné oprávnenia.</translation>
<message>
<location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="44"/>
<source>Login in your browser</source>
<translation type="unfinished"/>
<translation>Prihlásenie sa v prehliadači</translation>
</message>
</context>
<context>
@ -1953,22 +1959,22 @@ môžu byť vyžadované dodatočné oprávnenia.</translation>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="83"/>
<source>Keep your data secure and under your control</source>
<translation type="unfinished"/>
<translation>Majte svoje dáta pod vlastnou kontrolou a zabezpečené</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="84"/>
<source>Secure collaboration &amp; file exchange</source>
<translation type="unfinished"/>
<translation>Bezpečná spolupráca a výmena súborov</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="85"/>
<source>Easy-to-use web mail, calendaring &amp; contacts</source>
<translation type="unfinished"/>
<translation>Ľahko použiteľné webové rozhranie pre poštu, kalendár a kontakty</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="86"/>
<source>Screensharing, online meetings &amp; web conferences</source>
<translation type="unfinished"/>
<translation>Zdieľanie obrazovky, on-line schôdze a webové konferencie</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="198"/>
@ -1990,7 +1996,7 @@ Nie je vhodné ju používať.</translation>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="414"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation type="unfinished"/>
<translation>Nie je možné načítať certifikát. Možno zlé heslo?</translation>
</message>
</context>
<context>
@ -2634,12 +2640,12 @@ Nie je vhodné ju používať.</translation>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="259"/>
<source>Password:</source>
<translation type="unfinished"/>
<translation>Heslo:</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="383"/>
<source>Expiration date:</source>
<translation type="unfinished"/>
<translation>Dátum vypršania:</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="508"/>
@ -2654,47 +2660,47 @@ Nie je vhodné ju používať.</translation>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="189"/>
<source>Allow Editing</source>
<translation type="unfinished"/>
<translation>Umožniť úpravy</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="195"/>
<source>Read only</source>
<translation type="unfinished"/>
<translation>Len na čítanie</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
<source>Allow Upload &amp;&amp; Editing</source>
<translation type="unfinished"/>
<translation>Umožniť nahrávanie a úpravy</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="208"/>
<source>File Drop (Upload Only)</source>
<translation type="unfinished"/>
<translation>Odovzdávanie súborov (len nahrávanie)</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="215"/>
<source>Copy link</source>
<translation type="unfinished"/>
<translation>Kopírovať odkaz</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="228"/>
<source>Password Protect</source>
<translation type="unfinished"/>
<translation>Chániť heslom</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="245"/>
<source>Expiration Date</source>
<translation type="unfinished"/>
<translation>Dátum vypršania:</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="265"/>
<source>Unshare</source>
<translation type="unfinished"/>
<translation>Zneprístupniť</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Confirm Link Share Deletion</source>
<translation type="unfinished"/>
<translation>Potvrdzovať rušenie sprístupnenia</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="448"/>
@ -2727,7 +2733,7 @@ Nie je vhodné ju používať.</translation>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="248"/>
<source>Copy link</source>
<translation type="unfinished"/>
<translation>Kopírovať odkaz</translation>
</message>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="258"/>
@ -2737,7 +2743,7 @@ Nie je vhodné ju používať.</translation>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="357"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
<translation>Niečo som vám sprístupnil</translation>
</message>
</context>
<context>
@ -2750,7 +2756,7 @@ Nie je vhodné ju používať.</translation>
<message>
<location filename="../src/gui/shareuserline.ui" line="114"/>
<source>User name</source>
<translation type="unfinished"/>
<translation>Meno používateľa</translation>
</message>
<message>
<location filename="../src/gui/shareuserline.ui" line="155"/>
@ -2760,22 +2766,22 @@ Nie je vhodné ju používať.</translation>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="388"/>
<source>Can reshare</source>
<translation type="unfinished"/>
<translation>Môže sprístupniť aj iným</translation>
</message>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="398"/>
<source>Can create</source>
<translation type="unfinished"/>
<translation>Môže vytvárať</translation>
</message>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="404"/>
<source>Can change</source>
<translation type="unfinished"/>
<translation>Môže meniť</translation>
</message>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="410"/>
<source>Can delete</source>
<translation type="unfinished"/>
<translation>Môže odstraňovať</translation>
</message>
</context>
<context>
@ -2852,18 +2858,18 @@ Nie je vhodné ju používať.</translation>
<message>
<location filename="../src/gui/socketapi.cpp" line="653"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
<translation>Opätovné sprístupňovanie tohto súboru je zakázané</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="666"/>
<location filename="../src/gui/socketapi.cpp" line="668"/>
<source>Copy public link to clipboard</source>
<translation type="unfinished"/>
<translation>Skopírovať verejný odkaz do schránky</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="722"/>
<source>Open in browser</source>
<translation type="unfinished"/>
<translation>Otvoriť v prehliadači</translation>
</message>
</context>
<context>
@ -3081,7 +3087,7 @@ Nie je vhodné ju používať.</translation>
<message>
<location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
<translation>Pripojený priečinok je na serveri dočasne nedostupný</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="163"/>
@ -3101,7 +3107,7 @@ Nie je vhodné ju používať.</translation>
<message>
<location filename="../src/libsync/syncengine.cpp" line="514"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation type="unfinished"/>
<translation>Súbor/priečinok je ignorovaný, pretože je skrytý</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="517"/>
@ -3111,13 +3117,13 @@ Nie je vhodné ju používať.</translation>
<message>
<location filename="../src/libsync/syncengine.cpp" line="533"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
<translation>Konflikt: Prevzatá verzia zo servera, lokálna kópia premenovaná a neodovzdaná.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="799"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
<translation>Je dostupných len %1, pre spustenie je potrebných aspoň %2</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="834"/>