From aa85e875bd2aa3d80c61e371f7a52e2c915420fe Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 11 Aug 2014 15:09:17 +0200 Subject: [PATCH 01/94] Selective sync: Add UI to select paths --- src/CMakeLists.txt | 1 + src/mirall/accountsettings.cpp | 18 ++ src/mirall/accountsettings.h | 1 + src/mirall/accountsettings.ui | 7 + src/mirall/folder.h | 5 + src/mirall/folderman.cpp | 10 +- src/mirall/folderman.h | 7 +- src/mirall/logger.cpp | 2 +- src/mirall/selectivesyncdialog.cpp | 256 +++++++++++++++++++++++++++++ src/mirall/selectivesyncdialog.h | 47 ++++++ 10 files changed, 346 insertions(+), 8 deletions(-) create mode 100644 src/mirall/selectivesyncdialog.cpp create mode 100644 src/mirall/selectivesyncdialog.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ec15a250a6..9d4e66bcf4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -267,6 +267,7 @@ set(mirall_SRCS mirall/socketapi.cpp mirall/sslbutton.cpp mirall/syncrunfilelog.cpp + mirall/selectivesyncdialog.cpp ) diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp index 6259d44936..4db0c2887a 100644 --- a/src/mirall/accountsettings.cpp +++ b/src/mirall/accountsettings.cpp @@ -26,6 +26,7 @@ #include "mirall/ignorelisteditor.h" #include "mirall/account.h" #include "mirall/quotainfo.h" +#include "selectivesyncdialog.h" #include "creds/abstractcredentials.h" #include @@ -77,6 +78,7 @@ AccountSettings::AccountSettings(QWidget *parent) : ui->_buttonRemove->setEnabled(false); ui->_buttonEnable->setEnabled(false); + ui->_buttonSelectiveSync->setEnabled(false); ui->_buttonAdd->setEnabled(true); QAction *resetFolderAction = new QAction(this); @@ -92,6 +94,7 @@ AccountSettings::AccountSettings(QWidget *parent) : connect(ui->_buttonRemove, SIGNAL(clicked()), this, SLOT(slotRemoveCurrentFolder())); connect(ui->_buttonEnable, SIGNAL(clicked()), this, SLOT(slotEnableCurrentFolder())); connect(ui->_buttonAdd, SIGNAL(clicked()), this, SLOT(slotAddFolder())); + connect(ui->_buttonSelectiveSync, SIGNAL(clicked()), this, SLOT(slotSelectiveSync())); connect(ui->modifyAccountButton, SIGNAL(clicked()), SLOT(slotOpenAccountWizard())); connect(ui->ignoredFilesButton, SIGNAL(clicked()), SLOT(slotIgnoreFilesEditor()));; @@ -152,6 +155,7 @@ void AccountSettings::slotFolderActivated( const QModelIndex& indx ) } ui->_buttonAdd->setEnabled(_account && _account->state() == Account::Connected); ui->_buttonEnable->setEnabled( isValid ); + ui->_buttonSelectiveSync->setEnabled( isValid ); if ( isValid ) { bool folderEnabled = _model->data( indx, FolderStatusDelegate::FolderSyncEnabled).toBool(); @@ -369,6 +373,20 @@ void AccountSettings::slotResetCurrentFolder() } } +void AccountSettings::slotSelectiveSync() +{ + QModelIndex selected = ui->_folderList->selectionModel()->currentIndex(); + if( selected.isValid() ) { + QString alias = _model->data( selected, FolderStatusDelegate::FolderAliasRole ).toString(); + FolderMan *folderMan = FolderMan::instance(); + Folder *f = folderMan->folder(alias); + if (f) { + (new SelectiveSyncDialog(f, this))->show(); + } + } + +} + void AccountSettings::slotDoubleClicked( const QModelIndex& indx ) { if( ! indx.isValid() ) return; diff --git a/src/mirall/accountsettings.h b/src/mirall/accountsettings.h index 4e64ea25e6..53c6ad8d51 100644 --- a/src/mirall/accountsettings.h +++ b/src/mirall/accountsettings.h @@ -81,6 +81,7 @@ protected slots: void slotFolderWizardRejected(); void slotOpenAccountWizard(); void slotHideProgress(); + void slotSelectiveSync(); private: QString shortenFilename( const QString& folder, const QString& file ) const; diff --git a/src/mirall/accountsettings.ui b/src/mirall/accountsettings.ui index 133dfaab0a..e62916ddd5 100644 --- a/src/mirall/accountsettings.ui +++ b/src/mirall/accountsettings.ui @@ -70,6 +70,13 @@ + + + + Selective Sync... + + + diff --git a/src/mirall/folder.h b/src/mirall/folder.h index 8a9d554112..52304c8818 100644 --- a/src/mirall/folder.h +++ b/src/mirall/folder.h @@ -121,6 +121,10 @@ public: SyncJournalDb *journalDb() { return &_journal; } CSYNC *csyncContext() { return _csync_ctx; } + QStringList selectiveSyncList() { return _selectiveSyncWhiteList; } + void setSelectiveSyncList(const QStringList &whiteList) + { _selectiveSyncWhiteList = whiteList; } + signals: void syncStateChange(); @@ -188,6 +192,7 @@ private: SyncResult _syncResult; QScopedPointer _engine; QStringList _errors; + QStringList _selectiveSyncWhiteList; bool _csyncError; bool _csyncUnavail; bool _wipeDb; diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp index 5729c4d35a..554ea34b44 100644 --- a/src/mirall/folderman.cpp +++ b/src/mirall/folderman.cpp @@ -234,7 +234,7 @@ void FolderMan::terminateCurrentSync() #define PAR_O_TAG QLatin1String("__PAR_OPEN__") #define PAR_C_TAG QLatin1String("__PAR_CLOSE__") -QString FolderMan::escapeAlias( const QString& alias ) const +QString FolderMan::escapeAlias( const QString& alias ) { QString a(alias); @@ -312,6 +312,7 @@ Folder* FolderMan::setupFolderFromConfigFile(const QString &file) { QString backend = settings.value(QLatin1String("backend")).toString(); QString targetPath = settings.value( QLatin1String("targetPath")).toString(); bool paused = settings.value( QLatin1String("paused"), false).toBool(); + QStringList whiteList = settings.value( QLatin1String("whiteList")).toStringList(); // QString connection = settings.value( QLatin1String("connection") ).toString(); QString alias = unescapeAlias( escapedAlias ); @@ -326,7 +327,8 @@ Folder* FolderMan::setupFolderFromConfigFile(const QString &file) { } folder = new Folder( alias, path, targetPath, this ); - folder->setConfigFile(file); + folder->setConfigFile(cfgFile.absoluteFilePath()); + folder->setSelectiveSyncList(whiteList); qDebug() << "Adding folder to Folder Map " << folder; _folderMap[alias] = folder; if (paused) { @@ -359,7 +361,7 @@ void FolderMan::slotEnableFolder( const QString& alias, bool enable ) slotScheduleSync(alias); // FIXME: Use MirallConfigFile - QSettings settings(_folderConfigPath + QLatin1Char('/') + f->configFile(), QSettings::IniFormat); + QSettings settings(f->configFile(), QSettings::IniFormat); settings.beginGroup(escapeAlias(f->alias())); if (enable) { settings.remove("paused"); @@ -588,7 +590,7 @@ void FolderMan::removeFolder( const QString& alias ) f->setSyncEnabled(false); // remove the folder configuration - QFile file( _folderConfigPath + QLatin1Char('/') + f->configFile() ); + QFile file(f->configFile() ); if( file.exists() ) { qDebug() << "Remove folder config file " << file.fileName(); file.remove(); diff --git a/src/mirall/folderman.h b/src/mirall/folderman.h index c3a8d0012d..abfaf12534 100644 --- a/src/mirall/folderman.h +++ b/src/mirall/folderman.h @@ -84,6 +84,10 @@ public: void removeMonitorPath( const QString& alias, const QString& path ); void addMonitorPath( const QString& alias, const QString& path ); + // Escaping of the alias which is used in QSettings AND the file + // system, thus need to be escaped. + static QString escapeAlias( const QString& ); + signals: /** * signal to indicate a folder named by alias has changed its sync state. @@ -131,9 +135,6 @@ private: QString getBackupName( const QString& ) const; void registerFolderMonitor( Folder *folder ); - // Escaping of the alias which is used in QSettings AND the file - // system, thus need to be escaped. - QString escapeAlias( const QString& ) const; QString unescapeAlias( const QString& ) const; void removeFolder( const QString& ); diff --git a/src/mirall/logger.cpp b/src/mirall/logger.cpp index 0bc8d1ccb8..4ab9232d3f 100644 --- a/src/mirall/logger.cpp +++ b/src/mirall/logger.cpp @@ -50,7 +50,7 @@ Logger *Logger::instance() Logger::Logger( QObject* parent) : QObject(parent), _showTime(true), _doLogging(false), _doFileFlush(false), _logExpire(0) { - qInstallMessageHandler(mirallLogCatcher); +// qInstallMessageHandler(mirallLogCatcher); } Logger::~Logger() { diff --git a/src/mirall/selectivesyncdialog.cpp b/src/mirall/selectivesyncdialog.cpp new file mode 100644 index 0000000000..56d3999704 --- /dev/null +++ b/src/mirall/selectivesyncdialog.cpp @@ -0,0 +1,256 @@ +/* + * Copyright (C) by Olivier Goffart + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ +#include "selectivesyncdialog.h" +#include "folder.h" +#include "account.h" +#include "networkjobs.h" +#include "theme.h" +#include "folderman.h" +#include +#include +#include +#include +#include +#include +#include +#include + +namespace Mirall { + +SelectiveSyncDialog::SelectiveSyncDialog(Folder* folder, QWidget* parent, Qt::WindowFlags f) + : QDialog(parent, f), _folder(folder) +{ + QVBoxLayout *layout = new QVBoxLayout(this); + _treeView = new QTreeWidget; + connect(_treeView, SIGNAL(itemExpanded(QTreeWidgetItem*)), this, SLOT(slotItemExpanded(QTreeWidgetItem*))); + connect(_treeView, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(slotItemChanged(QTreeWidgetItem*,int))); + layout->addWidget(_treeView); + QDialogButtonBox *buttonBox = new QDialogButtonBox(Qt::Horizontal); + QPushButton *button; + button = buttonBox->addButton(QDialogButtonBox::Ok); + connect(button, SIGNAL(clicked()), this, SLOT(accept())); + button = buttonBox->addButton(QDialogButtonBox::Cancel); + connect(button, SIGNAL(clicked()), this, SLOT(reject())); + layout->addWidget(buttonBox); + + // Make sure we don't get crashes if the folder is destroyed while we are still open + connect(_folder, SIGNAL(destroyed(QObject*)), this, SLOT(deleteLater())); + + refreshFolders(); +} + +void SelectiveSyncDialog::refreshFolders() +{ + LsColJob *job = new LsColJob(AccountManager::instance()->account(), _folder->remotePath(), this); + connect(job, SIGNAL(directoryListing(QStringList)), + this, SLOT(slotUpdateDirectories(QStringList))); + job->start(); + _treeView->clear(); + +} + +static QTreeWidgetItem* findFirstChild(QTreeWidgetItem *parent, const QString& text) +{ + for (int i = 0; i < parent->childCount(); ++i) { + QTreeWidgetItem *child = parent->child(i); + if (child->text(0) == text) { + return child; + } + } + return 0; +} + +void SelectiveSyncDialog::recursiveInsert(QTreeWidgetItem* parent, QStringList pathTrail, + QString path) +{ + QFileIconProvider prov; + QIcon folderIcon = prov.icon(QFileIconProvider::Folder); + if (pathTrail.size() == 0) { + if (path.endsWith('/')) { + path.chop(1); + } + parent->setToolTip(0, path); + parent->setData(0, Qt::UserRole, path); + } else { + QTreeWidgetItem *item = findFirstChild(parent, pathTrail.first()); + if (!item) { + item = new QTreeWidgetItem(parent); + if (parent->checkState(0) == Qt::Checked) { + item->setCheckState(0, Qt::Checked); + } else if (parent->checkState(0) == Qt::Unchecked) { + item->setCheckState(0, Qt::Unchecked); + } else { + item->setCheckState(0, Qt::Unchecked); + foreach(const QString &str , _folder->selectiveSyncList()) { + if (str + "/" == path) { + item->setCheckState(0, Qt::Checked); + break; + } else if (str.startsWith(path)) { + item->setCheckState(0, Qt::PartiallyChecked); + } + } + } + item->setIcon(0, folderIcon); + item->setText(0, pathTrail.first()); +// item->setData(0, Qt::UserRole, pathTrail.first()); + item->setChildIndicatorPolicy(QTreeWidgetItem::ShowIndicator); + } + + pathTrail.removeFirst(); + recursiveInsert(item, pathTrail, path); + } +} + +void SelectiveSyncDialog::slotUpdateDirectories(const QStringList &list) +{ + QScopedValueRollback isInserting(_inserting); + _inserting = true; + + QTreeWidgetItem *root = _treeView->topLevelItem(0); + if (!root) { + root = new QTreeWidgetItem(_treeView); + root->setText(0, _folder->alias()); + root->setIcon(0, Theme::instance()->applicationIcon()); + root->setData(0, Qt::UserRole, _folder->remotePath()); + if (_folder->selectiveSyncList().isEmpty() || _folder->selectiveSyncList().contains(QString())) { + root->setCheckState(0, Qt::Checked); + } else { + root->setCheckState(0, Qt::PartiallyChecked); + } + } + const QString folderPath = _folder->remoteUrl().path(); + foreach (QString path, list) { + path.remove(folderPath); + QStringList paths = path.split('/'); + if (paths.last().isEmpty()) paths.removeLast(); + recursiveInsert(root, paths, path); + } + root->setExpanded(true); +} + +void SelectiveSyncDialog::slotItemExpanded(QTreeWidgetItem *item) +{ + QString dir = item->data(0, Qt::UserRole).toString(); + LsColJob *job = new LsColJob(AccountManager::instance()->account(), dir, this); + connect(job, SIGNAL(directoryListing(QStringList)), + SLOT(slotUpdateDirectories(QStringList))); + job->start(); +} + +void SelectiveSyncDialog::slotItemChanged(QTreeWidgetItem *item, int col) +{ + if (col != 0 || _inserting) + return; + + if (item->checkState(0) == Qt::Checked) { + // If we are checked, check that we may need to check the parent as well if + // all the sibilings are also checked + QTreeWidgetItem *parent = item->parent(); + if (parent && parent->checkState(0) != Qt::Checked) { + bool hasUnchecked = false; + for (int i = 0; i < parent->childCount(); ++i) { + if (parent->child(i)->checkState(0) != Qt::Checked) { + hasUnchecked = true; + break; + } + } + if (!hasUnchecked) { + parent->setCheckState(0, Qt::Checked); + } else if (parent->checkState(0) == Qt::Unchecked) { + parent->setCheckState(0, Qt::PartiallyChecked); + } + } + // also check all the childs + for (int i = 0; i < item->childCount(); ++i) { + if (item->child(i)->checkState(0) != Qt::Checked) { + item->child(i)->setCheckState(0, Qt::Checked); + } + } + } + + if (item->checkState(0) == Qt::Unchecked) { + QTreeWidgetItem *parent = item->parent(); + if (parent && parent->checkState(0) != Qt::Unchecked) { + bool hasChecked = false; + for (int i = 0; i < parent->childCount(); ++i) { + if (parent->child(i)->checkState(0) != Qt::Unchecked) { + hasChecked = true; + break; + } + } + if (!hasChecked) { + parent->setCheckState(0, Qt::Unchecked); + } else if (parent->checkState(0) == Qt::Checked) { + parent->setCheckState(0, Qt::PartiallyChecked); + } + } + + // Uncheck all the childs + for (int i = 0; i < item->childCount(); ++i) { + if (item->child(i)->checkState(0) != Qt::Unchecked) { + item->child(i)->setCheckState(0, Qt::Unchecked); + } + } + } + + if (item->checkState(0) == Qt::PartiallyChecked) { + QTreeWidgetItem *parent = item->parent(); + if (parent && parent->checkState(0) != Qt::PartiallyChecked) { + parent->setCheckState(0, Qt::PartiallyChecked); + } + } +} + +QStringList SelectiveSyncDialog::createWhiteList(QTreeWidgetItem* root) const +{ + if (!root) { + root = _treeView->topLevelItem(0); + } + if (!root) return {}; + + switch(root->checkState(0)) { + case Qt::Checked: + return { root->data(0, Qt::UserRole).toString() }; + case Qt::Unchecked: + return {}; + case Qt::PartiallyChecked: + break; + } + + QStringList result; + for (int i = 0; i < root->childCount(); ++i) { + result += createWhiteList(root->child(i)); + } + return result; +} + +void SelectiveSyncDialog::accept() +{ + QStringList whiteList = createWhiteList(); + _folder->setSelectiveSyncList(whiteList); + + // FIXME: Use MirallConfigFile + QSettings settings(_folder->configFile(), QSettings::IniFormat); + settings.beginGroup(FolderMan::escapeAlias(_folder->alias())); + settings.setValue("whiteList", whiteList); + + QDialog::accept(); +} + + + +} + + + diff --git a/src/mirall/selectivesyncdialog.h b/src/mirall/selectivesyncdialog.h new file mode 100644 index 0000000000..a74a7aaa23 --- /dev/null +++ b/src/mirall/selectivesyncdialog.h @@ -0,0 +1,47 @@ +/* + * Copyright (C) by Olivier Goffart + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + +#pragma once +#include + +class QTreeWidgetItem; +class QTreeWidget; +namespace Mirall { + +class Folder; + +class SelectiveSyncDialog : public QDialog { + Q_OBJECT +public: + explicit SelectiveSyncDialog(Folder *folder, QWidget* parent = 0, Qt::WindowFlags f = 0); + + virtual void accept() Q_DECL_OVERRIDE; + QStringList createWhiteList(QTreeWidgetItem* root = 0) const; + +private slots: + void refreshFolders(); + void slotUpdateDirectories(const QStringList &); + void slotItemExpanded(QTreeWidgetItem *); + void slotItemChanged(QTreeWidgetItem*,int); + +private: + void recursiveInsert(QTreeWidgetItem* parent, QStringList pathTrail, QString path); + + Folder *_folder; + QTreeWidget *_treeView; + bool _inserting = false; // set to true when we are inserting new items on the list +}; + + +} \ No newline at end of file From 1f1eb933d19f3bc09ee65ae75aaa3c50a578b3ea Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 11 Aug 2014 17:47:16 +0200 Subject: [PATCH 02/94] Move the update job in a new file named discoveryphase "Discovery" is a better name than "update" --- src/CMakeLists.txt | 1 + src/mirall/discoveryphase.cpp | 23 ++++++++++++++++++ src/mirall/discoveryphase.h | 44 +++++++++++++++++++++++++++++++++++ src/mirall/syncengine.cpp | 13 ++++++----- src/mirall/syncengine.h | 29 +---------------------- 5 files changed, 76 insertions(+), 34 deletions(-) create mode 100644 src/mirall/discoveryphase.cpp create mode 100644 src/mirall/discoveryphase.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9d4e66bcf4..9acb275007 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -87,6 +87,7 @@ set(libsync_SRCS mirall/clientproxy.cpp mirall/cookiejar.cpp mirall/syncfilestatus.cpp + mirall/discoveryphase.cpp creds/dummycredentials.cpp creds/abstractcredentials.cpp creds/credentialsfactory.cpp diff --git a/src/mirall/discoveryphase.cpp b/src/mirall/discoveryphase.cpp new file mode 100644 index 0000000000..b1e3d16286 --- /dev/null +++ b/src/mirall/discoveryphase.cpp @@ -0,0 +1,23 @@ +/* + * Copyright (C) by Olivier Goffart + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + +#include "discoveryphase.h" + +void DiscoveryJob::start() { + csync_set_log_callback(_log_callback); + csync_set_log_level(_log_level); + csync_set_log_userdata(_log_userdata); + emit finished(csync_update(_csync_ctx)); + deleteLater(); +} diff --git a/src/mirall/discoveryphase.h b/src/mirall/discoveryphase.h new file mode 100644 index 0000000000..949794c106 --- /dev/null +++ b/src/mirall/discoveryphase.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) by Olivier Goffart + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + +#pragma once + +#include +#include + +/** + * The Discovery Phase was once called "update" phase in csync therms. + * Its goal is to look at the files in one of the remote and check comared to the db + * if the files are new, or changed. + */ + +class DiscoveryJob : public QObject { + Q_OBJECT + CSYNC *_csync_ctx; + csync_log_callback _log_callback; + int _log_level; + void* _log_userdata; + Q_INVOKABLE void start(); +public: + explicit DiscoveryJob(CSYNC *ctx, QObject* parent = 0) + : QObject(parent), _csync_ctx(ctx) { + // We need to forward the log property as csync uses thread local + // and updates run in another thread + _log_callback = csync_get_log_callback(); + _log_level = csync_get_log_level(); + _log_userdata = csync_get_log_userdata(); + } +signals: + void finished(int result); +}; diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp index 90fa76a0d8..cfff3dedfc 100644 --- a/src/mirall/syncengine.cpp +++ b/src/mirall/syncengine.cpp @@ -19,6 +19,7 @@ #include "owncloudpropagator.h" #include "syncjournaldb.h" #include "syncjournalfilerecord.h" +#include "discoveryphase.h" #include "creds/abstractcredentials.h" #include "csync_util.h" @@ -529,21 +530,21 @@ void SyncEngine::startSync() _stopWatch.start(); - qDebug() << "#### Update start #################################################### >>"; + qDebug() << "#### Discovery start #################################################### >>"; - UpdateJob *job = new UpdateJob(_csync_ctx); + DiscoveryJob *job = new DiscoveryJob(_csync_ctx); job->moveToThread(&_thread); - connect(job, SIGNAL(finished(int)), this, SLOT(slotUpdateFinished(int))); + connect(job, SIGNAL(finished(int)), this, SLOT(slotDiscoveryJobFinished(int))); QMetaObject::invokeMethod(job, "start", Qt::QueuedConnection); } -void SyncEngine::slotUpdateFinished(int updateResult) +void SyncEngine::slotDiscoveryJobFinished(int discoveryResult) { - if (updateResult < 0 ) { + if (discoveryResult < 0 ) { handleSyncError(_csync_ctx, "csync_update"); return; } - qDebug() << "<<#### Update end #################################################### " << _stopWatch.addLapTime(QLatin1String("Update Finished")); + qDebug() << "<<#### Discovery end #################################################### " << _stopWatch.addLapTime(QLatin1String("Discovery Finished")); if( csync_reconcile(_csync_ctx) < 0 ) { handleSyncError(_csync_ctx, "csync_reconcile"); diff --git a/src/mirall/syncengine.h b/src/mirall/syncengine.h index 5e44d46b62..ac3df814a3 100644 --- a/src/mirall/syncengine.h +++ b/src/mirall/syncengine.h @@ -88,7 +88,7 @@ private slots: void slotFinished(); void slotProgress(const SyncFileItem& item, quint64 curent); void slotAdjustTotalTransmissionSize(qint64 change); - void slotUpdateFinished(int updateResult); + void slotDiscoveryJobFinished(int updateResult); private: void handleSyncError(CSYNC *ctx, const char *state); @@ -142,33 +142,6 @@ private: }; -class UpdateJob : public QObject { - Q_OBJECT - CSYNC *_csync_ctx; - csync_log_callback _log_callback; - int _log_level; - void* _log_userdata; - Q_INVOKABLE void start() { - csync_set_log_callback(_log_callback); - csync_set_log_level(_log_level); - csync_set_log_userdata(_log_userdata); - emit finished(csync_update(_csync_ctx)); - deleteLater(); - } -public: - explicit UpdateJob(CSYNC *ctx, QObject* parent = 0) - : QObject(parent), _csync_ctx(ctx) { - // We need to forward the log property as csync uses thread local - // and updates run in another thread - _log_callback = csync_get_log_callback(); - _log_level = csync_get_log_level(); - _log_userdata = csync_get_log_userdata(); - } -signals: - void finished(int result); -}; - - } #endif // CSYNCTHREAD_H From 7e009667a2349edb05e1611737de5dc90fb00d8d Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 11 Aug 2014 18:41:42 +0200 Subject: [PATCH 03/94] Selective sync: ignore the files that are not in the selective sync white list --- csync/src/csync_exclude.c | 6 +++++ csync/src/csync_private.h | 4 +++ src/mirall/accountsettings.cpp | 2 +- src/mirall/discoveryphase.cpp | 47 ++++++++++++++++++++++++++++++++++ src/mirall/discoveryphase.h | 13 +++++++++- src/mirall/folder.cpp | 1 + src/mirall/syncengine.cpp | 1 + src/mirall/syncengine.h | 6 +++++ 8 files changed, 78 insertions(+), 2 deletions(-) diff --git a/csync/src/csync_exclude.c b/csync/src/csync_exclude.c index 25cd060e0e..09af94699c 100644 --- a/csync/src/csync_exclude.c +++ b/csync/src/csync_exclude.c @@ -310,6 +310,12 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype) { SAFE_FREE(dname); } + if (match == CSYNC_NOT_EXCLUDED && ctx->checkWhiteListHook) { + if (ctx->checkWhiteListHook(ctx->checkWhiteListData, path)) { + match = CSYNC_FILE_SILENTLY_EXCLUDED; + } + } + out: return match; diff --git a/csync/src/csync_private.h b/csync/src/csync_private.h index 2e3674b567..e2da3ea56a 100644 --- a/csync/src/csync_private.h +++ b/csync/src/csync_private.h @@ -144,6 +144,10 @@ struct csync_s { int read_from_db_disabled; struct csync_owncloud_ctx_s *owncloud_context; + + /* hooks for checking the white list */ + void *checkWhiteListData; + int (*checkWhiteListHook)(void*, const char*); }; diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp index 4db0c2887a..f76d5a4eb2 100644 --- a/src/mirall/accountsettings.cpp +++ b/src/mirall/accountsettings.cpp @@ -381,7 +381,7 @@ void AccountSettings::slotSelectiveSync() FolderMan *folderMan = FolderMan::instance(); Folder *f = folderMan->folder(alias); if (f) { - (new SelectiveSyncDialog(f, this))->show(); + (new SelectiveSyncDialog(f, this))->open(); } } diff --git a/src/mirall/discoveryphase.cpp b/src/mirall/discoveryphase.cpp index b1e3d16286..b1e485a137 100644 --- a/src/mirall/discoveryphase.cpp +++ b/src/mirall/discoveryphase.cpp @@ -13,8 +13,55 @@ */ #include "discoveryphase.h" +#include + +bool DiscoveryJob::isInWhiteList(const QString& path_) const +{ + if (_selectiveSyncWhiteList.isEmpty()) { + // If there is no white list, everything is allowed + return true; + } + + // If the path is a prefix of any item of the list, this means we need to go deeper, so we sync. + // (this means it was partially checked) + // If one of the item in the white list is a prefix of the path, it means this path need to + // be synced. + // + // We know the list is sorted (for it is done in DiscoveryJob::start) + // So we can do a binary search. If the path is a prefix if another item, this item will be + // equal, or right after in the lexical order. + // If an item has the path as a prefix, it will be right before in the lexicographic order. + + QString path = path_ + QLatin1Char('/'); + + auto it = std::lower_bound(_selectiveSyncWhiteList.begin(), _selectiveSyncWhiteList.end(), path); + if (it != _selectiveSyncWhiteList.end() && path.startsWith(*it)) { + // If the path is a prefix of something in the white list, we need to sync the contents + return true; + } + + // If the item before is a prefix of the path, we are also good + if (it == _selectiveSyncWhiteList.begin()) { + return false; + } + --it; + if ((*it).startsWith(path)) { + return true; + } + + return false; +} + +int DiscoveryJob::isInWhiteListCallBack(void *data, const char *path) +{ + return static_cast(data)->isInWhiteList(QString::fromUtf8(path)); +} + void DiscoveryJob::start() { + _selectiveSyncWhiteList.sort(); + _csync_ctx->checkWhiteListHook = isInWhiteListCallBack; + _csync_ctx->checkWhiteListData = this; csync_set_log_callback(_log_callback); csync_set_log_level(_log_level); csync_set_log_userdata(_log_userdata); diff --git a/src/mirall/discoveryphase.h b/src/mirall/discoveryphase.h index 949794c106..2044b62c92 100644 --- a/src/mirall/discoveryphase.h +++ b/src/mirall/discoveryphase.h @@ -15,6 +15,7 @@ #pragma once #include +#include #include /** @@ -29,7 +30,14 @@ class DiscoveryJob : public QObject { csync_log_callback _log_callback; int _log_level; void* _log_userdata; - Q_INVOKABLE void start(); + + /** + * return true if the given path should be synced, + * false if the path should be ignored + */ + bool isInWhiteList(const QString &path) const; + static int isInWhiteListCallBack(void *, const char *); + public: explicit DiscoveryJob(CSYNC *ctx, QObject* parent = 0) : QObject(parent), _csync_ctx(ctx) { @@ -39,6 +47,9 @@ public: _log_level = csync_get_log_level(); _log_userdata = csync_get_log_userdata(); } + + QStringList _selectiveSyncWhiteList; + Q_INVOKABLE void start(); signals: void finished(int result); }; diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp index 7e78fdeb7c..736fa63c20 100644 --- a/src/mirall/folder.cpp +++ b/src/mirall/folder.cpp @@ -596,6 +596,7 @@ void Folder::startSync(const QStringList &pathList) connect(_engine.data(), SIGNAL(jobCompleted(SyncFileItem)), this, SLOT(slotJobCompleted(SyncFileItem))); setDirtyNetworkLimits(); + _engine->setSelectiveSyncWhiteList(selectiveSyncList()); QMetaObject::invokeMethod(_engine.data(), "startSync", Qt::QueuedConnection); diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp index cfff3dedfc..8cc3ebc561 100644 --- a/src/mirall/syncengine.cpp +++ b/src/mirall/syncengine.cpp @@ -533,6 +533,7 @@ void SyncEngine::startSync() qDebug() << "#### Discovery start #################################################### >>"; DiscoveryJob *job = new DiscoveryJob(_csync_ctx); + job->_selectiveSyncWhiteList = _selectiveSyncWhiteList; job->moveToThread(&_thread); connect(job, SIGNAL(finished(int)), this, SLOT(slotDiscoveryJobFinished(int))); QMetaObject::invokeMethod(job, "start", Qt::QueuedConnection); diff --git a/src/mirall/syncengine.h b/src/mirall/syncengine.h index ac3df814a3..71b4505763 100644 --- a/src/mirall/syncengine.h +++ b/src/mirall/syncengine.h @@ -24,6 +24,7 @@ #include #include #include +#include #include @@ -58,6 +59,9 @@ public: Utility::StopWatch &stopWatch() { return _stopWatch; } + void setSelectiveSyncWhiteList(const QStringList &list) + { _selectiveSyncWhiteList = list; } + signals: void csyncError( const QString& ); void csyncUnavailable(); @@ -139,6 +143,8 @@ private: // hash containing the permissions on the remote directory QHash _remotePerms; + + QStringList _selectiveSyncWhiteList; }; From b25ef28e82e85db7f34d81f3ff89fa771a9b1162 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 12 Aug 2014 11:12:58 +0200 Subject: [PATCH 04/94] Selective sync: remember the old list when accepting the dialog even if the tree was not expanded --- src/mirall/selectivesyncdialog.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/mirall/selectivesyncdialog.cpp b/src/mirall/selectivesyncdialog.cpp index 56d3999704..ceeba0eb19 100644 --- a/src/mirall/selectivesyncdialog.cpp +++ b/src/mirall/selectivesyncdialog.cpp @@ -229,8 +229,17 @@ QStringList SelectiveSyncDialog::createWhiteList(QTreeWidgetItem* root) const } QStringList result; - for (int i = 0; i < root->childCount(); ++i) { - result += createWhiteList(root->child(i)); + if (root->childCount()) { + for (int i = 0; i < root->childCount(); ++i) { + result += createWhiteList(root->child(i)); + } + } else { + // We did not load from the server so we re-use the one from the old white list + QString path = root->data(0, Qt::UserRole).toString(); + foreach (const QString & it, _folder->selectiveSyncList()) { + if (it.startsWith(path)) + result += it; + } } return result; } From 12459bf07e9b17daaf589cb2fc2d50eddc56eb3a Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 12 Aug 2014 11:43:42 +0200 Subject: [PATCH 05/94] selective sync: fix whitelist matching --- csync/src/csync_exclude.c | 4 ++-- src/mirall/discoveryphase.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/csync/src/csync_exclude.c b/csync/src/csync_exclude.c index 09af94699c..6c79f1bc48 100644 --- a/csync/src/csync_exclude.c +++ b/csync/src/csync_exclude.c @@ -311,8 +311,8 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype) { } if (match == CSYNC_NOT_EXCLUDED && ctx->checkWhiteListHook) { - if (ctx->checkWhiteListHook(ctx->checkWhiteListData, path)) { - match = CSYNC_FILE_SILENTLY_EXCLUDED; + if (!ctx->checkWhiteListHook(ctx->checkWhiteListData, path)) { + match = CSYNC_FILE_EXCLUDE_LIST; } } diff --git a/src/mirall/discoveryphase.cpp b/src/mirall/discoveryphase.cpp index b1e485a137..8cd5860ed9 100644 --- a/src/mirall/discoveryphase.cpp +++ b/src/mirall/discoveryphase.cpp @@ -14,8 +14,9 @@ #include "discoveryphase.h" #include +#include -bool DiscoveryJob::isInWhiteList(const QString& path_) const +bool DiscoveryJob::isInWhiteList(const QString& path) const { if (_selectiveSyncWhiteList.isEmpty()) { // If there is no white list, everything is allowed @@ -32,10 +33,10 @@ bool DiscoveryJob::isInWhiteList(const QString& path_) const // equal, or right after in the lexical order. // If an item has the path as a prefix, it will be right before in the lexicographic order. - QString path = path_ + QLatin1Char('/'); + QString pathSlash = path + QLatin1Char('/'); - auto it = std::lower_bound(_selectiveSyncWhiteList.begin(), _selectiveSyncWhiteList.end(), path); - if (it != _selectiveSyncWhiteList.end() && path.startsWith(*it)) { + auto it = std::lower_bound(_selectiveSyncWhiteList.begin(), _selectiveSyncWhiteList.end(), pathSlash); + if (it != _selectiveSyncWhiteList.end() && (*it + QLatin1Char('/')).startsWith(pathSlash)) { // If the path is a prefix of something in the white list, we need to sync the contents return true; } @@ -45,10 +46,9 @@ bool DiscoveryJob::isInWhiteList(const QString& path_) const return false; } --it; - if ((*it).startsWith(path)) { + if (pathSlash.startsWith(*it + QLatin1Char('/'))) { return true; } - return false; } From 72e0418e4cc9bf579acd8cb1a19c9797710253ea Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 13 Aug 2014 01:25:32 -0400 Subject: [PATCH 06/94] [tx-robot] updated from transifex --- translations/mirall_ca.ts | 123 +++++++++++++------------ translations/mirall_cs.ts | 123 +++++++++++++------------ translations/mirall_de.ts | 123 +++++++++++++------------ translations/mirall_el.ts | 123 +++++++++++++------------ translations/mirall_en.ts | 123 +++++++++++++------------ translations/mirall_es.ts | 123 +++++++++++++------------ translations/mirall_es_AR.ts | 123 +++++++++++++------------ translations/mirall_et.ts | 123 +++++++++++++------------ translations/mirall_eu.ts | 123 +++++++++++++------------ translations/mirall_fa.ts | 169 ++++++++++++++++++----------------- translations/mirall_fi.ts | 123 +++++++++++++------------ translations/mirall_fr.ts | 123 +++++++++++++------------ translations/mirall_gl.ts | 123 +++++++++++++------------ translations/mirall_hu.ts | 123 +++++++++++++------------ translations/mirall_it.ts | 123 +++++++++++++------------ translations/mirall_ja.ts | 123 +++++++++++++------------ translations/mirall_nl.ts | 123 +++++++++++++------------ translations/mirall_pl.ts | 123 +++++++++++++------------ translations/mirall_pt.ts | 123 +++++++++++++------------ translations/mirall_pt_BR.ts | 123 +++++++++++++------------ translations/mirall_ru.ts | 123 +++++++++++++------------ translations/mirall_sk.ts | 123 +++++++++++++------------ translations/mirall_sl.ts | 123 +++++++++++++------------ translations/mirall_sv.ts | 123 +++++++++++++------------ translations/mirall_th.ts | 123 +++++++++++++------------ translations/mirall_tr.ts | 123 +++++++++++++------------ translations/mirall_uk.ts | 123 +++++++++++++------------ translations/mirall_zh_CN.ts | 123 +++++++++++++------------ translations/mirall_zh_TW.ts | 123 +++++++++++++------------ 29 files changed, 1879 insertions(+), 1734 deletions(-) diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts index d4f917dc99..2aa0e32cae 100644 --- a/translations/mirall_ca.ts +++ b/translations/mirall_ca.ts @@ -211,22 +211,22 @@ Temps restant total %5 Mirall::AuthenticationDialog - + Authentication Required Es requereix autenticació - + Enter username and password for '%1' at %2. Introduir nom d'usuari i paraula de pas per '%1' a %2 - + &User: &Usuari: - + &Password: &Contrasenya: @@ -1084,126 +1084,126 @@ No és aconsellada usar-la. Mirall::OwncloudSetupWizard - + Folder rename failed Ha fallat en canviar el nom de la carpeta - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>la carpeta de sincronització %1 s'ha creat correctament!</b></font> - + Trying to connect to %1 at %2... Intentant connectar amb %1 a %2... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">S'ha connectat correctament amb %1: %2 versió %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Error: credencials incorrectes. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> La carpeta local %1 ja existeix, s'està configurant per sincronitzar.<br/><br/> - + Creating local sync folder %1... Creant carpeta local de sincronització %1... - + ok correcte - + failed. ha fallat. - + Could not create local folder %1 No s'ha pogut crear la carpeta local %1 - - + + Failed to connect to %1 at %2:<br/>%3 Ha fallat la connexió amb %1 a %2:<br/>%3 - + No remote folder specified! No heu especificat cap carpeta remota! - + Error: %1 Error: %1 - + creating folder on ownCloud: %1 creant la carpeta a ownCloud: %1 - + Remote folder %1 created successfully. La carpeta remota %1 s'ha creat correctament. - + The remote folder %1 already exists. Connecting it for syncing. La carpeta remota %1 ja existeix. S'hi està connectant per sincronitzar-les. - - + + The folder creation resulted in HTTP error code %1 La creació de la carpeta ha resultat en el codi d'error HTTP %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> Ha fallat la creació de la carpeta perquè les credencials proporcionades són incorrectes!<br/>Aneu enrera i comproveu les credencials.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">La creació de la carpeta remota ha fallat, probablement perquè les credencials facilitades són incorrectes.</font><br/>Comproveu les vostres credencials.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. La creació de la carpeta remota %1 ha fallat amb l'error <tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. S'ha establert una connexió de sincronització des de %1 a la carpeta remota %2. - + Successfully connected to %1! Connectat amb èxit a %1! - + Connection to %1 could not be established. Please check again. No s'ha pogut establir la connexió amb %1. Comproveu-ho de nou. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. No es pot esborrar i restaurar la carpeta perquè una carpeta o un fitxer de dins està obert en un altre programa. Tanqueu la carpeta o el fitxer i intenteu-ho de nou o cancel·leu la configuració. @@ -1211,10 +1211,15 @@ No és aconsellada usar-la. Mirall::OwncloudWizard - + %1 Connection Wizard Assistent de connexió %1 + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1552,12 +1557,12 @@ Proveu de sincronitzar-los de nou. Mirall::ShibbolethCredentials - + Login Error Error d'accés - + You must sign in as user %1 Cal identificar-se com a usuari %1 @@ -2030,127 +2035,127 @@ Proveu de sincronitzar-los de nou. Mirall::ownCloudGui - + Please sign in Acrediteu-vos - + Disconnected from server Desconnectat del servidor - + Folder %1: %2 Carpeta %1: %2 - + No sync folders configured. No hi ha fitxers de sincronització configurats - + None. Cap. - + Recent Changes Canvis recents - + Open %1 folder Obre la carpeta %1 - + Managed Folders: Fitxers gestionats: - + Open folder '%1' Obre carpeta '%1' - + Open %1 in browser Obre %1 en el navegador - + Calculating quota... Calculant la quota... - + Unknown status Estat desconegut - + Settings... Arranjament... - + Details... Detalls... - + Help Ajuda - + Quit %1 Surt %1 - + Sign in... Acredita... - + Sign out Surt - + Quota n/a Quota n/d - + %1% of %2 in use %1 de %2 en ús - + No items synced recently No hi ha elements sincronitzats recentment - + Syncing %1 of %2 (%3 left) Sincronitzant %1 de %2 (%3 pendents) - + Syncing %1 (%2 left) Sincronitzant %1 (%2 pendents) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Actualitzat diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts index c0f0b9662e..44f9be30c5 100644 --- a/translations/mirall_cs.ts +++ b/translations/mirall_cs.ts @@ -211,22 +211,22 @@ Celkový zbývající čas %5 Mirall::AuthenticationDialog - + Authentication Required Ověření vyžadováno - + Enter username and password for '%1' at %2. Zadejte uživatelské jméno a heslo pro '%1' na %2. - + &User: &Uživatel: - + &Password: &Heslo: @@ -1084,126 +1084,126 @@ Nedoporučuje se jí používat. Mirall::OwncloudSetupWizard - + Folder rename failed Přejmenování složky selhalo - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Místní synchronizovaná složka %1 byla vytvořena úspěšně!</b></font> - + Trying to connect to %1 at %2... Pokouším se připojit k %1 na %2... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Úspěšně připojeno k %1: %2 verze %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Chyba: nesprávné přihlašovací údaje. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Místní synchronizovaná složka %1 již existuje, nastavuji ji pro synchronizaci.<br/><br/> - + Creating local sync folder %1... Vytvářím místní synchronizovanou složku %1... - + ok OK - + failed. selhalo. - + Could not create local folder %1 Nelze vytvořit místní složku %1 - - + + Failed to connect to %1 at %2:<br/>%3 Selhalo spojení s %1 v %2:<br/>%3 - + No remote folder specified! Žádná vzdálená složka nenastavena! - + Error: %1 Chyba: %1 - + creating folder on ownCloud: %1 vytvářím složku na ownCloudu: %1 - + Remote folder %1 created successfully. Vzdálená složka %1 byla úspěšně vytvořena. - + The remote folder %1 already exists. Connecting it for syncing. Vzdálená složka %1 již existuje. Spojuji ji pro synchronizaci. - - + + The folder creation resulted in HTTP error code %1 Vytvoření složky selhalo HTTP chybou %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> Vytvoření vzdálené složky selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.<br/>Vraťte se, prosím, zpět a zkontrolujte je.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Vytvoření vzdálené složky selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.</font><br/>Vraťte se, prosím, zpět a zkontrolujte je.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Vytváření vzdálené složky %1 selhalo s chybou <tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. Bylo nastaveno synchronizované spojení z %1 do vzdáleného adresáře %2. - + Successfully connected to %1! Úspěšně spojeno s %1. - + Connection to %1 could not be established. Please check again. Spojení s %1 nelze navázat. Prosím zkuste to znovu. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. Nelze odstranit a zazálohovat adresář, protože adresář nebo soubor v něm je otevřen v jiném programu. Prosím zavřete adresář nebo soubor a zkuste znovu nebo zrušte akci. @@ -1211,10 +1211,15 @@ Nedoporučuje se jí používat. Mirall::OwncloudWizard - + %1 Connection Wizard %1 Průvodce spojením + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1553,12 +1558,12 @@ Zkuste provést novou synchronizaci. Mirall::ShibbolethCredentials - + Login Error Chyba přihlášení - + You must sign in as user %1 Musíte se přihlásit jako uživatel %1 @@ -2031,127 +2036,127 @@ Zkuste provést novou synchronizaci. Mirall::ownCloudGui - + Please sign in Přihlašte se prosím - + Disconnected from server Odpojen od serveru - + Folder %1: %2 Složka %1: %2 - + No sync folders configured. Nejsou nastaveny žádné synchronizované složky. - + None. Nic. - + Recent Changes Poslední změny - + Open %1 folder Otevřít složku %1 - + Managed Folders: Spravované složky: - + Open folder '%1' Otevřít složku '%1' - + Open %1 in browser Otevřít %1 v prohlížeči - + Calculating quota... Počítám kvóty... - + Unknown status Neznámý stav - + Settings... Nastavení... - + Details... Podrobnosti... - + Help Nápověda - + Quit %1 Ukončit %1 - + Sign in... Přihlásit... - + Sign out Odhlásit - + Quota n/a Kvóta nedostupná - + %1% of %2 in use %1% z %2 v používání - + No items synced recently Žádné položky nebyly nedávno synchronizovány - + Syncing %1 of %2 (%3 left) Synchronizuji %1 ze %2 (zbývá %3) - + Syncing %1 (%2 left) Synchronizuji %1 (zbývá %2) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Aktuální diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts index 5285176037..bef7bb6ead 100644 --- a/translations/mirall_de.ts +++ b/translations/mirall_de.ts @@ -212,22 +212,22 @@ Gesamtzeit übrig %5 Mirall::AuthenticationDialog - + Authentication Required Authentifizierung erforderlich - + Enter username and password for '%1' at %2. Benutzername und Passwort für '%1' auf %2 eingeben. - + &User: &Benutzer: - + &Password: &Passwort: @@ -1085,126 +1085,126 @@ Es ist nicht ratsam, diese zu benutzen. Mirall::OwncloudSetupWizard - + Folder rename failed Ordner umbenennen fehlgeschlagen. - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Lokaler Sync-Ordner %1 erfolgreich erstellt!</b></font> - + Trying to connect to %1 at %2... Versuche zu %1 an %2 zu verbinden... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Erfolgreich mit %1 verbunden: %2 Version %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Fehler: Falsche Anmeldeinformationen. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Lokaler Sync-Ordner %1 existiert bereits, aktiviere Synchronistation.<br/><br/> - + Creating local sync folder %1... Erstelle lokalen Sync-Ordner %1... - + ok ok - + failed. fehlgeschlagen. - + Could not create local folder %1 Der lokale Ordner %1 konnte nicht angelegt werden - - + + Failed to connect to %1 at %2:<br/>%3 Die Verbindung zu %1 auf %2:<br/>%3 konnte nicht hergestellt werden - + No remote folder specified! Keinen fernen Ordner spezifiziert! - + Error: %1 Fehler: %1 - + creating folder on ownCloud: %1 erstelle Ordner auf ownCloud: %1 - + Remote folder %1 created successfully. Remoteordner %1 erfolgreich erstellt. - + The remote folder %1 already exists. Connecting it for syncing. Der Ordner %1 ist auf dem Server bereits vorhanden. Verbinde zur Synchronisation. - - + + The folder creation resulted in HTTP error code %1 Das Erstellen des Verzeichnisses erzeugte den HTTP-Fehler-Code %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> Die Remote-Ordner-Erstellung ist fehlgeschlagen, weil die angegebenen Zugangsdaten falsch sind. Bitte gehen Sie zurück und überprüfen Sie die Zugangsdaten. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Die Remote-Ordner-Erstellung ist fehlgeschlagen, vermutlich sind die angegebenen Zugangsdaten falsch.</font><br/>Bitte gehen Sie zurück und überprüfen Sie Ihre Zugangsdaten.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Remote-Ordner %1 konnte mit folgendem Fehler nicht erstellt werden: <tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. Eine Synchronisationsverbindung für Ordner %1 zum entfernten Ordner %2 wurde eingerichtet. - + Successfully connected to %1! Erfolgreich verbunden mit %1! - + Connection to %1 could not be established. Please check again. Die Verbindung zu %1 konnte nicht hergestellt werden. Bitte prüfen Sie die Einstellungen erneut. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. Kann den Ordner nicht entfernen und sichern, da der Ordner oder einer seiner Dateien in einem anderen Programm geöffnet ist. Bitte schließen Sie den Ordner ode die Datei oder beenden Sie das Setup. @@ -1212,10 +1212,15 @@ Es ist nicht ratsam, diese zu benutzen. Mirall::OwncloudWizard - + %1 Connection Wizard %1 Verbindungsassistent + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1553,12 +1558,12 @@ Versuchen Sie diese nochmals zu synchronisieren. Mirall::ShibbolethCredentials - + Login Error Log-In Fehler - + You must sign in as user %1 Sie müssen sich als %1 einloggen @@ -2031,127 +2036,127 @@ Versuchen Sie diese nochmals zu synchronisieren. Mirall::ownCloudGui - + Please sign in Bitte melden Sie sich an - + Disconnected from server Vom Server getrennt - + Folder %1: %2 Ordner %1: %2 - + No sync folders configured. Keine Sync-Ordner konfiguriert. - + None. Keine. - + Recent Changes Letzte Änderungen - + Open %1 folder Ordner %1 öffnen - + Managed Folders: Verwaltete Ordner: - + Open folder '%1' Ordner '%1' öffnen - + Open %1 in browser %1 im Browser öffnen - + Calculating quota... Berechne Quote... - + Unknown status Unbekannter Status - + Settings... Einstellungen - + Details... Details... - + Help Hilfe - + Quit %1 %1 beenden - + Sign in... Anmeldung... - + Sign out Abmeldung - + Quota n/a Quote unbekannt - + %1% of %2 in use %1% von %2 benutzt - + No items synced recently Keine kürzlich synchronisierten Elemente - + Syncing %1 of %2 (%3 left) Synchronisiere %1 von %2 (%3 übrig) - + Syncing %1 (%2 left) Synchronisiere %1 (%2 übrig) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Aktuell diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts index b360aea344..390e7d7c58 100644 --- a/translations/mirall_el.ts +++ b/translations/mirall_el.ts @@ -212,22 +212,22 @@ Total time left %5 Mirall::AuthenticationDialog - + Authentication Required Απαιτείται Πιστοποίηση - + Enter username and password for '%1' at %2. Εισάγετε όνομα χρήστη και κωδικό πρόσβασης για το '%1' στο %2. - + &User: &Χρήστης: - + &Password: &Κωδικός Πρόσβασης: @@ -1085,126 +1085,126 @@ It is not advisable to use it. Mirall::OwncloudSetupWizard - + Folder rename failed Αποτυχία μετονομασίας φακέλου - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Επιτυχής δημιουργία τοπικού φακέλου %1 για συγχρονισμό!</b></font> - + Trying to connect to %1 at %2... Προσπάθεια σύνδεσης στο %1 για %2... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Επιτυχής σύνδεση στο %1: %2 έκδοση %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Σφάλμα: Λάθος διαπιστευτήρια. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Ο τοπικός φάκελος συγχρονισμού %1 υπάρχει ήδη, ρύθμιση για συγχρονισμό.<br/><br/> - + Creating local sync folder %1... Δημιουργία τοπικού φακέλου %1 για συγχρονισμό... - + ok οκ - + failed. απέτυχε. - + Could not create local folder %1 Αδυναμία δημιουργίας τοπικού φακέλου %1 - - + + Failed to connect to %1 at %2:<br/>%3 Αποτυχία σύνδεσης με το %1 στο %2:<br/>%3 - + No remote folder specified! Δεν προσδιορίστηκε κανένας απομακρυσμένος φάκελος! - + Error: %1 Σφάλμα: %1 - + creating folder on ownCloud: %1 δημιουργία φακέλου στο ownCloud: %1 - + Remote folder %1 created successfully. Ο απομακρυσμένος φάκελος %1 δημιουργήθηκε με επιτυχία. - + The remote folder %1 already exists. Connecting it for syncing. Ο απομακρυσμένος φάκελος %1 υπάρχει ήδη. Θα συνδεθεί για συγχρονισμό. - - + + The folder creation resulted in HTTP error code %1 Η δημιουργία φακέλου είχε ως αποτέλεσμα τον κωδικό σφάλματος HTTP %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> Η δημιουργία απομακρυσμένου φακέλλου απέτυχε επειδή τα διαπιστευτήρια είναι λάθος!<br/>Παρακαλώ επιστρέψετε και ελέγξετε τα διαπιστευτήριά σας.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Η δημιουργία απομακρυσμένου φακέλου απέτυχε, πιθανώς επειδή τα διαπιστευτήρια που δόθηκαν είναι λάθος.</font><br/>Παρακαλώ επιστρέψτε πίσω και ελέγξτε τα διαπιστευτήρια σας.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Η δημιουργία απομακρυσμένου φακέλου %1 απέτυχε με σφάλμα <tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. Μια σύνδεση συγχρονισμού από τον απομακρυσμένο κατάλογο %1 σε %2 έχει ρυθμιστεί. - + Successfully connected to %1! Επιτυχής σύνδεση με %1! - + Connection to %1 could not be established. Please check again. Αδυναμία σύνδεσης στον %1. Παρακαλώ ελέξτε ξανά. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. Αδυναμία αφαίρεσης και δημιουργίας αντιγράφου ασφαλείας του φακέλου διότι ο φάκελος ή ένα αρχείο του είναι ανοικτό από άλλο πρόγραμμα. Παρακαλώ κλείστε τον φάκελο ή το αρχείο και πατήστε επανάληψη ή ακυρώστε την ρύθμιση. @@ -1212,10 +1212,15 @@ It is not advisable to use it. Mirall::OwncloudWizard - + %1 Connection Wizard %1 Οδηγός Σύνδεσης + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1553,12 +1558,12 @@ It is not advisable to use it. Mirall::ShibbolethCredentials - + Login Error Σφάλμα Σύνδεσης - + You must sign in as user %1 Πρέπει να εισέλθετε σαν χρήστης %1 @@ -2031,127 +2036,127 @@ It is not advisable to use it. Mirall::ownCloudGui - + Please sign in Παρκαλώ συνδεθείτε - + Disconnected from server Αποσύνδεση από το διακομιστή - + Folder %1: %2 Φάκελος %1: %2 - + No sync folders configured. Δεν έχουν οριστεί φάκελοι συγχρονισμού. - + None. Κανένας. - + Recent Changes Πρόσφατες Αλλαγές - + Open %1 folder Άνοιγμα %1 φακέλου - + Managed Folders: Φάκελοι υπό Διαχείριση: - + Open folder '%1' Άνοιγμα φακέλου '%1' - + Open %1 in browser Άνοιγμα %1 στον περιηγητή - + Calculating quota... Υπολογισμός μεριδίου χώρου αποθήκευσης... - + Unknown status Άγνωστη κατάσταση - + Settings... Ρυθμίσεις... - + Details... Λεπτομέρειες... - + Help Βοήθεια - + Quit %1 Κλείσιμο %1 - + Sign in... Σύνδεση... - + Sign out Αποσύνδεση - + Quota n/a Μερίδιο χώρου αποθήκευσης μ/δ - + %1% of %2 in use %1% από %2 σε χρήση - + No items synced recently Κανένα στοιχείο δεν συγχρονίστηκε πρόσφατα - + Syncing %1 of %2 (%3 left) Συγχρονισμός %1 από %2 (%3 απομένουν) - + Syncing %1 (%2 left) Συγχρονισμός %1 (%2 απομένουν) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Ενημερωμένο diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts index a01810e4c1..d1d798e8ec 100644 --- a/translations/mirall_en.ts +++ b/translations/mirall_en.ts @@ -212,22 +212,22 @@ Total time left %5 Mirall::AuthenticationDialog - + Authentication Required - + Enter username and password for '%1' at %2. - + &User: - + &Password: @@ -1079,126 +1079,126 @@ It is not advisable to use it. Mirall::OwncloudSetupWizard - + Folder rename failed - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> - + Trying to connect to %1 at %2... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> - + Error: Wrong credentials. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> - + Creating local sync folder %1... - + ok - + failed. - + Could not create local folder %1 - - + + Failed to connect to %1 at %2:<br/>%3 - + No remote folder specified! - + Error: %1 - + creating folder on ownCloud: %1 - + Remote folder %1 created successfully. - + The remote folder %1 already exists. Connecting it for syncing. - - + + The folder creation resulted in HTTP error code %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. - + Successfully connected to %1! - + Connection to %1 could not be established. Please check again. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. @@ -1206,10 +1206,15 @@ It is not advisable to use it. Mirall::OwncloudWizard - + %1 Connection Wizard + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1546,12 +1551,12 @@ It is not advisable to use it. Mirall::ShibbolethCredentials - + Login Error - + You must sign in as user %1 @@ -2022,127 +2027,127 @@ It is not advisable to use it. Mirall::ownCloudGui - + Please sign in - + Disconnected from server - + Folder %1: %2 - + No sync folders configured. - + None. - + Recent Changes - + Open %1 folder - + Managed Folders: - + Open folder '%1' - + Open %1 in browser - + Calculating quota... - + Unknown status - + Settings... - + Details... - + Help - + Quit %1 - + Sign in... - + Sign out - + Quota n/a - + %1% of %2 in use - + No items synced recently - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts index 20d6998749..57c955e1ef 100644 --- a/translations/mirall_es.ts +++ b/translations/mirall_es.ts @@ -211,22 +211,22 @@ Tiempo restante %5 Mirall::AuthenticationDialog - + Authentication Required Autenticación requerida - + Enter username and password for '%1' at %2. Ingresar usuario y contraseña para '%1' en %2. - + &User: &Usuario: - + &Password: &Contraseña: @@ -1084,126 +1084,126 @@ No se recomienda usarlo. Mirall::OwncloudSetupWizard - + Folder rename failed Error Renombrando Carpeta - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Carpeta de sincronización local %1 creada con éxito</b></font> - + Trying to connect to %1 at %2... Intentando conectar a %1 desde %2... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Conectado con éxito a %1: versión %2 %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Error: Credenciales erróneas. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> La carpeta de sincronización local %1 ya existe, configurándola para la sincronización.<br/><br/> - + Creating local sync folder %1... Creando la carpeta de sincronización local %1... - + ok ok - + failed. falló. - + Could not create local folder %1 No se pudo crear carpeta local %1 - - + + Failed to connect to %1 at %2:<br/>%3 Error conectando con %1 en %2:<br/>%3 - + No remote folder specified! No se ha especificado la carpeta remota! - + Error: %1 Error: %1 - + creating folder on ownCloud: %1 creando carpeta en ownCloud: %1 - + Remote folder %1 created successfully. Carpeta remota %1 creado correctamente. - + The remote folder %1 already exists. Connecting it for syncing. La carpeta remota %1 ya existe. Conectándola para sincronizacion. - - + + The folder creation resulted in HTTP error code %1 La creación de la carpeta causó un error HTTP de código %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> ¡La creación de la carpeta remota ha fallado debido a que las credenciales proporcionadas son incorrectas!<br/>Por favor, vuelva atrás y comprueba sus credenciales</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">La creación de la carpeta remota ha fallado, probablemente porque las credenciales proporcionadas son incorrectas.</font><br/>Por favor, vuelva atrás y compruebe sus credenciales.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Creación %1 de carpeta remota ha fallado con el error <tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. Una conexión de sincronización desde %1 al directorio remoto %2 ha sido configurada. - + Successfully connected to %1! ¡Conectado con éxito a %1! - + Connection to %1 could not be established. Please check again. Conexión a %1 no se pudo establecer. Por favor compruebelo de nuevo. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. No se puede eliminar y respaldar la carpeta porque la misma o un fichero en ella está abierto por otro programa. Por favor, cierre la carpeta o el fichero y reintente, o cancele la instalación. @@ -1211,10 +1211,15 @@ No se recomienda usarlo. Mirall::OwncloudWizard - + %1 Connection Wizard Asistente de Conexión %1 + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1552,12 +1557,12 @@ Intente sincronizar los archivos nuevamente. Mirall::ShibbolethCredentials - + Login Error Error al iniciar sesión - + You must sign in as user %1 Debe iniciar sesión como el usuario %1 @@ -2030,127 +2035,127 @@ Intente sincronizar los archivos nuevamente. Mirall::ownCloudGui - + Please sign in Por favor Registrese - + Disconnected from server Desconectado del servidor - + Folder %1: %2 Archivo %1: %2 - + No sync folders configured. No hay carpetas de sincronización configuradas. - + None. Ninguno. - + Recent Changes Cambios recientes - + Open %1 folder Abrir carpeta %1 - + Managed Folders: Carpetas administradas: - + Open folder '%1' Abrir carpeta '%1' - + Open %1 in browser Abrir %1 en el navegador - + Calculating quota... Calculando cuota... - + Unknown status Estado desconocido - + Settings... Configuraciones... - + Details... Detalles... - + Help Ayuda - + Quit %1 Salir de %1 - + Sign in... Registrarse... - + Sign out Cerrar sesión - + Quota n/a Cuota no disponible - + %1% of %2 in use %1% de %2 en uso - + No items synced recently No se han sincronizado elementos recientemente - + Syncing %1 of %2 (%3 left) Sincronizando %1 de %2 (quedan %3) - + Syncing %1 (%2 left) Sincronizando %1 (quedan %2) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Actualizado diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts index 66dce1748d..e138c84ed4 100644 --- a/translations/mirall_es_AR.ts +++ b/translations/mirall_es_AR.ts @@ -210,22 +210,22 @@ Total time left %5 Mirall::AuthenticationDialog - + Authentication Required - + Enter username and password for '%1' at %2. - + &User: - + &Password: &Contraseña @@ -1081,126 +1081,126 @@ It is not advisable to use it. Mirall::OwncloudSetupWizard - + Folder rename failed Error Al Renombrar Directorio - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Directorio local %1 creado</b></font> - + Trying to connect to %1 at %2... Intentando conectar a %1 en %2... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Conectado a %1: versión de %2 %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Error: Credenciales erróneas. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> El directorio de sincronización local %1 ya existe, configurándolo para la sincronización.<br/><br/> - + Creating local sync folder %1... Creando el directorio %1... - + ok aceptar - + failed. Error. - + Could not create local folder %1 No fue posible crear el directorio local %1 - - + + Failed to connect to %1 at %2:<br/>%3 Falló al conectarse a %1 en %2:<br/>%3 - + No remote folder specified! ¡No se ha especificado un directorio remoto! - + Error: %1 Error: %1 - + creating folder on ownCloud: %1 Creando carpeta en ownCloud: %1 - + Remote folder %1 created successfully. El directorio remoto %1 fue creado con éxito. - + The remote folder %1 already exists. Connecting it for syncing. El directorio remoto %1 ya existe. Estableciendo conexión para sincronizar. - - + + The folder creation resulted in HTTP error code %1 La creación del directorio resultó en un error HTTP con código de error %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> <p><font color="red">Error al crear el directorio remoto porque las credenciales provistas son incorrectas.</font><br/>Por favor, volvé atrás y verificá tus credenciales.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Error al crear el directorio remoto, probablemente porque las credenciales provistas son incorrectas.</font><br/>Por favor, volvé atrás y verificá tus credenciales.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Se prtodujo un error <tt>%2</tt> al crear el directorio remoto %1. - + A sync connection from %1 to remote directory %2 was set up. Fue creada una conexión de sincronización desde %1 al directorio remoto %2. - + Successfully connected to %1! Conectado con éxito a %1! - + Connection to %1 could not be established. Please check again. No fue posible establecer la conexión a %1. Por favor, intentalo nuevamente. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. @@ -1208,10 +1208,15 @@ It is not advisable to use it. Mirall::OwncloudWizard - + %1 Connection Wizard %1 Asistente de Conexión + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1549,12 +1554,12 @@ Intente sincronizar estos nuevamente. Mirall::ShibbolethCredentials - + Login Error - + You must sign in as user %1 @@ -2025,127 +2030,127 @@ Intente sincronizar estos nuevamente. Mirall::ownCloudGui - + Please sign in Por favor, inicie sesión - + Disconnected from server - + Folder %1: %2 Directorio %1: %2 - + No sync folders configured. Los directorios de sincronización no están configurados. - + None. Ninguno. - + Recent Changes Cambios recientes - + Open %1 folder Abrir directorio %1 - + Managed Folders: Directorios administrados: - + Open folder '%1' Abrir carpeta '%1' - + Open %1 in browser Abrir %1 en el navegador... - + Calculating quota... Calculando cuota... - + Unknown status Estado desconocido - + Settings... Configuraciones... - + Details... Detalles... - + Help Ayuda - + Quit %1 Cancelar %1 - + Sign in... Iniciando sesión... - + Sign out Salir - + Quota n/a Cuota no disponible - + %1% of %2 in use %1% de %2 en uso - + No items synced recently No se sincronizaron elementos recientemente - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) %1 (%2, %3) - + Up to date actualizado diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts index 559aeafb75..6d95c286e1 100644 --- a/translations/mirall_et.ts +++ b/translations/mirall_et.ts @@ -211,22 +211,22 @@ Aega kokku jäänud %5 Mirall::AuthenticationDialog - + Authentication Required Vajalik on autentimine. - + Enter username and password for '%1' at %2. Sisesta kasutajanimi ja parool '%1' %2 - + &User: &User: - + &Password: &Parool: @@ -1084,126 +1084,126 @@ Selle kasutamine pole soovitatav. Mirall::OwncloudSetupWizard - + Folder rename failed Kataloogi ümbernimetamine ebaõnnestus - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Kohalik kataloog %1 edukalt loodud!</b></font> - + Trying to connect to %1 at %2... Püüan ühenduda %1 kohast %2 - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Edukalt ühendatud %1: %2 versioon %3 (4)</font><br/><br/> - + Error: Wrong credentials. Viga: Valed kasutajaandmed. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Kohalik kataloog %1 on juba olemas. Valmistan selle ette sünkroniseerimiseks. - + Creating local sync folder %1... Kohaliku kausta %1 sünkroonimise loomine ... - + ok ok - + failed. ebaõnnestus. - + Could not create local folder %1 Ei suuda tekitada kohalikku kataloogi %1 - - + + Failed to connect to %1 at %2:<br/>%3 Ühendumine ebaõnnestus %1 %2-st:<br/>%3 - + No remote folder specified! Ühtegi võrgukataloogi pole määratletud! - + Error: %1 Viga: %1 - + creating folder on ownCloud: %1 loon uue kataloogi ownCloudi: %1 - + Remote folder %1 created successfully. Eemalolev kaust %1 on loodud. - + The remote folder %1 already exists. Connecting it for syncing. Serveris on kataloog %1 juba olemas. Ühendan selle sünkroniseerimiseks. - - + + The folder creation resulted in HTTP error code %1 Kausta tekitamine lõppes HTTP veakoodiga %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> Kataloogi loomine serverisse ebaõnnestus, kuna kasutajatõendid on valed!<br/>Palun kontrolli oma kasutajatunnust ja parooli.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Serveris oleva kataloogi tekitamine ebaõnnestus tõenäoliselt valede kasutajatunnuste tõttu.</font><br/>Palun mine tagasi ning kontrolli kasutajatunnust ning parooli.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Kataloogi %1 tekitamine serverisse ebaõnnestus veaga <tt>%2</tt> - + A sync connection from %1 to remote directory %2 was set up. Loodi sünkroniseerimisühendus kataloogist %1 serveri kataloogi %2 - + Successfully connected to %1! Edukalt ühendatud %1! - + Connection to %1 could not be established. Please check again. Ühenduse loomine %1 ebaõnnestus. Palun kontrolli uuesti. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. Ei suuda eemaldada ning varundada kataloogi kuna kataloog või selles asuv fail on avatud mõne teise programmi poolt. Palun sulge kataloog või fail ning proovi uuesti või katkesta paigaldus. @@ -1211,10 +1211,15 @@ Selle kasutamine pole soovitatav. Mirall::OwncloudWizard - + %1 Connection Wizard %1 seadistamise juhendaja + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1552,12 +1557,12 @@ Proovi neid uuesti sünkroniseerida. Mirall::ShibbolethCredentials - + Login Error Sisselogimise viga - + You must sign in as user %1 Pead sisse logima kui kasutaja %1 @@ -2030,127 +2035,127 @@ Proovi neid uuesti sünkroniseerida. Mirall::ownCloudGui - + Please sign in Palun logi sisse - + Disconnected from server Serverist lahtiühendatud - + Folder %1: %2 Kaust %1: %2 - + No sync folders configured. Sünkroniseeritavaid kaustasid pole seadistatud. - + None. Pole. - + Recent Changes Hiljutised muudatused - + Open %1 folder Ava kaust %1 - + Managed Folders: Hallatavad kaustad: - + Open folder '%1' Ava kaust '%1' - + Open %1 in browser Ava %1 veebilehitsejas - + Calculating quota... Mahupiiri arvutamine... - + Unknown status Tundmatu staatus - + Settings... Seaded... - + Details... Üksikasjad... - + Help Abiinfo - + Quit %1 Lõpeta %1 - + Sign in... Logi sisse... - + Sign out Logi välja - + Quota n/a Mahupiir n/a - + %1% of %2 in use Kasutusel %1% / %2 - + No items synced recently Ühtegi üksust pole hiljuti sünkroniseeritud - + Syncing %1 of %2 (%3 left) Sünkroniseerin %1 %2-st (%3 veel) - + Syncing %1 (%2 left) Sünkroniseerin %1 (%2 veel) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Ajakohane diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts index d281af9d4d..746a2af1df 100644 --- a/translations/mirall_eu.ts +++ b/translations/mirall_eu.ts @@ -211,22 +211,22 @@ Geratzen den denbora %5 Mirall::AuthenticationDialog - + Authentication Required Autentikazioa beharrezkoa - + Enter username and password for '%1' at %2. Sartu erabiltzaile izena eta pasahitza '%1'-rentzat hemen: %2. - + &User: &Erabiltzailea: - + &Password: &Pasahitza: @@ -1083,126 +1083,126 @@ It is not advisable to use it. Mirall::OwncloudSetupWizard - + Folder rename failed Karpetaren berrizendatzeak huts egin du - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Bertako sinkronizazio %1 karpeta ongi sortu da!</b></font> - + Trying to connect to %1 at %2... %2 zerbitzarian dagoen %1 konektatzen... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Konexioa ongi burutu da %1 zerbitzarian: %2 bertsioa %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Errorea: Kredentzial okerrak. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Bertako %1 karpeta dagoeneko existitzen da, sinkronizaziorako prestatzen.<br/><br/> - + Creating local sync folder %1... Bertako sinkronizazio %1 karpeta sortzen... - + ok ados - + failed. huts egin du. - + Could not create local folder %1 Ezin da %1 karpeta lokala sortu - - + + Failed to connect to %1 at %2:<br/>%3 - + No remote folder specified! Ez da urruneko karpeta zehaztu! - + Error: %1 Errorea: %1 - + creating folder on ownCloud: %1 ownClouden karpeta sortzen: %1 - + Remote folder %1 created successfully. Urruneko %1 karpeta ongi sortu da. - + The remote folder %1 already exists. Connecting it for syncing. Urruneko %1 karpeta dagoeneko existintzen da. Bertara konetatuko da sinkronizatzeko. - - + + The folder creation resulted in HTTP error code %1 Karpeta sortzeak HTTP %1 errore kodea igorri du - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> Huts egin du urrutiko karpeta sortzen emandako kredintzialak ez direlako zuzenak!<br/> Egin atzera eta egiaztatu zure kredentzialak.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Urruneko karpeten sortzeak huts egin du ziuraski emandako kredentzialak gaizki daudelako.</font><br/>Mesedez atzera joan eta egiaztatu zure kredentzialak.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Urruneko %1 karpetaren sortzeak huts egin du <tt>%2</tt> errorearekin. - + A sync connection from %1 to remote directory %2 was set up. Sinkronizazio konexio bat konfiguratu da %1 karpetatik urruneko %2 karpetara. - + Successfully connected to %1! %1-era ongi konektatu da! - + Connection to %1 could not be established. Please check again. %1 konexioa ezin da ezarri. Mesedez egiaztatu berriz. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. @@ -1210,10 +1210,15 @@ It is not advisable to use it. Mirall::OwncloudWizard - + %1 Connection Wizard %1 Konexio Morroia + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1551,12 +1556,12 @@ Saiatu horiek berriz sinkronizatzen. Mirall::ShibbolethCredentials - + Login Error - + You must sign in as user %1 @@ -2027,127 +2032,127 @@ Saiatu horiek berriz sinkronizatzen. Mirall::ownCloudGui - + Please sign in Mesedez saioa hasi - + Disconnected from server - + Folder %1: %2 - + No sync folders configured. Ez dago sinkronizazio karpetarik definituta. - + None. Bat ere ez. - + Recent Changes Azkenengo Aldaketak - + Open %1 folder Ireki %1 karpeta - + Managed Folders: Kudeatutako karpetak: - + Open folder '%1' Ireki '%1' karpeta - + Open %1 in browser Ireki %1 arakatzailean - + Calculating quota... - + Unknown status Egoera ezezaguna - + Settings... Ezarpenak... - + Details... Xehetasunak... - + Help Laguntza - + Quit %1 %1etik Irten - + Sign in... Saioa hasi... - + Sign out Saioa bukatu - + Quota n/a - + %1% of %2 in use %2tik %%1 erabilita - + No items synced recently Ez da azken aldian ezer sinkronizatu - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Eguneratua diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts index 65ed0f45ec..b7a6a2276f 100644 --- a/translations/mirall_fa.ts +++ b/translations/mirall_fa.ts @@ -47,7 +47,7 @@ Folders - + پوشه ها @@ -70,12 +70,12 @@ Edit Ignored Files - + ویرایش فایل های در نظر گرفته نشده Modify Account - + ویرایش حساب کاربری @@ -101,7 +101,7 @@ Add Folder... - + افزودن پوشه... @@ -121,7 +121,7 @@ Resume - + از سر گیری @@ -210,22 +210,22 @@ Total time left %5 Mirall::AuthenticationDialog - + Authentication Required - + Enter username and password for '%1' at %2. - + &User: - + &کاربر: - + &Password: &رمزعبور: @@ -283,7 +283,7 @@ Total time left %5 %1: %2 - + %1: %2 @@ -295,7 +295,7 @@ Total time left %5 %1 has been removed. %1 names a file. - + %1 حذف شده است. @@ -307,7 +307,7 @@ Total time left %5 %1 has been downloaded. %1 names a file. - + %1 بارگزاری شد. @@ -344,7 +344,7 @@ Total time left %5 Sync Activity - + فعالیت همگام سازی @@ -366,7 +366,7 @@ Are you sure you want to perform this operation? Keep files - + نگه داشتن فایل ها @@ -424,7 +424,7 @@ Are you sure you want to perform this operation? User Abort. - + خارج کردن کاربر. @@ -538,7 +538,7 @@ Are you sure you want to perform this operation? Add Remote Folder - + افزودن پوشه از راه دور @@ -582,7 +582,7 @@ Are you sure you want to perform this operation? <b>Warning:</b> - + <b>اخطار:</b> @@ -605,7 +605,7 @@ Are you sure you want to perform this operation? Connection Timeout - + تایم اوت اتصال @@ -618,7 +618,7 @@ Are you sure you want to perform this operation? General Settings - + تنظیمات عمومی @@ -644,7 +644,7 @@ Are you sure you want to perform this operation? Updates - + به روز رسانی ها @@ -657,7 +657,7 @@ Are you sure you want to perform this operation? Enter Password - + رمز را وارد کنید @@ -712,12 +712,12 @@ Checked items will also be deleted if they prevent a directory from being remove Edit Ignore Pattern - + ویرایش الگوی نادیده گرفته شده Edit ignore pattern: - + ویرایش الگوی نادیده گرفته شده: @@ -1077,126 +1077,126 @@ It is not advisable to use it. Mirall::OwncloudSetupWizard - + Folder rename failed تغییر نام پوشه ناموفق بود - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b> پوشه همگام سازی محلی %1 با موفقیت ساخته شده است!</b></font> - + Trying to connect to %1 at %2... تلاش برای اتصال %1 به %2... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green"> با موفقیت متصل شده است به %1: %2 نسخه %3 (%4)</font><br/><br/> - + Error: Wrong credentials. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> پوشه همگام سازی محلی %1 در حال حاضر موجود است، تنظیم آن برای همگام سازی. <br/><br/> - + Creating local sync folder %1... ایجاد پوشه همگام سازی محلی %1... - + ok خوب - + failed. ناموفق. - + Could not create local folder %1 نمی تواند پوشه محلی ایجاد کند %1 - - + + Failed to connect to %1 at %2:<br/>%3 - + No remote folder specified! - + Error: %1 خطا: %1 - + creating folder on ownCloud: %1 ایجاد کردن پوشه بر روی ownCloud: %1 - + Remote folder %1 created successfully. پوشه از راه دور %1 با موفقیت ایجاد شده است. - + The remote folder %1 already exists. Connecting it for syncing. در حال حاضر پوشه از راه دور %1 موجود است. برای همگام سازی به آن متصل شوید. - - + + The folder creation resulted in HTTP error code %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> ایجاد پوشه از راه دور ناموفق بود به علت اینکه اعتبارهای ارائه شده اشتباه هستند!<br/>لطفا اعتبارهای خودتان را بررسی کنید.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red"> ایجاد پوشه از راه دور ناموفق بود، شاید به علت اعتبارهایی که ارئه شده اند، اشتباه هستند.</font><br/> لطفا باز گردید و اعتبار خود را بررسی کنید.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. ایجاد پوشه از راه دور %1 ناموفق بود با خطا <tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. یک اتصال همگام سازی از %1 تا %2 پوشه از راه دور راه اندازی شد. - + Successfully connected to %1! با موفقیت به %1 اتصال یافت! - + Connection to %1 could not be established. Please check again. اتصال به %1 نمی تواند مقرر باشد. لطفا دوباره بررسی کنید. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. @@ -1204,10 +1204,15 @@ It is not advisable to use it. Mirall::OwncloudWizard - + %1 Connection Wizard + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1242,7 +1247,7 @@ It is not advisable to use it. Connection Timeout - + تایم اوت اتصال @@ -1406,7 +1411,7 @@ It is not advisable to use it. Sync Activity - + فعالیت همگام سازی @@ -1544,12 +1549,12 @@ It is not advisable to use it. Mirall::ShibbolethCredentials - + Login Error - + You must sign in as user %1 @@ -2006,7 +2011,7 @@ It is not advisable to use it. %1: %2 - + %1: %2 @@ -2020,127 +2025,127 @@ It is not advisable to use it. Mirall::ownCloudGui - + Please sign in - + Disconnected from server - + Folder %1: %2 پوشه %1: %2 - + No sync folders configured. هیچ پوشه ای همگام سازی شده‌ای تنظیم نشده است - + None. - + Recent Changes - + Open %1 folder بازکردن %1 پوشه - + Managed Folders: پوشه های مدیریت شده: - + Open folder '%1' - + Open %1 in browser - + Calculating quota... - + Unknown status - + Settings... - + Details... - + Help راه‌نما - + Quit %1 - + Sign in... - + Sign out - + Quota n/a - + %1% of %2 in use - + No items synced recently - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date تا تاریخ diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts index 60a482565c..103ef80153 100644 --- a/translations/mirall_fi.ts +++ b/translations/mirall_fi.ts @@ -211,22 +211,22 @@ Aikaa jäljellä yhteensä %5 Mirall::AuthenticationDialog - + Authentication Required Tunnistautuminen vaaditaan - + Enter username and password for '%1' at %2. - + &User: K&äyttäjä: - + &Password: &Salasana: @@ -1080,126 +1080,126 @@ Osoitteen käyttäminen ei ole suositeltavaa. Mirall::OwncloudSetupWizard - + Folder rename failed Kansion nimen muuttaminen epäonnistui - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Paikallinen synkronointikansio %1 luotu onnistuneesti!</b></font> - + Trying to connect to %1 at %2... Yritetään yhdistetää palvelimeen %1 portissa %2... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Muodostettu yhteys onnistuneesti kohteeseen %1: %2 versio %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Virhe: väärät tilitiedot. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Paikallinen kansio %1 on jo olemassa, asetetaan se synkronoitavaksi.<br/><br/> - + Creating local sync folder %1... Luodaan paikallista synkronointikansiota %1... - + ok ok - + failed. epäonnistui. - + Could not create local folder %1 Paikalliskansion %1 luonti epäonnistui - - + + Failed to connect to %1 at %2:<br/>%3 Yhteys %1iin osoitteessa %2 epäonnistui:<br/>%3 - + No remote folder specified! Etäkansiota ei määritelty! - + Error: %1 Virhe: %1 - + creating folder on ownCloud: %1 luodaan kansio ownCloudiin: %1 - + Remote folder %1 created successfully. Etäkansio %1 luotiin onnistuneesti. - + The remote folder %1 already exists. Connecting it for syncing. Etäkansio %1 on jo olemassa. Otetaan siihen yhteyttä tiedostojen täsmäystä varten. - - + + The folder creation resulted in HTTP error code %1 Kansion luonti aiheutti HTTP-virhekoodin %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> Etäkansion luominen epäonnistui koska antamasi tunnus/salasana ei täsmää!<br/>Ole hyvä ja palaa tarkistamaan tunnus/salasana</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Pilvipalvelun etäkansion luominen ei onnistunut , koska tunnistautumistietosi ovat todennäköisesti väärin.</font><br/>Palaa takaisin ja tarkista käyttäjätunnus ja salasana.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Etäkansion %1 luonti epäonnistui, virhe <tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. Täsmäysyhteys kansiosta %1 etäkansioon %2 on asetettu. - + Successfully connected to %1! Yhteys kohteeseen %1 muodostettiin onnistuneesti! - + Connection to %1 could not be established. Please check again. Yhteyttä osoitteeseen %1 ei voitu muodostaa. Ole hyvä ja tarkista uudelleen. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. @@ -1207,10 +1207,15 @@ Osoitteen käyttäminen ei ole suositeltavaa. Mirall::OwncloudWizard - + %1 Connection Wizard %1-yhteysavustaja + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1547,12 +1552,12 @@ Osoitteen käyttäminen ei ole suositeltavaa. Mirall::ShibbolethCredentials - + Login Error Kirjautumisvirhe - + You must sign in as user %1 Kirjaudu käyttäjänä %1 @@ -2025,127 +2030,127 @@ Osoitteen käyttäminen ei ole suositeltavaa. Mirall::ownCloudGui - + Please sign in Kirjaudu sisään - + Disconnected from server Yhteys palvelimeen katkaistu - + Folder %1: %2 Kansio %1: %2 - + No sync folders configured. Synkronointikansioita ei ole määritetty. - + None. - + Recent Changes Viimeisimmät muutokset - + Open %1 folder Avaa %1-kansio - + Managed Folders: Hallitut kansiot: - + Open folder '%1' Avaa kansio '%1' - + Open %1 in browser Avaa %1 selaimeen - + Calculating quota... Lasketaan kiintiötä... - + Unknown status Tuntematon tila - + Settings... Asetukset... - + Details... Tiedot... - + Help Ohje - + Quit %1 Lopeta %1 - + Sign in... Kirjaudu sisään... - + Sign out Kirjaudu ulos - + Quota n/a - + %1% of %2 in use %1%/%2 käytössä - + No items synced recently Kohteita ei ole synkronoitu äskettäin - + Syncing %1 of %2 (%3 left) Synkronoidaan %1/%2 (%3 jäljellä) - + Syncing %1 (%2 left) Synkronoidaan %1 (%2 jäljellä) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Ajan tasalla diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts index e0af42ca0f..2d61f25233 100644 --- a/translations/mirall_fr.ts +++ b/translations/mirall_fr.ts @@ -211,22 +211,22 @@ Temps restant total %5 Mirall::AuthenticationDialog - + Authentication Required Authentification requise - + Enter username and password for '%1' at %2. Saisir le nom d'utilisateur et le mot de passe pour '%1' sur %2. - + &User: &Utilisateur : - + &Password: &Mot de passe : @@ -1084,126 +1084,126 @@ Il est déconseillé de l'utiliser. Mirall::OwncloudSetupWizard - + Folder rename failed Echec du renommage du dossier - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Dossier de synchronisation local %1 créé avec succès !</b></font> - + Trying to connect to %1 at %2... Tentative de connexion de %1 à %2 ... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Connecté avec succès à %1: %2 version %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Erreur : paramètres de connexion invalides. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Le dossier de synchronisation local %1 existe déjà, configuration de la synchronisation.<br/><br/> - + Creating local sync folder %1... Création du dossier de synchronisation local %1 … - + ok ok - + failed. échoué. - + Could not create local folder %1 Impossible de créer le répertoire local %1 - - + + Failed to connect to %1 at %2:<br/>%3 Échec de la connexion à %1 pour %2:<br/>%3 - + No remote folder specified! Aucun dossier distant n'est spécifié ! - + Error: %1 Erreur : %1 - + creating folder on ownCloud: %1 création d'un répertoire sur ownCloud : %1 - + Remote folder %1 created successfully. Le dossier distant %1 a été créé avec succès. - + The remote folder %1 already exists. Connecting it for syncing. Le dossier distant %1 existe déjà. Veuillez vous y connecter pour la synchronisation. - - + + The folder creation resulted in HTTP error code %1 La création du dossier a généré le code d'erreur HTTP %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> La création du répertoire distant a échoué car les identifiants de connexion sont erronés !<br/>Veuillez revenir en arrière et vérifier ces derniers.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">La création du dossier distant a échoué probablement parce que les informations d'identification fournies sont fausses.</font><br/>Veuillez revenir à l'étape précédente et vérifier vos informations d'identification.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. La création du dossier distant "%1" a échouée avec l'erreur <tt>%2</tt> - + A sync connection from %1 to remote directory %2 was set up. Une synchronisation entre le dossier local %1 et le dossier distant %2 a été configurée. - + Successfully connected to %1! Connecté avec succès à %1! - + Connection to %1 could not be established. Please check again. La connexion à %1 n'a pu être établie. Essayez encore svp. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. Impossible de supprimer et de sauvegarder le dossier parce que ce dossier ou un de ces fichiers est ouvert dans un autre programme. Veuillez fermer le dossier ou le fichier et cliquez sur ré-essayer ou annuler l'installation. @@ -1211,10 +1211,15 @@ Il est déconseillé de l'utiliser. Mirall::OwncloudWizard - + %1 Connection Wizard %1 Assistant de Connexion + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1552,12 +1557,12 @@ Il est déconseillé de l'utiliser. Mirall::ShibbolethCredentials - + Login Error Erreur de connexion - + You must sign in as user %1 Vous devez vous connecter en tant qu'utilisateur %1 @@ -2030,127 +2035,127 @@ Il est déconseillé de l'utiliser. Mirall::ownCloudGui - + Please sign in Veuillez vous connecter - + Disconnected from server Déconnecte du serveur - + Folder %1: %2 Dossier %1 : %2 - + No sync folders configured. Aucun répertoire synchronisé n'est configuré. - + None. Aucun. - + Recent Changes Modifications récentes - + Open %1 folder Ouvrir le répertoire %1 - + Managed Folders: Répertoires suivis : - + Open folder '%1' Ouvrir le dossier '%1' - + Open %1 in browser Ouvrir %1 dans le navigateur - + Calculating quota... Calcul du quota... - + Unknown status Statut inconnu - + Settings... Paramètres... - + Details... Détails... - + Help Aide - + Quit %1 Quitter %1 - + Sign in... Se connecter... - + Sign out Se déconnecter - + Quota n/a Quota n/a - + %1% of %2 in use %1% de %2 occupés - + No items synced recently Aucun item synchronisé récemment - + Syncing %1 of %2 (%3 left) Synchronisation %1 de %2 (%3 restant) - + Syncing %1 (%2 left) Synchronisation %1 (%2 restant) - + %1 (%2, %3) %1 (%2, %3) - + Up to date À jour diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts index 31224a6b84..c620e2c755 100644 --- a/translations/mirall_gl.ts +++ b/translations/mirall_gl.ts @@ -211,22 +211,22 @@ Tempo total restante %5 Mirall::AuthenticationDialog - + Authentication Required É necesario autenticarse - + Enter username and password for '%1' at %2. Escriba o nome de usuario e o contrasinal para «%1» en %2. - + &User: &Usuario: - + &Password: &Contrasinal: @@ -1084,126 +1084,126 @@ Recomendámoslle que non o use. Mirall::OwncloudSetupWizard - + Folder rename failed Non foi posíbel renomear o cartafol - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>O cartafol local de sincronización %1 creouse correctamente!</b></font> - + Trying to connect to %1 at %2... Tentando conectarse a %1 en %2... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Conectouse correctamente a %1: %2 versión %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Erro: Credenciais incorrectas. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> O cartafol de sincronización local %1 xa existe. Configurándoo para a sincronización.<br/><br/> - + Creating local sync folder %1... Creando un cartafol local de sincronización %1... - + ok aceptar - + failed. fallou. - + Could not create local folder %1 Non foi posíbel crear o cartafol local %1 - - + + Failed to connect to %1 at %2:<br/>%3 Non foi posíbel conectar con %1 en %2:<br/>%3 - + No remote folder specified! Non foi especificado o cartafol remoto! - + Error: %1 Erro: %1 - + creating folder on ownCloud: %1 creando o cartafol en ownCloud: %1 - + Remote folder %1 created successfully. O cartafol remoto %1 creouse correctamente. - + The remote folder %1 already exists. Connecting it for syncing. O cartafol remoto %1 xa existe. Conectándoo para a sincronización. - - + + The folder creation resulted in HTTP error code %1 A creación do cartafol resultou nun código de erro HTTP %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> A creación do cartafol remoto fracasou por por de seren incorrectas as credenciais!<br/>Volva atrás e comprobe as súas credenciais.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">A creación do cartafol remoto fallou probabelmente debido a que as credenciais que se deron non foran as correctas.</font><br/>Volva atrás e comprobe as súas credenciais.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Produciuse un fallo ao crear o cartafol remoto %1 e dou o erro <tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. Estabeleceuse a conexión de sincronización de %1 ao directorio remoto %2. - + Successfully connected to %1! Conectou satisfactoriamente con %1 - + Connection to %1 could not be established. Please check again. Non foi posíbel estabelecer a conexión con %1. Compróbeo de novo. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. Non é posíbel retirar e facer copia de seguranza do cartafol, xa que o cartafol ou un ficheiro está aberto noutro programa Peche o cartafol ou o ficheiro e tenteo de novo, ou cancele a acción. @@ -1211,10 +1211,15 @@ Recomendámoslle que non o use. Mirall::OwncloudWizard - + %1 Connection Wizard Asistente de conexión %1 + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1552,12 +1557,12 @@ Tente sincronizalos de novo. Mirall::ShibbolethCredentials - + Login Error Erro de acceso - + You must sign in as user %1 Ten que rexistrarse como usuario %1 @@ -2030,127 +2035,127 @@ Tente sincronizalos de novo. Mirall::ownCloudGui - + Please sign in Ten que rexistrarse - + Disconnected from server Desconectado do servidor - + Folder %1: %2 Cartafol %1: %2 - + No sync folders configured. Non se configuraron cartafoles de sincronización. - + None. Nada. - + Recent Changes Cambios recentes - + Open %1 folder Abrir o cartafol %1 - + Managed Folders: Cartafoles xestionados: - + Open folder '%1' Abrir o cartafol «%1» - + Open %1 in browser Abrir %1 nun navegador - + Calculating quota... Calculando a cota... - + Unknown status Estado descoñecido - + Settings... Axustes... - + Details... Detalles... - + Help Axuda - + Quit %1 Saír de %1 - + Sign in... Rexistrarse... - + Sign out Saír - + Quota n/a Cota n/d - + %1% of %2 in use Usado %1% de %2 - + No items synced recently Non hai elementos sincronizados recentemente - + Syncing %1 of %2 (%3 left) Sincronizando %1 of %2 (restan %3) - + Syncing %1 (%2 left) Sincronizando %1 (restan %2) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Actualizado diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts index 9b8fb9e8ee..31a87cfaa4 100644 --- a/translations/mirall_hu.ts +++ b/translations/mirall_hu.ts @@ -210,22 +210,22 @@ Total time left %5 Mirall::AuthenticationDialog - + Authentication Required - + Enter username and password for '%1' at %2. - + &User: - + &Password: &Jelszó: @@ -1077,126 +1077,126 @@ It is not advisable to use it. Mirall::OwncloudSetupWizard - + Folder rename failed A mappa átnevezése nem sikerült - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Helyi %1 szinkronizációs mappa sikeresen létrehozva!</b></font> - + Trying to connect to %1 at %2... Próbál kapcsolódni az %1-hoz: %2... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Sikeresen csatlakozott az %1-hoz: %2 verziószám %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Hiba: rossz azonosítási adatok - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> A helyi %1 mappa már létezik, állítsa be a szinkronizálódását.<br/><br/> - + Creating local sync folder %1... Helyi %1 szinkronizációs mappa létrehozása... - + ok ok - + failed. sikertelen. - + Could not create local folder %1 - - + + Failed to connect to %1 at %2:<br/>%3 - + No remote folder specified! - + Error: %1 Hiba: %1 - + creating folder on ownCloud: %1 - + Remote folder %1 created successfully. %1 távoli nappa sikeresen létrehozva. - + The remote folder %1 already exists. Connecting it for syncing. A %1 távoli mappa már létezik. Csatlakoztassa a szinkronizációhoz. - - + + The folder creation resulted in HTTP error code %1 A könyvtár létrehozásakor keletkezett HTTP hibakód %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">A távoli mappa létrehozása sikertelen, valószínűleg mivel hibásak a megdott hitelesítési adatok.</font><br/>Lépjen vissza és ellenőrizze a belépési adatokat.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. A távoli %1 mappa létrehozása nem sikerült. Hibaüzenet: <tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. A szinkronizációs kapcsolat a %1 és a %2 távoli mappa között létrejött. - + Successfully connected to %1! Sikeresen csatlakozva: %1! - + Connection to %1 could not be established. Please check again. A kapcsolat a %1 kiszolgálóhoz sikertelen. Ellenőrizze újra. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. @@ -1204,10 +1204,15 @@ It is not advisable to use it. Mirall::OwncloudWizard - + %1 Connection Wizard %1 kapcsolódási varázsló + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1544,12 +1549,12 @@ It is not advisable to use it. Mirall::ShibbolethCredentials - + Login Error - + You must sign in as user %1 @@ -2020,127 +2025,127 @@ It is not advisable to use it. Mirall::ownCloudGui - + Please sign in Belépés szükséges - + Disconnected from server - + Folder %1: %2 Mappa %1: %2 - + No sync folders configured. Nincsenek megadva szinkronizálandó mappák. - + None. Nincs - + Recent Changes Legutóbbi változások - + Open %1 folder %1 mappa megnyitása - + Managed Folders: Kezelt mappák: - + Open folder '%1' - + Open %1 in browser - + Calculating quota... Kvóta kiszámítása... - + Unknown status Ismeretlen állapot - + Settings... Beállítások... - + Details... Részletek... - + Help Súgó - + Quit %1 - + Sign in... Belépés... - + Sign out Kilépés - + Quota n/a Kvóta n/a - + %1% of %2 in use - + No items synced recently - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date Frissítve diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts index 9eaf78566a..45cbb21e94 100644 --- a/translations/mirall_it.ts +++ b/translations/mirall_it.ts @@ -211,22 +211,22 @@ Totale tempo rimanente %5 Mirall::AuthenticationDialog - + Authentication Required Autenticazione richiesta - + Enter username and password for '%1' at %2. Digita nome utente e password per '%1' su %2. - + &User: &Utente: - + &Password: &Password: @@ -1083,126 +1083,126 @@ Non è consigliabile utilizzarlo. Mirall::OwncloudSetupWizard - + Folder rename failed Rinomina cartella non riuscita - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Cartella locale %1 creta correttamente!</b></font> - + Trying to connect to %1 at %2... Tentativo di connessione a %1 su %2... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Connesso correttamente a %1: %2 versione %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Errore: credenziali non valide. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> La cartella di sincronizzazione locale %1 esiste già, impostata per la sincronizzazione.<br/><br/> - + Creating local sync folder %1... Creazione della cartella locale di sincronizzazione %1 in corso... - + ok ok - + failed. non riuscita. - + Could not create local folder %1 Impossibile creare la cartella locale %1 - - + + Failed to connect to %1 at %2:<br/>%3 Connessione a %1 su %2:<br/>%3 - + No remote folder specified! Nessuna cartella remota specificata! - + Error: %1 Errore: %1 - + creating folder on ownCloud: %1 creazione cartella su ownCloud: %1 - + Remote folder %1 created successfully. La cartella remota %1 è stata creata correttamente. - + The remote folder %1 already exists. Connecting it for syncing. La cartella remota %1 esiste già. Connessione in corso per la sincronizzazione - - + + The folder creation resulted in HTTP error code %1 La creazione della cartella ha restituito un codice di errore HTTP %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> La creazione della cartella remota non è riuscita poiché le credenziali fornite sono errate!<br/>Torna indietro e verifica le credenziali.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">La creazione della cartella remota non è riuscita probabilmente perché le credenziali fornite non sono corrette.</font><br/>Torna indietro e controlla le credenziali inserite.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Creazione della cartella remota %1 non riuscita con errore <tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. Una connessione di sincronizzazione da %1 alla cartella remota %2 è stata stabilita. - + Successfully connected to %1! Connessi con successo a %1! - + Connection to %1 could not be established. Please check again. La connessione a %1 non può essere stabilita. Prova ancora. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. Impossibile rimuovere o creare una copia di sicurezza della cartella poiché la cartella o un file in essa contenuto è aperta in un altro programma. Chiudi la cartella o il file e premi Riprova o annulla la configurazione. @@ -1210,10 +1210,15 @@ Non è consigliabile utilizzarlo. Mirall::OwncloudWizard - + %1 Connection Wizard Procedura guidata di connessione di %1 + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1551,12 +1556,12 @@ Prova a sincronizzare nuovamente. Mirall::ShibbolethCredentials - + Login Error Errore di accesso - + You must sign in as user %1 Devi accedere con l'utente %1 @@ -2029,127 +2034,127 @@ Prova a sincronizzare nuovamente. Mirall::ownCloudGui - + Please sign in Accedi - + Disconnected from server Disconnesso dal server - + Folder %1: %2 Cartella %1: %2 - + No sync folders configured. Nessuna cartella configurata per la sincronizzazione. - + None. Nessuna. - + Recent Changes Modifiche recenti - + Open %1 folder Apri la cartella %1 - + Managed Folders: Cartelle gestite: - + Open folder '%1' Apri la cartella '%1' - + Open %1 in browser Apri %1 nel browser... - + Calculating quota... Calcolo quota in corso... - + Unknown status Stato sconosciuto - + Settings... Impostazioni... - + Details... Dettagli... - + Help Aiuto - + Quit %1 Esci da %1 - + Sign in... Accedi... - + Sign out Esci - + Quota n/a Quota n/d - + %1% of %2 in use %1% di %2 utilizzati - + No items synced recently Nessun elemento sincronizzato di recente - + Syncing %1 of %2 (%3 left) Sincronizzazione di %1 di %2 (%3 rimanenti) - + Syncing %1 (%2 left) Sincronizzazione di %1 (%2 rimanenti) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Aggiornato diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts index e4c83a75ad..5c8fe3415b 100644 --- a/translations/mirall_ja.ts +++ b/translations/mirall_ja.ts @@ -211,22 +211,22 @@ Total time left %5 Mirall::AuthenticationDialog - + Authentication Required 認証が必要 - + Enter username and password for '%1' at %2. %2 で '%1' に対してユーザー名とパスワードを入力してください。 - + &User: &User: - + &Password: パスワード(&P) @@ -1082,126 +1082,126 @@ It is not advisable to use it. Mirall::OwncloudSetupWizard - + Folder rename failed フォルダー名の変更に失敗しました。 - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>ローカルの同期フォルダー %1 は正常に作成されました！</b></font> - + Trying to connect to %1 at %2... %2 の %1 へ接続を試みています... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">正常に %1 へ接続されました：%2 バージョン %3 (%4)</font><br/><br/> - + Error: Wrong credentials. エラー:資格情報が間違っています。 - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> ローカルの同期フォルダー %1 はすでに存在するため、同期の設定をしてください。<br/><br/> - + Creating local sync folder %1... ローカルの同期フォルダー %1 を作成中... - + ok OK - + failed. 失敗。 - + Could not create local folder %1 ローカルフォルダー %1 を作成できませんでした - - + + Failed to connect to %1 at %2:<br/>%3 %2 の %1 に接続に失敗:<br/>%3 - + No remote folder specified! リモートフォルダーが指定されていません！ - + Error: %1 エラー: %1 - + creating folder on ownCloud: %1 ownCloud上にフォルダーを作成中: %1 - + Remote folder %1 created successfully. リモートフォルダー %1 は正常に生成されました。 - + The remote folder %1 already exists. Connecting it for syncing. リモートフォルダー %1 はすでに存在します。同期のために接続しています。 - - + + The folder creation resulted in HTTP error code %1 フォルダーの作成はHTTPのエラーコード %1 で終了しました - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> 指定された資格情報が間違っているため、リモートフォルダーの作成に失敗しました！<br/>前に戻って資格情報を確認してください。</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">おそらく資格情報が間違っているため、リモートフォルダーの作成に失敗しました。</font><br/>前に戻り、資格情報をチェックしてください。</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. リモートフォルダー %1 の作成がエラーで失敗しました。<tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. %1 からリモートディレクトリ %2 への同期接続を設定しました。 - + Successfully connected to %1! %1への接続に成功しました！ - + Connection to %1 could not be established. Please check again. %1 への接続を確立できませんでした。もう一度確認してください。 - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. フォルダーまたはその中にあるファイルが他のプログラムで開かれているため、フォルダーの削除やバックアップができません。フォルダーまたはファイルを閉じてから再試行するか、セットアップをキャンセルしてください。 @@ -1209,10 +1209,15 @@ It is not advisable to use it. Mirall::OwncloudWizard - + %1 Connection Wizard %1 接続ウィザード + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1550,12 +1555,12 @@ It is not advisable to use it. Mirall::ShibbolethCredentials - + Login Error ログインエラー - + You must sign in as user %1 ユーザー %1 としてログインする必要があります @@ -2028,127 +2033,127 @@ It is not advisable to use it. Mirall::ownCloudGui - + Please sign in サインインしてください - + Disconnected from server サーバーから切断しました - + Folder %1: %2 フォルダー %1: %2 - + No sync folders configured. 同期フォルダーが設定されていません。 - + None. なし - + Recent Changes 最近変更されたファイル - + Open %1 folder %1 フォルダーを開く - + Managed Folders: 管理フォルダー: - + Open folder '%1' フォルダー ’%1’ を開く - + Open %1 in browser %1をブラウザーで開く - + Calculating quota... クォータを計算中... - + Unknown status 不明な状態 - + Settings... 設定 - + Details... 詳細... - + Help ヘルプ - + Quit %1 %1 を終了 - + Sign in... サインイン... - + Sign out サインアウト - + Quota n/a クォータ n/a - + %1% of %2 in use %2 のうち %1% を使用中 - + No items synced recently 最近同期されたアイテムはありません。 - + Syncing %1 of %2 (%3 left) 同期中 %2 中 %1 (残り %3) - + Syncing %1 (%2 left) 同期中 %1 (残り %2) - + %1 (%2, %3) %1 (%2, %3) - + Up to date 最新です diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts index da783522f7..de49824759 100644 --- a/translations/mirall_nl.ts +++ b/translations/mirall_nl.ts @@ -211,22 +211,22 @@ Totaal resterende tijd %5 Mirall::AuthenticationDialog - + Authentication Required Authenticatie vereist - + Enter username and password for '%1' at %2. Geen gebruikersnaam en wachtwoord op voor '%1' bij %2. - + &User: &Gebruiker: - + &Password: &Wachtwoord @@ -1084,126 +1084,126 @@ We adviseren deze site niet te gebruiken. Mirall::OwncloudSetupWizard - + Folder rename failed Hernoemen map mislukt - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Lokale synch map %1 is succesvol aangemaakt!</b></font> - + Trying to connect to %1 at %2... Probeer te verbinden met %1 om %2... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Succesvol verbonden met %1: %2 versie %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Fout: Verkeerde inloggegevens - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Lokale synch map %1 bestaat al, deze wordt ingesteld voor synchronisatie.<br/><br/> - + Creating local sync folder %1... Maak lokale synchronisatiemap %1... - + ok ok - + failed. mislukt. - + Could not create local folder %1 Kon lokale map %1 niet aanmaken - - + + Failed to connect to %1 at %2:<br/>%3 Kon geen verbinding maken met %1 op %2:<br/>%3 - + No remote folder specified! Geen externe map opgegeven! - + Error: %1 Fout: %1 - + creating folder on ownCloud: %1 aanmaken map op ownCloud: %1 - + Remote folder %1 created successfully. Externe map %1 succesvol gecreërd. - + The remote folder %1 already exists. Connecting it for syncing. De remote map %1 bestaat al. Verbinden voor synchroniseren. - - + + The folder creation resulted in HTTP error code %1 Het aanmaken van de map resulteerde in HTTP foutcode %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> Het aanmaken van de remote map is mislukt, waarschijnlijk omdat uw inloggegevens fout waren.<br/>Ga terug en controleer uw inloggegevens.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Het aanmaken van de remote map is mislukt, waarschijnlijk omdat uw inloggegevens fout waren.</font><br/>ga terug en controleer uw inloggevens.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Aanmaken van remote map %1 mislukt met fout <tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. Er is een sync verbinding van %1 naar remote directory %2 opgezet. - + Successfully connected to %1! Succesvol verbonden met %1! - + Connection to %1 could not be established. Please check again. Verbinding met %1 niet geslaagd. Probeer het nog eens. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. Kan de map niet verwijderen en backuppen, omdat de map of een bestand daarin, geopend is in een ander programma. Sluit de map of het bestand en drup op Opnieuw of annuleer de installatie. @@ -1211,10 +1211,15 @@ We adviseren deze site niet te gebruiken. Mirall::OwncloudWizard - + %1 Connection Wizard %1 Verbindingswizard + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1552,12 +1557,12 @@ Probeer opnieuw te synchroniseren. Mirall::ShibbolethCredentials - + Login Error Inlogfout - + You must sign in as user %1 U moet inloggen als gebruiker %1 @@ -2030,127 +2035,127 @@ Probeer opnieuw te synchroniseren. Mirall::ownCloudGui - + Please sign in Log alstublieft in - + Disconnected from server Verbinding met server verbroken - + Folder %1: %2 Map %1: %2 - + No sync folders configured. Geen synchronisatie-mappen geconfigureerd. - + None. Geen. - + Recent Changes Recente wijzigingen - + Open %1 folder Open %1 map - + Managed Folders: Beheerde mappen: - + Open folder '%1' Open map '%1' - + Open %1 in browser Open %1 in browser - + Calculating quota... Quota worden berekend ... - + Unknown status Onbekende status - + Settings... Instellingen... - + Details... Details ... - + Help Help - + Quit %1 %1 afsluiten - + Sign in... Inloggen... - + Sign out Uitloggen - + Quota n/a Quota niet beschikbaar - + %1% of %2 in use %1% van %2 gebruikt - + No items synced recently Recent niets gesynchroniseerd - + Syncing %1 of %2 (%3 left) Sync %1 van %2 (%3 over) - + Syncing %1 (%2 left) Sync %1 (%2 over) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Bijgewerkt diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts index b8ae90cea2..e5d42a52d4 100644 --- a/translations/mirall_pl.ts +++ b/translations/mirall_pl.ts @@ -211,22 +211,22 @@ Pozostało czasu %5 Mirall::AuthenticationDialog - + Authentication Required Wymagana autoryzacja - + Enter username and password for '%1' at %2. Wprowadź użytkwownika i hasło dla '%1' w %2. - + &User: &Użytkownik: - + &Password: &Hasło @@ -1084,126 +1084,126 @@ Niezalecane jest jego użycie. Mirall::OwncloudSetupWizard - + Folder rename failed Zmiana nazwy folderu nie powiodła się - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Utworzenie lokalnego folderu synchronizowanego %1 zakończone pomyślnie!</b></font> - + Trying to connect to %1 at %2... Próba połączenia z %1 w %2... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Udane połączenie z %1: %2 wersja %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Błąd: złe poświadczenia. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Lokalny folder synchronizacji %1 już istnieje. Ustawiam go do synchronizacji.<br/><br/> - + Creating local sync folder %1... Tworzenie lokalnego folderu synchronizowanego %1... - + ok OK - + failed. Błąd. - + Could not create local folder %1 Nie udało się utworzyć lokalnego folderu %1 - - + + Failed to connect to %1 at %2:<br/>%3 Nie udało się połączyć do %1 w %2:<br/>%3 - + No remote folder specified! Nie określono folderu zdalnego! - + Error: %1 Błąd: %1 - + creating folder on ownCloud: %1 tworzę folder na ownCloud: %1 - + Remote folder %1 created successfully. Zdalny folder %1 został utworzony pomyślnie. - + The remote folder %1 already exists. Connecting it for syncing. Zdalny folder %1 już istnieje. Podłączam go do synchronizowania. - - + + The folder creation resulted in HTTP error code %1 Tworzenie folderu spowodowało kod błędu HTTP %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> Nie udało się utworzyć zdalnego folderu ponieważ podane dane dostępowe są nieprawidłowe!<br/>Wróć i sprawdź podane dane dostępowe.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Tworzenie folderu zdalnego nie powiodło się. Prawdopodobnie dostarczone poświadczenia są błędne.</font><br/>Wróć i sprawdź poświadczenia.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Tworzenie folderu zdalnego %1 nie powiodło się z powodu błędu <tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. Połączenie synchronizacji z %1 do katalogu zdalnego %2 zostało utworzone. - + Successfully connected to %1! Udane połączenie z %1! - + Connection to %1 could not be established. Please check again. Połączenie z %1 nie może być nawiązane. Sprawdź ponownie. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. Nie można usunąć i zarchiwizować folderu ponieważ znajdujący się w nim plik lub folder jest otwarty przez inny program. Proszę zamknąć folder lub plik albo kliknąć ponów lub anuluj setup. @@ -1211,10 +1211,15 @@ Niezalecane jest jego użycie. Mirall::OwncloudWizard - + %1 Connection Wizard %1 Kreator połączeń + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1552,12 +1557,12 @@ Niezalecane jest jego użycie. Mirall::ShibbolethCredentials - + Login Error Błąd logowania - + You must sign in as user %1 Musisz zalogować się jako użytkownik %1 @@ -2030,127 +2035,127 @@ Niezalecane jest jego użycie. Mirall::ownCloudGui - + Please sign in Proszę się zalogować - + Disconnected from server Rozłączono z serwerem - + Folder %1: %2 Folder %1: %2 - + No sync folders configured. Nie skonfigurowano synchronizowanych folderów. - + None. Brak. - + Recent Changes Ostatnie zmiany - + Open %1 folder Otwórz folder %1 - + Managed Folders: Zarządzane foldery: - + Open folder '%1' Otwórz katalog '%1' - + Open %1 in browser Otwórz %1 w przeglądarce - + Calculating quota... Obliczam quote... - + Unknown status Nieznany status - + Settings... Ustawienia... - + Details... Szczegóły... - + Help Pomoc - + Quit %1 Wyjdź %1 - + Sign in... Loguję... - + Sign out Wyloguj - + Quota n/a Quota n/a - + %1% of %2 in use %1% z %2 w użyciu - + No items synced recently Brak ostatnich synchronizacji - + Syncing %1 of %2 (%3 left) Synchronizacja %1 z %2 (%3 pozostało) - + Syncing %1 (%2 left) Synchronizuję %1 (%2 pozostało) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Aktualne diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts index 519f1af1e0..8902787a71 100644 --- a/translations/mirall_pt.ts +++ b/translations/mirall_pt.ts @@ -211,22 +211,22 @@ Total time left %5 Mirall::AuthenticationDialog - + Authentication Required Autenticação necessária - + Enter username and password for '%1' at %2. Introduza o nome de utilizador e password para '%1' em %2. - + &User: &Utilizador - + &Password: Password&: @@ -1081,126 +1081,126 @@ It is not advisable to use it. Mirall::OwncloudSetupWizard - + Folder rename failed Erro ao renomear a pasta - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Pasta de sincronização local %1 criada com sucesso!</b></font> - + Trying to connect to %1 at %2... A tentar ligação a %1 em %2... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Conectado com sucesso a %1: %2 versão %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Erro: Credenciais erradas. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> A pasta de sincronização locl %1 já existe, a configurar para sincronizar.<br/><br/> - + Creating local sync folder %1... A criar a pasta de sincronização local %1 ... - + ok ok - + failed. Falhou. - + Could not create local folder %1 Não foi possível criar a pasta local %1 - - + + Failed to connect to %1 at %2:<br/>%3 Impossível conectar a %1 em %2:<br/>%3 - + No remote folder specified! Não foi indicada a pasta remota! - + Error: %1 Erro: %1 - + creating folder on ownCloud: %1 a criar a pasta na ownCloud: %1 - + Remote folder %1 created successfully. Criação da pasta remota %1 com sucesso! - + The remote folder %1 already exists. Connecting it for syncing. A pasta remota %1 já existe. Ligue-a para sincronizar. - - + + The folder creation resulted in HTTP error code %1 A criação da pasta resultou num erro HTTP com o código %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> A criação da pasta remota falhou, provavelmente por ter introduzido as credenciais erradas.<br/>Por favor, verifique as suas credenciais.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">A criação da pasta remota falhou, provavelmente por ter introduzido as credenciais erradas.</font><br/>Por favor, verifique as suas credenciais.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. A criação da pasta remota %1 falhou com o erro <tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. A sincronização de %1 com a pasta remota %2 foi criada com sucesso. - + Successfully connected to %1! Conectado com sucesso a %1! - + Connection to %1 could not be established. Please check again. Não foi possível ligar a %1 . Por Favor verifique novamente. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. Não é possível remover e fazer backup à pasta porque a pasta ou um ficheiro nesta está aberto em outro programa. Por favor, feche a pasta ou o ficheiro e clique novamente ou cancele a configuração. @@ -1208,10 +1208,15 @@ It is not advisable to use it. Mirall::OwncloudWizard - + %1 Connection Wizard Assistente de ligação %1 + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1549,12 +1554,12 @@ Por favor tente sincronizar novamente. Mirall::ShibbolethCredentials - + Login Error Erro de login - + You must sign in as user %1 Deve fazer o login como utilizador %1. @@ -2028,127 +2033,127 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n Mirall::ownCloudGui - + Please sign in Por favor inicie a sessão - + Disconnected from server Desligar do servidor - + Folder %1: %2 Pasta %1: %2 - + No sync folders configured. Nenhuma pasta de sincronização configurada. - + None. Nada. - + Recent Changes Alterações recentes - + Open %1 folder Abrir a pasta %1 - + Managed Folders: Pastas Geridas: - + Open folder '%1' Abrir pasta '%1' - + Open %1 in browser Abrir %1 no browser - + Calculating quota... A calcular quota... - + Unknown status Estado desconhecido - + Settings... Configurações... - + Details... Detalhes... - + Help Ajuda - + Quit %1 Sair do %1 - + Sign in... Entrar... - + Sign out Sair - + Quota n/a Quota não disponível - + %1% of %2 in use %1% de %2 utilizado - + No items synced recently Sem itens sincronizados recentemente - + Syncing %1 of %2 (%3 left) Sincronizar %1 de %2 (%3 faltando) - + Syncing %1 (%2 left) Sincronizando %1 (%2 faltando) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Actualizado diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts index aa934acda5..db5d2b6ae8 100644 --- a/translations/mirall_pt_BR.ts +++ b/translations/mirall_pt_BR.ts @@ -211,22 +211,22 @@ Total de tempo que falta 5% Mirall::AuthenticationDialog - + Authentication Required Autenticação é Requerida - + Enter username and password for '%1' at %2. Entrar com o nome do usuário e senha para '%1' em %2. - + &User: &Usuário: - + &Password: &Senha: @@ -1082,126 +1082,126 @@ It is not advisable to use it. Mirall::OwncloudSetupWizard - + Folder rename failed Falha no nome da pasta - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Pasta de sincronização local %1 criada com sucesso!</b></font> - + Trying to connect to %1 at %2... Tentando conectar a %1 em %2... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Conectado com sucesso a %1: 2% versão %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Erro: Credenciais erradas. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Pasta local de sincronização %1 já existe, configurando para sincronização. <br/><br/> - + Creating local sync folder %1... Criando pasta local de sincronização %1... - + ok ok - + failed. falhou. - + Could not create local folder %1 Não foi possível criar pasta local %1 - - + + Failed to connect to %1 at %2:<br/>%3 Falha ao conectar a %1 em %2:<br/>%3 - + No remote folder specified! Nenhuma pasta remota foi especificada! - + Error: %1 Erro: %1 - + creating folder on ownCloud: %1 criar pasta no ownCloud: %1 - + Remote folder %1 created successfully. Pasta remota %1 criada com sucesso. - + The remote folder %1 already exists. Connecting it for syncing. Pasta remota %1 já existe. Conectando para sincronizar. - - + + The folder creation resulted in HTTP error code %1 A criação da pasta resultou em um erro do código HTTP %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> A criação da pasta remota falhou porque as credenciais fornecidas estão erradas!<br/>Por favor, volte e verifique suas credenciais.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">A criação remota de pasta falhou provavelmente as causas da falha na criação da pasta remota são credenciais erradas</font><br/>Volte e verifique suas credenciais, por favor.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Falha na criação da pasta remota %1 com erro <tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. Uma conexão de sincronização de %1 para o diretório remoto %2 foi realizada. - + Successfully connected to %1! Conectado com sucesso a %1! - + Connection to %1 could not be established. Please check again. Conexão à %1 não foi estabelecida. Por favor, verifique novamente. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. Não é possível remover e fazer backup da pasta porque a pasta ou um arquivo que está nesta pasta está aberto em outro programa. Por favor, feche a pasta ou arquivo e clique tentar novamente ou cancelar a operação. @@ -1209,10 +1209,15 @@ It is not advisable to use it. Mirall::OwncloudWizard - + %1 Connection Wizard Assistente de Conexões do %1 + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1550,12 +1555,12 @@ Tente sincronizar novamente. Mirall::ShibbolethCredentials - + Login Error Erro de Login - + You must sign in as user %1 Você deve entrar como usuário %1 @@ -2028,127 +2033,127 @@ Tente sincronizar novamente. Mirall::ownCloudGui - + Please sign in Favor conectar - + Disconnected from server Desconectado do servidor - + Folder %1: %2 Pasta %1: %2 - + No sync folders configured. Pastas de sincronização não configuradas. - + None. Nenhum. - + Recent Changes Alterações Recentes - + Open %1 folder Abrir pasta %1 - + Managed Folders: Pastas Gerenciadas: - + Open folder '%1' Abrir pasta '%1' - + Open %1 in browser Abrir %1 no navegador - + Calculating quota... Calculando cota... - + Unknown status Status desconhecido - + Settings... Configurações... - + Details... Detalhes... - + Help Ajuda - + Quit %1 Sair %1 - + Sign in... Conectar em... - + Sign out Sair - + Quota n/a Cota n/a - + %1% of %2 in use %1% de %2 em uso - + No items synced recently Não há itens sincronizados recentemente - + Syncing %1 of %2 (%3 left) Sincronizar %1 de %2 (%3 faltando) - + Syncing %1 (%2 left) Sincronizando %1 (%2 faltando) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Até a data diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts index 703b7f5b2b..c34963ea9e 100644 --- a/translations/mirall_ru.ts +++ b/translations/mirall_ru.ts @@ -211,22 +211,22 @@ Total time left %5 Mirall::AuthenticationDialog - + Authentication Required Требуется аутентификация - + Enter username and password for '%1' at %2. Введите имя пользователя и пароль для '%1' в %2. - + &User: &Пользователь: - + &Password: &Пароль: @@ -1084,126 +1084,126 @@ It is not advisable to use it. Mirall::OwncloudSetupWizard - + Folder rename failed Ошибка переименования папки - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Локальная папка для синхронизации %1 успешно создана!</b></font> - + Trying to connect to %1 at %2... Попытка соединиться с %1 на %2... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Успешно подключено к %1: %2 версия %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Ошибка: Неверные учётные данные. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Локальная синхронизация папки %1 уже существует, ее настройки для синхронизации.<br/><br/> - + Creating local sync folder %1... Создание локальной папки синхронизации %1... - + ok ок - + failed. не удалось. - + Could not create local folder %1 Не удалось создать локальную папку синхронизации %1 - - + + Failed to connect to %1 at %2:<br/>%3 Не удалось подключиться к %1 в %2:<br/>%3 - + No remote folder specified! Не указана удалённая папка! - + Error: %1 Ошибка: %1 - + creating folder on ownCloud: %1 создание папки на ownCloud: %1 - + Remote folder %1 created successfully. Удалённая папка %1 успешно создана. - + The remote folder %1 already exists. Connecting it for syncing. Удалённая папка %1 уже существует. Подключение к ней для синхронизации. - - + + The folder creation resulted in HTTP error code %1 Создание папки завершилось с HTTP-ошибкой %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> Не удалось создать удаленную папку — представленные параметры доступа неверны!<br/>Пожалуйста, вернитесь назад и проверьте параметры доступа.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Удаленное создание папки не удалось, вероятно, потому, что предоставленные учетные данные неверны.</font><br/>Пожалуйста, вернитесь назад и проверьте данные.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Удаленная папка %1 не создана из-за ошибки <tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. Установлено соединение синхронизации с %1 к удалённой директории %2. - + Successfully connected to %1! Соединение с %1 установлено успешно! - + Connection to %1 could not be established. Please check again. Подключение к %1 не воможно. Пожалуйста, проверьте еще раз. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. Невозможно стереть папку и создать её резервную копию так как папка или файл в ней открыты в другой программе. Пожалуйста, закройте папку или файл и нажмите "Повторите попытку", либо прервите мастер настройки. @@ -1211,10 +1211,15 @@ It is not advisable to use it. Mirall::OwncloudWizard - + %1 Connection Wizard %1 Мастер соединения + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1552,12 +1557,12 @@ It is not advisable to use it. Mirall::ShibbolethCredentials - + Login Error Ошибка входа - + You must sign in as user %1 Вы должны войти как пользователь %1 @@ -2030,127 +2035,127 @@ It is not advisable to use it. Mirall::ownCloudGui - + Please sign in Пожалуйста войдите в учётную запись - + Disconnected from server Отсоединен от сервера - + Folder %1: %2 Папка %1: %2 - + No sync folders configured. Нет папок для синхронизации. - + None. Пусто - + Recent Changes Недавние изменения - + Open %1 folder Открыть %1 папку - + Managed Folders: Управляемые папки: - + Open folder '%1' Открыть папку '%1' - + Open %1 in browser Открыть %1 в браузере - + Calculating quota... Расчёт квоты... - + Unknown status Неизвестный статус - + Settings... Настройки... - + Details... Детали... - + Help Помощь - + Quit %1 Закрыть %1 - + Sign in... Войти... - + Sign out Выйти - + Quota n/a Квота недоступна - + %1% of %2 in use Используется %1% из %2. - + No items synced recently Недавно ничего не синхронизировалсь - + Syncing %1 of %2 (%3 left) Синхронизация %1 из %2 (%3 осталось) - + Syncing %1 (%2 left) Синхронизация %1 (%2 осталось) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Актуальная версия diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts index 1a8352cd01..a54b9ed7a3 100644 --- a/translations/mirall_sk.ts +++ b/translations/mirall_sk.ts @@ -210,22 +210,22 @@ Total time left %5 Mirall::AuthenticationDialog - + Authentication Required Vyžaduje sa overenie - + Enter username and password for '%1' at %2. Zadajte používateľské meno a heslo pre '%1' na %2. - + &User: &Používateľ: - + &Password: &Heslo: @@ -1083,126 +1083,126 @@ Nie je vhodné ju používať. Mirall::OwncloudSetupWizard - + Folder rename failed Premenovanie priečinka zlyhalo - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Lokálny synchronizačný priečinok %1 bol úspešne vytvorený!</b></font> - + Trying to connect to %1 at %2... Pokúšam sa o pripojenie k %1 na %2... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Úspešne pripojené k %1: %2 verzie %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Chyba: Nesprávne údaje. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Lokálny synchronizačný priečinok %1 už existuje, prebieha jeho nastavovanie pre synchronizáciu.<br/><br/> - + Creating local sync folder %1... Vytváranie lokálneho synchronizačného priečinka %1 ... - + ok v poriadku - + failed. neúspešné. - + Could not create local folder %1 Nemožno vytvoriť lokálny priečinok %1 - - + + Failed to connect to %1 at %2:<br/>%3 Zlyhalo spojenie s %1 o %2:<br/>%3 - + No remote folder specified! Vzdialený priečinok nie je nastavený! - + Error: %1 Chyba: %1 - + creating folder on ownCloud: %1 vytváram priečinok v ownCloude: %1 - + Remote folder %1 created successfully. Vzdialený priečinok %1 bol úspešne vytvorený. - + The remote folder %1 already exists. Connecting it for syncing. Vzdialený priečinok %1 už existuje. Prebieha jeho pripájanie pre synchronizáciu. - - + + The folder creation resulted in HTTP error code %1 Vytváranie priečinka skončilo s HTTP chybovým kódom %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> Proces vytvárania vzdialeného priečinka zlyhal, lebo použité prihlasovacie údaje nie sú správne!<br/>Prosím skontrolujte si vaše údaje a skúste to znovu.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Vytvorenie vzdialeného priečinka pravdepodobne zlyhalo kvôli nesprávnym prihlasovacím údajom.</font><br/>Prosím choďte späť a skontrolujte ich.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Vytvorenie vzdialeného priečinka %1 zlyhalo s chybou <tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. Synchronizačné spojenie z %1 do vzdialeného priečinka %2 bolo práve nastavené. - + Successfully connected to %1! Úspešne pripojené s %1! - + Connection to %1 could not be established. Please check again. Pripojenie k %1 nemohlo byť iniciované. Prosím skontrolujte to znovu. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. Nemožno odstrániť a zazálohovať priečinok, pretože priečinok alebo súbor je otvorený v inom programe. Prosím zatvorte priečinok nebo súbor a skúste to znovu alebo zrušte akciu. @@ -1210,10 +1210,15 @@ Nie je vhodné ju používať. Mirall::OwncloudWizard - + %1 Connection Wizard %1 Asistent pripojenia + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1550,12 +1555,12 @@ Nie je vhodné ju používať. Mirall::ShibbolethCredentials - + Login Error Chybné prihlásenie - + You must sign in as user %1 Musíte sa prihlásiť ako používateľ %1 @@ -2028,127 +2033,127 @@ Nie je vhodné ju používať. Mirall::ownCloudGui - + Please sign in Prihláste sa prosím - + Disconnected from server Odpojený od servera - + Folder %1: %2 Priečinok %1: %2 - + No sync folders configured. Nie sú nastavené žiadne synchronizačné priečinky. - + None. Žiaden. - + Recent Changes Nedávne zmeny - + Open %1 folder Otvoriť %1 priečinok - + Managed Folders: Spravované priečinky: - + Open folder '%1' Otvoriť priečinok '%1' - + Open %1 in browser Otvoriť %1 v prehliadači - + Calculating quota... Počítanie kvóty... - + Unknown status Neznámy stav - + Settings... Nastavenia... - + Details... Podrobnosti... - + Help Pomoc - + Quit %1 Ukončiť %1 - + Sign in... Prihlásiť do... - + Sign out Odhlásiť - + Quota n/a Kvóta n/a - + %1% of %2 in use %1% z %2 sa používa - + No items synced recently Žiadne nedávno synchronizované položky - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Až do dnešného dňa diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts index 9e363b876a..4b5a3b46d7 100644 --- a/translations/mirall_sl.ts +++ b/translations/mirall_sl.ts @@ -210,22 +210,22 @@ Total time left %5 Mirall::AuthenticationDialog - + Authentication Required Zahtevana je overitev - + Enter username and password for '%1' at %2. Vpišite uporabniško ime in geslo za '%1' pri %2. - + &User: &Uporabnik: - + &Password: &Geslo: @@ -1083,126 +1083,126 @@ Uporaba ni priporočljiva. Mirall::OwncloudSetupWizard - + Folder rename failed Preimenovanje mape je spodletelo - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Krajevno usklajena mapa %1 je uspešno ustvarjena!</b></font> - + Trying to connect to %1 at %2... Poteka poskus povezave z %1 na %2 ... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Uspešno vzpostavljena povezava z %1: %2 različica %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Napaka: napačna poverila. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Krajevna mapa %1 že obstaja. Nastavljena bo za usklajevanje.<br/><br/> - + Creating local sync folder %1... Ustvarjanje mape za krajevno usklajevanje %1... - + ok je v redu - + failed. je spodletelo. - + Could not create local folder %1 Krajevne mape %1 ni mogoče ustvariti. - - + + Failed to connect to %1 at %2:<br/>%3 Povezava z %1 pri %2 je spodletela:<br/>%3 - + No remote folder specified! Ni navedenega oddaljenega strežnika! - + Error: %1 Napaka: %1 - + creating folder on ownCloud: %1 ustvarjanje mape v oblaku ownCloud: %1 - + Remote folder %1 created successfully. Oddaljena mapa %1 je uspešno ustvarjena. - + The remote folder %1 already exists. Connecting it for syncing. Oddaljena mapa %1 že obstaja. Vzpostavljena bo povezava za usklajevanje. - - + + The folder creation resulted in HTTP error code %1 Ustvarjanje mape je povzročilo napako HTTP %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> Ustvarjanje mape na oddaljenem naslovu je spodletelo zaradi napačnih poveril. <br/>Vrnite se in preverite zahtevana gesla.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Ustvarjanje oddaljene mape je spodletelo. Najverjetneje je vzrok v neustreznih poverilih.</font><br/>Vrnite se na predhodno stran in jih preverite.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Ustvarjanje oddaljene mape %1 je spodletelo z napako <tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. Povezava za usklajevanje med %1 in oddaljeno mapo %2 je vzpostavljena. - + Successfully connected to %1! Povezava z %1 je uspešno vzpostavljena! - + Connection to %1 could not be established. Please check again. Povezave z %1 ni mogoče vzpostaviti. Preveriti je treba nastavitve. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. Mape ni mogoče odstraniti niti ni mogoče ustvariti varnostne kopije, saj je mapa oziroma dokument v njej odprt v z drugim programom. Zaprite mapo/dokument ali prekinite namestitev. @@ -1210,10 +1210,15 @@ Uporaba ni priporočljiva. Mirall::OwncloudWizard - + %1 Connection Wizard Čarovnik za povezavo %1 + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1551,12 +1556,12 @@ Te je treba uskladiti znova. Mirall::ShibbolethCredentials - + Login Error Napaka prijave - + You must sign in as user %1 Prijaviti se je treba kot uporabnik %1 @@ -2029,127 +2034,127 @@ Te je treba uskladiti znova. Mirall::ownCloudGui - + Please sign in Pred nadaljevanjem je zahtevana prijava - + Disconnected from server Povezava s strežnikom je prekinjena - + Folder %1: %2 Mapa %1: %2 - + No sync folders configured. Ni nastavljenih map za usklajevanje. - + None. Brez - + Recent Changes Nedavne spremembe - + Open %1 folder Odpri %1 mapo - + Managed Folders: Upravljane mape: - + Open folder '%1' Odpri mapo '%1' - + Open %1 in browser Odpri %1 v brskalniku - + Calculating quota... Preračunavanje količinske omejitve ... - + Unknown status Neznano stanje - + Settings... Nastavitve ... - + Details... Podrobnosti ... - + Help Pomoč - + Quit %1 Končaj %1 - + Sign in... Prijava ... - + Sign out Odjava - + Quota n/a Količinska omejitev ni na voljo - + %1% of %2 in use %1% od %2 v uporabi - + No items synced recently Ni nedavno usklajenih predmetov - + Syncing %1 of %2 (%3 left) Poteka usklajevanje %1 od %2 (preostaja %3) - + Syncing %1 (%2 left) Usklajevanje %1 (%2 do konca) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Ni posodobitev diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts index 6f53f3c848..3a9ede3fe1 100644 --- a/translations/mirall_sv.ts +++ b/translations/mirall_sv.ts @@ -211,22 +211,22 @@ Tid kvar %5 Mirall::AuthenticationDialog - + Authentication Required Autentisering krävs - + Enter username and password for '%1' at %2. Ange användarnamn och lösenord för '%1' i %2 - + &User: &Användare: - + &Password: &Lösenord: @@ -1084,126 +1084,126 @@ Det är inte lämpligt använda den. Mirall::OwncloudSetupWizard - + Folder rename failed Omdöpning av mapp misslyckades - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Lokal synkmapp %1 skapad!</b></font> - + Trying to connect to %1 at %2... Försöker ansluta till %1 på %2... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Lyckades ansluta till %1: %2 version %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Fel: Ogiltiga inloggningsuppgifter. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Lokal synkmapp %1 finns redan, aktiverar den för synk.<br/><br/> - + Creating local sync folder %1... Skapar lokal synkmapp %1... - + ok ok - + failed. misslyckades. - + Could not create local folder %1 Kunde inte skapa lokal mapp %1 - - + + Failed to connect to %1 at %2:<br/>%3 Misslyckades att ansluta till %1 vid %2:<br/>%3 - + No remote folder specified! Ingen fjärrmapp specificerad! - + Error: %1 Fel: %1 - + creating folder on ownCloud: %1 skapar mapp på ownCloud: %1 - + Remote folder %1 created successfully. Fjärrmapp %1 har skapats. - + The remote folder %1 already exists. Connecting it for syncing. Fjärrmappen %1 finns redan. Ansluter den för synkronisering. - - + + The folder creation resulted in HTTP error code %1 Skapande av mapp resulterade i HTTP felkod %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> Det gick inte att skapa mappen efter som du inte har tillräckliga rättigheter!<br/>Vänligen återvänd och kontrollera dina rättigheter. - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Misslyckades skapa fjärrmappen, troligen p.g.a felaktiga inloggningsuppgifter.</font><br/>Kontrollera dina inloggningsuppgifter.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Misslyckades skapa fjärrmapp %1 med fel <tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. En synkroniseringsanslutning från %1 till fjärrmappen %2 har skapats. - + Successfully connected to %1! Ansluten till %1! - + Connection to %1 could not be established. Please check again. Anslutningen till %1 kunde inte etableras. Var god kontrollera och försök igen. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. Kan inte ta bort och göra en säkerhetskopia av mappen på grund av att mappen eller en fil i den används av ett annat program. Vänligen stäng mappen eller filen och försök igen eller avbryt installationen. @@ -1211,10 +1211,15 @@ Det är inte lämpligt använda den. Mirall::OwncloudWizard - + %1 Connection Wizard %1 Anslutningsguiden + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1552,12 +1557,12 @@ Försök att synka dessa igen. Mirall::ShibbolethCredentials - + Login Error Login fel - + You must sign in as user %1 Du måste logga in som en användare %1 @@ -2030,127 +2035,127 @@ Försök att synka dessa igen. Mirall::ownCloudGui - + Please sign in Vänliga logga in - + Disconnected from server Bortkopplad från servern - + Folder %1: %2 Mapp %1: %2 - + No sync folders configured. Ingen synkroniseringsmapp är konfigurerad. - + None. Ingen. - + Recent Changes Senaste ändringar - + Open %1 folder Öppna %1 mappen - + Managed Folders: Hanterade mappar: - + Open folder '%1' Öppna mapp '%1' - + Open %1 in browser Öppna %1 i webbläsaren - + Calculating quota... Beräknar kvot... - + Unknown status Okänd status - + Settings... Inställningar... - + Details... Detaljer... - + Help Hjälp - + Quit %1 Avsluta %1 - + Sign in... Logga in... - + Sign out Logga ut - + Quota n/a Kvot n/a - + %1% of %2 in use %1% av %2 används - + No items synced recently Inga filer har synkroniseras nyligen - + Syncing %1 of %2 (%3 left) Synkroniserar %1 av %2 (%3 kvar) - + Syncing %1 (%2 left) Synkroniserar %1 (%2 kvar) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Aktuell version diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts index a0fb7acb5d..c7c1514bb4 100644 --- a/translations/mirall_th.ts +++ b/translations/mirall_th.ts @@ -210,22 +210,22 @@ Total time left %5 Mirall::AuthenticationDialog - + Authentication Required - + Enter username and password for '%1' at %2. - + &User: - + &Password: &รหัสผ่าน: @@ -1077,126 +1077,126 @@ It is not advisable to use it. Mirall::OwncloudSetupWizard - + Folder rename failed - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>โฟลเดอร์ภายในเครื่องสำหรับผสานข้อมูล %1 ได้ถูกสร้างขึ้นเรียบร้อยแล้ว!</b></font> - + Trying to connect to %1 at %2... กำลังพยายามเชื่อมต่อไปที่ %1 ที่ %2... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">เชื่อมต่อกับ %1: %2 รุ่น %3 (%4) เสร็จเรียบร้อยแล้ว</font><br/><br/> - + Error: Wrong credentials. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> โฟลเดอร์สำหรับถ่ายโอนข้อมูลภายในเครื่อง %1 มีอยู่แล้ว กรุณาตั้งค่าเพื่อถ่ายข้อมูล <br/<br/> - + Creating local sync folder %1... กำลังสร้างโฟลเดอร์สำหรับโอนถ่ายข้อมูลภายในเครื่อง %1 ... - + ok ตกลง - + failed. ล้มเหลว - + Could not create local folder %1 - - + + Failed to connect to %1 at %2:<br/>%3 - + No remote folder specified! - + Error: %1 ข้อผิดพลาด: %1 - + creating folder on ownCloud: %1 กำลังสร้างโฟลเดอร์ใหม่บน ownCloud: %1 - + Remote folder %1 created successfully. โฟลเดอร์ระยะไกล %1 ถูกสร้างเรียบร้อยแล้ว - + The remote folder %1 already exists. Connecting it for syncing. โฟลเดอร์ระยะไกล %1 มีอยู่แล้ว กำลังเชื่อมต่อเพื่อถ่ายโอนข้อมูล - - + + The folder creation resulted in HTTP error code %1 การสร้างโฟลเดอร์ดังกล่าวส่งผลให้เกิดรหัสข้อผิดพลาด HTTP error code %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">การสร้างโฟลเดอร์ระยะไกลล้มเหลว ซึ่งอาจมีสาเหตุมาจากการกรอกข้อมูลส่วนตัวเพื่อเข้าใช้งานไม่ถูกต้อง.</font><br/>กรุณาย้อนกลับไปแล้วตรวจสอบข้อมูลส่วนตัวของคุณอีกครั้ง.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. การสร้างโฟลเดอร์ระยะไกล %1 ล้มเหลวเนื่องข้อผิดพลาด <tt>%2</tt> - + A sync connection from %1 to remote directory %2 was set up. การเชื่อมต่อเผื่อผสานข้อมูลจาก %1 ไปที่ไดเร็กทอรี่ระยะไกล %2 ได้ถูกติดตั้งแล้ว - + Successfully connected to %1! เชื่อมต่อไปที่ %1! สำเร็จ - + Connection to %1 could not be established. Please check again. การเชื่อมต่อกับ %1 ไม่สามารถดำเนินการได้ กรุณาตรวจสอบอีกครั้ง - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. @@ -1204,10 +1204,15 @@ It is not advisable to use it. Mirall::OwncloudWizard - + %1 Connection Wizard %1 ตัวช่วยสร้างการเชื่อมต่อ + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1544,12 +1549,12 @@ It is not advisable to use it. Mirall::ShibbolethCredentials - + Login Error - + You must sign in as user %1 @@ -2020,127 +2025,127 @@ It is not advisable to use it. Mirall::ownCloudGui - + Please sign in - + Disconnected from server - + Folder %1: %2 - + No sync folders configured. ยังไม่มีการกำหนดค่าโฟลเดอร์ที่ต้องการซิงค์ข้อมูล - + None. - + Recent Changes - + Open %1 folder เปิดโฟลเดอร์ %1 - + Managed Folders: โฟลเดอร์ที่มีการจัดการแล้ว: - + Open folder '%1' - + Open %1 in browser - + Calculating quota... - + Unknown status - + Settings... - + Details... - + Help ช่วยเหลือ - + Quit %1 - + Sign in... - + Sign out - + Quota n/a - + %1% of %2 in use - + No items synced recently - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts index ecf8937fe1..2328e55413 100644 --- a/translations/mirall_tr.ts +++ b/translations/mirall_tr.ts @@ -211,22 +211,22 @@ Toplam kalan süre %5 Mirall::AuthenticationDialog - + Authentication Required Yetkilendirme Gerekli - + Enter username and password for '%1' at %2. Lütfen %2 üzerindeki, '%1' için kullanıcı adı ve parolayı girin. - + &User: &Kullanıcı: - + &Password: &Parola: @@ -1084,126 +1084,126 @@ Kullanmanız önerilmez. Mirall::OwncloudSetupWizard - + Folder rename failed Klasör adlandırma başarısız - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Yerel eşitleme klasörü %1 başarıyla oluşturuldu!</b></font> - + Trying to connect to %1 at %2... %2 üzerinde %1 bağlantısı deneniyor... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">%1 bağlantısı başarılı: %2 sürüm %3 (%4)</font><br/><br/> - + Error: Wrong credentials. Hata: Hatalı kimlik bilgileri. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Yerel eşitleme klasörü %1 zaten mevcut, eşitlemek için ayarlanıyor.<br/><br/> - + Creating local sync folder %1... Yerel eşitleme klasörü %1 oluşturuluyor... - + ok tamam - + failed. başarısız. - + Could not create local folder %1 %1 yerel klasörü oluşturulamadı - - + + Failed to connect to %1 at %2:<br/>%3 %2 üzerinde %1 bağlantısı yapılamadı:<br/>%3 - + No remote folder specified! Uzak klasör belirtilmemiş! - + Error: %1 Hata: %1 - + creating folder on ownCloud: %1 ownCloud üzerinde klasör oluşturuluyor: %1 - + Remote folder %1 created successfully. %1 uzak klasörü başarıyla oluşturuldu. - + The remote folder %1 already exists. Connecting it for syncing. Uzak klasör %1 zaten mevcut. Eşitlemek için bağlanılıyor. - - + + The folder creation resulted in HTTP error code %1 Klasör oluşturma %1 HTTP hata kodu ile sonuçlandı - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> Uzak klasör oluşturması, geçersiz kimlik bilgileri nedeniyle başarısız!<br/>Lütfen geri gidin ve bilgileri denetleyin.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Uzak klasör oluşturma muhtemelen hatalı kimlik bilgilerinden dolayı başarısız oldu.</font><br/>Lütfen geri gidip kimlik bilgilerini doğrulayın.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Uzak klasör %1 oluşturma işlemi <tt>%2</tt> hatası ile başarısız oldu. - + A sync connection from %1 to remote directory %2 was set up. %1 kaynaklı %2 uzak dizinine bir eşitleme bağlantısı ayarlandı. - + Successfully connected to %1! %1 bağlantısı başarılı! - + Connection to %1 could not be established. Please check again. %1 bağlantısı kurulamadı. Lütfen tekrar denetleyin. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. Klasör veya içerisindeki bir dosya farklı bir program içerisinde açık olduğundan, kaldırma ve yedekleme işlemi yapılamıyor. Lütfen klasör veya dosyayı kapatıp yeniden deneyin veya kurulumu iptal edin. @@ -1211,10 +1211,15 @@ Kullanmanız önerilmez. Mirall::OwncloudWizard - + %1 Connection Wizard %1 Bağlantı Sihirbazı + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1552,12 +1557,12 @@ Bu dosyaları tekrar eşitlemeyi deneyin. Mirall::ShibbolethCredentials - + Login Error Oturum Açma Hatası - + You must sign in as user %1 %1 kullanıcısı olarak oturum açmalısınız @@ -2030,127 +2035,127 @@ Bu dosyaları tekrar eşitlemeyi deneyin. Mirall::ownCloudGui - + Please sign in Lütfen oturum açın - + Disconnected from server Sunucu bağlantısı kesildi - + Folder %1: %2 Klasör %1: %2 - + No sync folders configured. Yapılandırılmış eşitleme klasörü yok. - + None. Hiçbir şey. - + Recent Changes Son Değişiklikler - + Open %1 folder %1 klasörünü aç - + Managed Folders: Yönetilen Klasörler: - + Open folder '%1' '%1' klasörünü aç - + Open %1 in browser %1'ı tarayıcıda aç - + Calculating quota... Kota hesaplanıyor... - + Unknown status Bilinmeyen durum - + Settings... Ayarlar... - + Details... Ayrıntılar... - + Help Yardım - + Quit %1 %1'tan çık - + Sign in... Oturum aç... - + Sign out Oturumu kapat - + Quota n/a Kota kullanılamıyor - + %1% of %2 in use %2'ın % %1 kısmı kullanımda - + No items synced recently Yakın zamanda eşitlenen öge yok - + Syncing %1 of %2 (%3 left) Eşitlenen %1/%2 (%3 kaldı) - + Syncing %1 (%2 left) Eşitlenen %1 (%2 kaldı) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Güncel diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts index 0aa6c245b8..1e23d8ea54 100644 --- a/translations/mirall_uk.ts +++ b/translations/mirall_uk.ts @@ -210,22 +210,22 @@ Total time left %5 Mirall::AuthenticationDialog - + Authentication Required - + Enter username and password for '%1' at %2. - + &User: - + &Password: &Пароль: @@ -1079,126 +1079,126 @@ It is not advisable to use it. Mirall::OwncloudSetupWizard - + Folder rename failed Не вдалося перейменувати теку - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>Локальна тека синхронізації %1 успішно створена!</b></font> - + Trying to connect to %1 at %2... Спроба підключення до %1 на %2... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Успішно підключено до %1: %2 версія %3 (%4)</font><br/><br/> - + Error: Wrong credentials. - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> Локальна тека синхронізації %1 вже існує, налаштування її для синхронізації.<br/><br/> - + Creating local sync folder %1... Створення локальної теки для синхронізації %1... - + ok ok - + failed. не вдалося. - + Could not create local folder %1 Не вдалося створити локальну теку $1 - - + + Failed to connect to %1 at %2:<br/>%3 - + No remote folder specified! - + Error: %1 Помилка: %1 - + creating folder on ownCloud: %1 створення теки на ownCloud: %1 - + Remote folder %1 created successfully. Віддалена тека %1 успішно створена. - + The remote folder %1 already exists. Connecting it for syncing. Віддалена тека %1 вже існує. Під'єднання для синхронізації. - - + + The folder creation resulted in HTTP error code %1 Створення теки завершилось HTTP помилкою %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> Створити віддалену теку не вдалося через невірно вказані облікові дані.<br/>Поверніться назад та перевірте облікові дані.</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">Створити віддалену теку не вдалося, можливо, через невірно вказані облікові дані.</font><br/>Будь ласка, поверніться назад та перевірте облікові дані.</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. Не вдалося створити віддалену теку %1 через помилку <tt>%2</tt>. - + A sync connection from %1 to remote directory %2 was set up. З'єднання для синхронізації %1 з віддаленою текою %2 було встановлено. - + Successfully connected to %1! Успішно під'єднано до %1! - + Connection to %1 could not be established. Please check again. Підключення до %1 встановити не вдалося. Будь ласка, перевірте ще раз. - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. @@ -1206,10 +1206,15 @@ It is not advisable to use it. Mirall::OwncloudWizard - + %1 Connection Wizard Майстер з'єднання %1 + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1546,12 +1551,12 @@ It is not advisable to use it. Mirall::ShibbolethCredentials - + Login Error - + You must sign in as user %1 @@ -2022,127 +2027,127 @@ It is not advisable to use it. Mirall::ownCloudGui - + Please sign in - + Disconnected from server - + Folder %1: %2 - + No sync folders configured. Жодна тека не налаштована для синхронізації. - + None. - + Recent Changes Недавні зміни - + Open %1 folder Відкрити %1 каталог - + Managed Folders: Керовані теки: - + Open folder '%1' - + Open %1 in browser - + Calculating quota... - + Unknown status - + Settings... - + Details... - + Help Допомога - + Quit %1 - + Sign in... - + Sign out - + Quota n/a - + %1% of %2 in use - + No items synced recently - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts index 62b18258d7..4a04925149 100644 --- a/translations/mirall_zh_CN.ts +++ b/translations/mirall_zh_CN.ts @@ -210,22 +210,22 @@ Total time left %5 Mirall::AuthenticationDialog - + Authentication Required 需要认证 - + Enter username and password for '%1' at %2. - + &User: 用户(&U)： - + &Password: 密码 (&P)： @@ -1081,126 +1081,126 @@ It is not advisable to use it. Mirall::OwncloudSetupWizard - + Folder rename failed 文件夹更名失败 - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>本地同步目录 %1 已成功创建</b></font> - + Trying to connect to %1 at %2... 尝试连接位于 %2 的 %1... - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">成功连接到 %1：%2 版本 %3 (%4)</font><br/><br/> - + Error: Wrong credentials. 错误：密码错误。 - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> 本地同步文件夹 %1 已存在，将使用它来同步。<br/><br/> - + Creating local sync folder %1... 正在创建本地同步文件夹 %1... - + ok 成功 - + failed. 失败 - + Could not create local folder %1 不能创建本地文件夹 %1 - - + + Failed to connect to %1 at %2:<br/>%3 - + No remote folder specified! - + Error: %1 错误：%1 - + creating folder on ownCloud: %1 在 ownCloud 创建文件夹：%1 - + Remote folder %1 created successfully. 远程目录%1成功创建。 - + The remote folder %1 already exists. Connecting it for syncing. 远程文件夹 %1 已存在。连接它以供同步。 - - + + The folder creation resulted in HTTP error code %1 创建文件夹出现 HTTP 错误代码 %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> 远程文件夹创建失败，因为提供的凭证有误！<br/>请返回并检查您的凭证。</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">远程文件夹创建失败，可能是由于提供的用户名密码不正确。</font><br/>请返回并检查它们。</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. 创建远程文件夹 %1 失败，错误为 <tt>%2</tt>。 - + A sync connection from %1 to remote directory %2 was set up. 已经设置了一个 %1 到远程文件夹 %2 的同步连接 - + Successfully connected to %1! 成功连接到了 %1！ - + Connection to %1 could not be established. Please check again. 无法建立到 %1的链接，请稍后重试 - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. @@ -1208,10 +1208,15 @@ It is not advisable to use it. Mirall::OwncloudWizard - + %1 Connection Wizard %1 链接向导 + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1548,12 +1553,12 @@ It is not advisable to use it. Mirall::ShibbolethCredentials - + Login Error 登录错误 - + You must sign in as user %1 @@ -2026,127 +2031,127 @@ It is not advisable to use it. Mirall::ownCloudGui - + Please sign in 请登录 - + Disconnected from server 已从服务器断开 - + Folder %1: %2 文件夹 %1: %2 - + No sync folders configured. 没有已配置的同步文件夹。 - + None. 无。 - + Recent Changes 最近修改 - + Open %1 folder 打开 %1 目录 - + Managed Folders: 管理的文件夹： - + Open folder '%1' 打开文件夹“%1” - + Open %1 in browser 在浏览器中打开%1 - + Calculating quota... 计算配额.... - + Unknown status 未知状态 - + Settings... 设置... - + Details... 细节... - + Help 帮助 - + Quit %1 退出 %1 - + Sign in... 登录... - + Sign out 注销 - + Quota n/a 配额无限制 - + %1% of %2 in use 已使用 %2，总计 %1% - + No items synced recently - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) %1 (%2, %3) - + Up to date 更新 diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts index 7424308dd0..64ceac92ff 100644 --- a/translations/mirall_zh_TW.ts +++ b/translations/mirall_zh_TW.ts @@ -210,22 +210,22 @@ Total time left %5 Mirall::AuthenticationDialog - + Authentication Required - + Enter username and password for '%1' at %2. - + &User: - + &Password: &密碼: @@ -1077,126 +1077,126 @@ It is not advisable to use it. Mirall::OwncloudSetupWizard - + Folder rename failed 重新命名資料夾失敗 - - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> <font color="green"><b>本地同步資料夾 %1 建立成功!</b></font> - + Trying to connect to %1 at %2... 嘗試連線到%1從%2 - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">成功連線到 %1: %2 版本 %3 (%4)</font><br/><br/> - + Error: Wrong credentials. 錯誤: 錯誤的憑證。 - + Local sync folder %1 already exists, setting it up for sync.<br/><br/> 本地同步資料夾%1已存在, 將其設置為同步<br/><br/> - + Creating local sync folder %1... 建立本地同步資料夾 %1 - + ok ok - + failed. 失敗 - + Could not create local folder %1 無法建立本地資料夾 %1 - - + + Failed to connect to %1 at %2:<br/>%3 - + No remote folder specified! - + Error: %1 錯誤： %1 - + creating folder on ownCloud: %1 在 ownCloud 建立資料夾： %1 - + Remote folder %1 created successfully. 遠端資料夾%1建立成功! - + The remote folder %1 already exists. Connecting it for syncing. 遠端資料夾%1已存在,連線同步中 - - + + The folder creation resulted in HTTP error code %1 在HTTP建立資料夾失敗, error code %1 - + The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p> 由於帳號或密碼錯誤，遠端資料夾建立失敗<br/>請檢查您的帳號密碼。</p> - + <p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p> <p><font color="red">遠端資料夾建立失敗,也許是因為所提供的帳號密碼錯誤</font><br/>請重新檢查您的帳號密碼</p> - + Remote folder %1 creation failed with error <tt>%2</tt>. 建立遠端資料夾%1發生錯誤<tt>%2</tt>失敗 - + A sync connection from %1 to remote directory %2 was set up. 從%1到遠端資料夾%2的連線已建立 - + Successfully connected to %1! 成功連接到 %1 ！ - + Connection to %1 could not be established. Please check again. 無法建立連線%1, 請重新檢查 - + Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup. @@ -1204,10 +1204,15 @@ It is not advisable to use it. Mirall::OwncloudWizard - + %1 Connection Wizard %1連線精靈 + + + Skip folders configuration + + Mirall::OwncloudWizardResultPage @@ -1544,12 +1549,12 @@ It is not advisable to use it. Mirall::ShibbolethCredentials - + Login Error - + You must sign in as user %1 @@ -2020,127 +2025,127 @@ It is not advisable to use it. Mirall::ownCloudGui - + Please sign in 請登入 - + Disconnected from server - + Folder %1: %2 資料夾 %1: %2 - + No sync folders configured. 尚未指定同步資料夾 - + None. 無。 - + Recent Changes - + Open %1 folder 開啟%1資料夾 - + Managed Folders: 管理的資料夾: - + Open folder '%1' 開啟 %1 資料夾 - + Open %1 in browser 瀏覽器中開啟 %1 - + Calculating quota... - + Unknown status 未知狀態 - + Settings... 設定… - + Details... 細節… - + Help 說明 - + Quit %1 離開 %1 - + Sign in... 登入中... - + Sign out 登出 - + Quota n/a 無配額 - + %1% of %2 in use - + No items synced recently - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date 最新的 From 192c23bfce29860667c3670e12929857a1a3de9e Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 13 Aug 2014 02:06:14 -0400 Subject: [PATCH 07/94] [tx-robot] updated from transifex --- admin/win/nsi/l10n/Farsi.nsh | 46 ++++++++++++++++++++++++++++++++ admin/win/nsi/l10n/languages.nsh | 1 + 2 files changed, 47 insertions(+) create mode 100644 admin/win/nsi/l10n/Farsi.nsh diff --git a/admin/win/nsi/l10n/Farsi.nsh b/admin/win/nsi/l10n/Farsi.nsh new file mode 100644 index 0000000000..747bf5df2c --- /dev/null +++ b/admin/win/nsi/l10n/Farsi.nsh @@ -0,0 +1,46 @@ +# Auto-generated - do not modify +StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "نمایش پادداشت های انتشار نسخه" +StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "پردازش برای از بین بردن یافت نشد!" +StrCpy $PageReinstall_NEW_Field_3 "حذف نکن" +StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "از قبل نصب شده است" +StrCpy $PageReinstall_SAME_Field_2 "افزودن/نصب مجدد اجزا" +StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "میانبر دسکتاپ" +StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "ایجاد میانبر دسکتاپ" +StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "میانبر بازکردن سریع" +StrCpy $UNINSTALLER_APPDATA_CHECKBOX "بله، این پوشه داده را حذف کن." +StrCpy $UNINSTALLER_FILE_Detail "نوشتن حذف کننده" +StrCpy $UNINSTALLER_FINISHED_Detail "اتمام" +StrCpy $INIT_INSTALLER_RUNNING "نصاب از قبل در حال اجراست." +StrCpy $INIT_UNINSTALLER_RUNNING "حذف کننده از قبل در حال اجراست." +StrCpy $SectionGroup_Shortcuts "میانبرها" +StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?" +StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Killing ${APPLICATION_EXECUTABLE} processes." +StrCpy $PageReinstall_NEW_Field_1 "An older version of ${APPLICATION_NAME} is installed on your system. It is recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue." +StrCpy $PageReinstall_NEW_Field_2 "Uninstall before installing" +StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Choose how you want to install ${APPLICATION_NAME}." +StrCpy $PageReinstall_OLD_Field_1 "A newer version of ${APPLICATION_NAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue." +StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue." +StrCpy $PageReinstall_SAME_Field_3 "Uninstall ${APPLICATION_NAME}" +StrCpy $UNINSTALLER_APPDATA_TITLE "Uninstall ${APPLICATION_NAME}" +StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choose the maintenance option to perform." +StrCpy $SEC_APPLICATION_DETAILS "Installing ${APPLICATION_NAME} essentials." +StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer" +StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons for Windows Explorer" +StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start Menu Program Shortcut" +StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Adding shortcut for ${APPLICATION_NAME} to the Start Menu." +StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creating Quick Launch Shortcut" +StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} essentials." +StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} shortcut." +StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Desktop shortcut for ${APPLICATION_NAME}." +StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Quick Launch shortcut for ${APPLICATION_NAME}." +StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Remove ${APPLICATION_NAME}'s data folder from your computer." +StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Do you want to delete ${APPLICATION_NAME}'s data folder?" +StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Leave unchecked to keep the data folder for later use or check to delete the data folder." +StrCpy $UNINSTALLER_REGISTRY_Detail "Writing Installer Registry Keys" +StrCpy $UNINSTALL_MESSAGEBOX "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?" +StrCpy $UNINSTALL_ABORT "Uninstall aborted by user" +StrCpy $INIT_NO_QUICK_LAUNCH "Quick Launch Shortcut (N/A)" +StrCpy $INIT_NO_DESKTOP "Desktop Shortcut (overwrites existing)" +StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:" +StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "This installer requires admin access, try again" +StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "This uninstaller requires admin access, try again" diff --git a/admin/win/nsi/l10n/languages.nsh b/admin/win/nsi/l10n/languages.nsh index 949c9ad5fa..9c65e91f15 100644 --- a/admin/win/nsi/l10n/languages.nsh +++ b/admin/win/nsi/l10n/languages.nsh @@ -23,3 +23,4 @@ !insertmacro MUI_LANGUAGE "Slovak" !insertmacro MUI_LANGUAGE "Spanish" !insertmacro MUI_LANGUAGE "Polish" +!insertmacro MUI_LANGUAGE "Farsi" From 55b3eb467f90a3762b876c7751a8ff59f335ab25 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Thu, 14 Aug 2014 01:25:22 -0400 Subject: [PATCH 08/94] [tx-robot] updated from transifex --- translations/mirall_es.ts | 2 +- translations/mirall_fr.ts | 4 ++-- translations/mirall_nl.ts | 2 +- translations/mirall_pt_BR.ts | 2 +- translations/mirall_tr.ts | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts index 57c955e1ef..50e6f11794 100644 --- a/translations/mirall_es.ts +++ b/translations/mirall_es.ts @@ -1218,7 +1218,7 @@ No se recomienda usarlo. Skip folders configuration - + Omitir la configuración de carpetas diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts index 2d61f25233..11d4aae0f7 100644 --- a/translations/mirall_fr.ts +++ b/translations/mirall_fr.ts @@ -1218,7 +1218,7 @@ Il est déconseillé de l'utiliser. Skip folders configuration - + Passer outre la configuration des dossiers @@ -1778,7 +1778,7 @@ Il est déconseillé de l'utiliser. Expiration Date: %1 - + Date d'expiration : %1 diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts index de49824759..6afd10fc79 100644 --- a/translations/mirall_nl.ts +++ b/translations/mirall_nl.ts @@ -1218,7 +1218,7 @@ We adviseren deze site niet te gebruiken. Skip folders configuration - + Sla configuratie van mappen over diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts index db5d2b6ae8..371f94ef1a 100644 --- a/translations/mirall_pt_BR.ts +++ b/translations/mirall_pt_BR.ts @@ -1216,7 +1216,7 @@ It is not advisable to use it. Skip folders configuration - + Pular etapa de configuração de pastas diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts index 2328e55413..e3f768001a 100644 --- a/translations/mirall_tr.ts +++ b/translations/mirall_tr.ts @@ -1218,7 +1218,7 @@ Kullanmanız önerilmez. Skip folders configuration - + Klasör yapılandırmasını atla From fcd211b1903cdf3aab6c559e34209c021c5c6369 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Wed, 13 Aug 2014 12:08:38 +0200 Subject: [PATCH 09/94] overlayNautilus: Better reconnect behaviour if mirall was not running. --- shell_integration/nautilus/ownCloud.py | 31 +++++++++++++++++++++----- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/shell_integration/nautilus/ownCloud.py b/shell_integration/nautilus/ownCloud.py index ac1ad54c86..819cf03ee4 100755 --- a/shell_integration/nautilus/ownCloud.py +++ b/shell_integration/nautilus/ownCloud.py @@ -11,16 +11,35 @@ class ownCloudExtension(GObject.GObject, Nautilus.ColumnProvider, Nautilus.InfoP nautilusVFSFile_table = {} registered_paths = {} remainder = '' + connected = False + watch_id = 0 def __init__(self): - self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - self.sock.connect(("localhost", 33001)) - self.sock.settimeout(5) - - GObject.io_add_watch(self.sock, GObject.IO_IN, self.handle_notify) + self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + self.connectToOwnCloud + if not self.connected: + # try again in 5 seconds - attention, logic inverted! + GObject.timeout_add(5000, self.connectToOwnCloud) + + def connectToOwnCloud(self): + try: + self.sock.connect(("localhost", 33001)) + self.sock.settimeout(5) + self.connected = True + self.watch_id = GObject.io_add_watch(self.sock, GObject.IO_IN, self.handle_notify) + except: + print "Connect could not be established, try again later!" + return not self.connected def sendCommand(self, cmd): - self.sock.send(cmd) + if self.connected: + try: + self.sock.send(cmd) + except: + print "Sending failed." + GObject.source_remove( self.watch_id ) + self.connected = False + GObject.timeout_add(5000, self.connectToOwnCloud) def find_item_for_file( self, path ): if path in self.nautilusVFSFile_table: From 1b5bbfdad3e1ba44834f92106772139e78dcb5c3 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Wed, 13 Aug 2014 17:16:24 +0200 Subject: [PATCH 10/94] csync statedb: Set sqlite3_busy_timeout to 5 seconds. --- csync/src/csync_statedb.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/csync/src/csync_statedb.c b/csync/src/csync_statedb.c index e23215d5da..87809151c1 100644 --- a/csync/src/csync_statedb.c +++ b/csync/src/csync_statedb.c @@ -222,6 +222,9 @@ int csync_statedb_load(CSYNC *ctx, const char *statedb, sqlite3 **pdb) { result = csync_statedb_query(db, "PRAGMA case_sensitive_like = ON;"); c_strlist_destroy(result); + /* set a busy handler with 5 seconds timeout */ + sqlite3_busy_timeout(db, 5000); + #ifndef NDEBUG sqlite3_profile(db, sqlite_profile, 0 ); #endif From 73325bcd4142fb25607a9cb7c9503e9a9f4432dc Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 14 Aug 2014 11:05:49 +0200 Subject: [PATCH 11/94] csync statedb: Fixed handling of sqlite reply value. --- csync/src/csync_statedb.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/csync/src/csync_statedb.c b/csync/src/csync_statedb.c index 87809151c1..d04c2d20ee 100644 --- a/csync/src/csync_statedb.c +++ b/csync/src/csync_statedb.c @@ -322,6 +322,10 @@ static int _csync_file_stat_from_metadata_table( csync_file_stat_t **st, sqlite3 REMOTE_PERM_BUF_SIZE); } } + } else { + if( rc != SQLITE_DONE ) { + CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "WARN: Query results in %d", rc); + } } return rc; } @@ -353,8 +357,9 @@ csync_file_stat_t *csync_statedb_get_stat_by_hash(CSYNC *ctx, sqlite3_bind_int64(ctx->statedb.by_hash_stmt, 1, (long long signed int)phash); - if( _csync_file_stat_from_metadata_table(&st, ctx->statedb.by_hash_stmt) < 0 ) { - CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata!"); + rc = _csync_file_stat_from_metadata_table(&st, ctx->statedb.by_hash_stmt); + if( !(rc == SQLITE_ROW || rc == SQLITE_DONE) ) { + CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata: %d!", rc); } sqlite3_reset(ctx->statedb.by_hash_stmt); @@ -390,8 +395,9 @@ csync_file_stat_t *csync_statedb_get_stat_by_file_id(CSYNC *ctx, /* bind the query value */ sqlite3_bind_text(ctx->statedb.by_fileid_stmt, 1, file_id, -1, SQLITE_STATIC); - if( _csync_file_stat_from_metadata_table(&st, ctx->statedb.by_fileid_stmt) < 0 ) { - CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata!"); + rc = _csync_file_stat_from_metadata_table(&st, ctx->statedb.by_fileid_stmt); + if( !(rc == SQLITE_ROW || rc == SQLITE_DONE) ) { + CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata: %d!", rc); } // clear the resources used by the statement. sqlite3_reset(ctx->statedb.by_fileid_stmt); @@ -430,8 +436,9 @@ csync_file_stat_t *csync_statedb_get_stat_by_inode(CSYNC *ctx, sqlite3_bind_int64(ctx->statedb.by_inode_stmt, 1, (long long signed int)inode); - if( _csync_file_stat_from_metadata_table(&st, ctx->statedb.by_inode_stmt) < 0 ) { - CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata by inode!"); + rc = _csync_file_stat_from_metadata_table(&st, ctx->statedb.by_inode_stmt); + if( !(rc == SQLITE_ROW || rc == SQLITE_DONE) ) { + CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata by inode: %d!", rc); } sqlite3_reset(ctx->statedb.by_inode_stmt); From 8bc0d9acd3815d0884c59f58e2c37da493c1af0b Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 14 Aug 2014 11:06:48 +0200 Subject: [PATCH 12/94] Updater: Added a bit of useful logging. --- csync/src/csync_update.c | 1 + 1 file changed, 1 insertion(+) diff --git a/csync/src/csync_update.c b/csync/src/csync_update.c index 36270e36bb..63a2da1ba7 100644 --- a/csync/src/csync_update.c +++ b/csync/src/csync_update.c @@ -342,6 +342,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file, } } } else { + CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Unable to open statedb, setting inst to NEW" ); st->instruction = CSYNC_INSTRUCTION_NEW; } From f6d20cbe55ee489cab46c11cbee987f9b2300c94 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 14 Aug 2014 11:07:20 +0200 Subject: [PATCH 13/94] nautilus overlay: Fix reconnect, create a new socket everytime. --- shell_integration/nautilus/ownCloud.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/shell_integration/nautilus/ownCloud.py b/shell_integration/nautilus/ownCloud.py index 819cf03ee4..9c5dc1f079 100755 --- a/shell_integration/nautilus/ownCloud.py +++ b/shell_integration/nautilus/ownCloud.py @@ -15,7 +15,6 @@ class ownCloudExtension(GObject.GObject, Nautilus.ColumnProvider, Nautilus.InfoP watch_id = 0 def __init__(self): - self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.connectToOwnCloud if not self.connected: # try again in 5 seconds - attention, logic inverted! @@ -23,12 +22,15 @@ class ownCloudExtension(GObject.GObject, Nautilus.ColumnProvider, Nautilus.InfoP def connectToOwnCloud(self): try: + self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + self.sock.connect(("localhost", 33001)) self.sock.settimeout(5) self.connected = True self.watch_id = GObject.io_add_watch(self.sock, GObject.IO_IN, self.handle_notify) except: print "Connect could not be established, try again later!" + self.sock.close() return not self.connected def sendCommand(self, cmd): From f515fe77c48e57688f6acfe076ce38a698689d5c Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 14 Aug 2014 11:28:03 +0200 Subject: [PATCH 14/94] SyncJournal: Fix logging text. --- src/mirall/syncjournaldb.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mirall/syncjournaldb.cpp b/src/mirall/syncjournaldb.cpp index 84af4060e9..1696a08962 100644 --- a/src/mirall/syncjournaldb.cpp +++ b/src/mirall/syncjournaldb.cpp @@ -53,7 +53,7 @@ void SyncJournalDb::startTransaction() { if( _transaction == 0 ) { if( !_db.transaction() ) { - qDebug() << "ERROR committing to the database: " << _db.lastError().text(); + qDebug() << "ERROR starting transaction: " << _db.lastError().text(); return; } _transaction = 1; From 32739cc3052075d88d8c4ae9d2a0fd800bd8e130 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 14 Aug 2014 11:28:34 +0200 Subject: [PATCH 15/94] SyncEngine: End the journal transaction after update. --- src/mirall/syncengine.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp index 90fa76a0d8..764adbb5b8 100644 --- a/src/mirall/syncengine.cpp +++ b/src/mirall/syncengine.cpp @@ -622,6 +622,10 @@ void SyncEngine::slotUpdateFinished(int updateResult) QProcess::execute(script.toUtf8()); } #endif + + // do a database commit + _journal->commit("post treewalk"); + _propagator.reset(new OwncloudPropagator (session, _localPath, _remoteUrl, _remotePath, _journal, &_thread)); connect(_propagator.data(), SIGNAL(completed(SyncFileItem)), From 0350508b651d3ad16fe6ede76a975e0b41bacaaf Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 14 Aug 2014 11:31:34 +0200 Subject: [PATCH 16/94] FolderMan: Proper singleton implementation. The connect in SocketAPI had to be moved because it also uses FolderMan::instance(). And since SocketAPI is instanciated in FolderMans constructor, this was a deadlock. Now the connect is tried on every new socket connection in SocketAPI but I assume that multiple attempts to connect are not an issue. --- src/mirall/application.h | 3 --- src/mirall/folderman.cpp | 11 +++++++++-- src/mirall/socketapi.cpp | 9 +++++---- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/mirall/application.h b/src/mirall/application.h index 02690cc990..bdd4758c5a 100644 --- a/src/mirall/application.h +++ b/src/mirall/application.h @@ -28,7 +28,6 @@ #include "mirall/connectionvalidator.h" #include "mirall/progressdispatcher.h" #include "mirall/clientproxy.h" -#include "mirall/folderman.h" class QMessageBox; class QSystemTrayIcon; @@ -106,8 +105,6 @@ private: QTimer _checkConnectionTimer; - FolderMan folderManager; - friend class ownCloudGui; // for _startupNetworkError }; diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp index 5729c4d35a..33c377a30d 100644 --- a/src/mirall/folderman.cpp +++ b/src/mirall/folderman.cpp @@ -49,14 +49,21 @@ FolderMan::FolderMan(QObject *parent) : this, SLOT(slotScheduleSync(const QString&))); ne_sock_init(); - Q_ASSERT(!_instance); - _instance = this; _socketApi = new SocketApi(this); } FolderMan *FolderMan::instance() { + static QMutex mutex; + if (!_instance) + { + QMutexLocker lock(&mutex); + if (!_instance) { + _instance = new FolderMan; + } + } + return _instance; } diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp index 1f5f02a615..7fb0618c01 100644 --- a/src/mirall/socketapi.cpp +++ b/src/mirall/socketapi.cpp @@ -187,10 +187,6 @@ SocketApi::SocketApi(QObject* parent) } connect(_localServer, SIGNAL(newConnection()), this, SLOT(slotNewConnection())); - // folder watcher - connect(FolderMan::instance(), SIGNAL(folderSyncStateChange(QString)), this, SLOT(slotUpdateFolderView(QString))); - connect(ProgressDispatcher::instance(), SIGNAL(jobCompleted(QString,SyncFileItem)), - SLOT(slotJobCompleted(QString,SyncFileItem))); } SocketApi::~SocketApi() @@ -206,6 +202,11 @@ void SocketApi::slotNewConnection() if( ! socket ) { return; } + // folder watcher + connect(FolderMan::instance(), SIGNAL(folderSyncStateChange(QString)), this, SLOT(slotUpdateFolderView(QString))); + connect(ProgressDispatcher::instance(), SIGNAL(jobCompleted(QString,SyncFileItem)), + SLOT(slotJobCompleted(QString,SyncFileItem))); + DEBUG << "New connection" << socket; connect(socket, SIGNAL(readyRead()), this, SLOT(slotReadSocket())); connect(socket, SIGNAL(disconnected()), this, SLOT(onLostConnection())); From d27ab8c6caab96b25c0cabb1dadb3b6f775dd279 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 14 Aug 2014 12:46:01 +0200 Subject: [PATCH 17/94] Revert "FolderMan: Proper singleton implementation." This reverts commit 0350508b651d3ad16fe6ede76a975e0b41bacaaf. --- src/mirall/application.h | 3 +++ src/mirall/folderman.cpp | 11 ++--------- src/mirall/socketapi.cpp | 9 ++++----- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/mirall/application.h b/src/mirall/application.h index bdd4758c5a..02690cc990 100644 --- a/src/mirall/application.h +++ b/src/mirall/application.h @@ -28,6 +28,7 @@ #include "mirall/connectionvalidator.h" #include "mirall/progressdispatcher.h" #include "mirall/clientproxy.h" +#include "mirall/folderman.h" class QMessageBox; class QSystemTrayIcon; @@ -105,6 +106,8 @@ private: QTimer _checkConnectionTimer; + FolderMan folderManager; + friend class ownCloudGui; // for _startupNetworkError }; diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp index 33c377a30d..5729c4d35a 100644 --- a/src/mirall/folderman.cpp +++ b/src/mirall/folderman.cpp @@ -49,21 +49,14 @@ FolderMan::FolderMan(QObject *parent) : this, SLOT(slotScheduleSync(const QString&))); ne_sock_init(); + Q_ASSERT(!_instance); + _instance = this; _socketApi = new SocketApi(this); } FolderMan *FolderMan::instance() { - static QMutex mutex; - if (!_instance) - { - QMutexLocker lock(&mutex); - if (!_instance) { - _instance = new FolderMan; - } - } - return _instance; } diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp index 7fb0618c01..1f5f02a615 100644 --- a/src/mirall/socketapi.cpp +++ b/src/mirall/socketapi.cpp @@ -187,6 +187,10 @@ SocketApi::SocketApi(QObject* parent) } connect(_localServer, SIGNAL(newConnection()), this, SLOT(slotNewConnection())); + // folder watcher + connect(FolderMan::instance(), SIGNAL(folderSyncStateChange(QString)), this, SLOT(slotUpdateFolderView(QString))); + connect(ProgressDispatcher::instance(), SIGNAL(jobCompleted(QString,SyncFileItem)), + SLOT(slotJobCompleted(QString,SyncFileItem))); } SocketApi::~SocketApi() @@ -202,11 +206,6 @@ void SocketApi::slotNewConnection() if( ! socket ) { return; } - // folder watcher - connect(FolderMan::instance(), SIGNAL(folderSyncStateChange(QString)), this, SLOT(slotUpdateFolderView(QString))); - connect(ProgressDispatcher::instance(), SIGNAL(jobCompleted(QString,SyncFileItem)), - SLOT(slotJobCompleted(QString,SyncFileItem))); - DEBUG << "New connection" << socket; connect(socket, SIGNAL(readyRead()), this, SLOT(slotReadSocket())); connect(socket, SIGNAL(disconnected()), this, SLOT(onLostConnection())); From 7fcf7230395b1fe7e8d6950f1f1d5f699f26fa45 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 14 Aug 2014 13:22:43 +0200 Subject: [PATCH 18/94] SyncJournal: Add an index on inode to the journal database. --- src/mirall/syncjournaldb.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/mirall/syncjournaldb.cpp b/src/mirall/syncjournaldb.cpp index 1696a08962..89c1238743 100644 --- a/src/mirall/syncjournaldb.cpp +++ b/src/mirall/syncjournaldb.cpp @@ -319,16 +319,24 @@ bool SyncJournalDb::updateDatabaseStructure() query.prepare("CREATE INDEX metadata_file_id ON metadata(fileid);"); re = re && query.exec(); - commitInternal("update database structure"); + commitInternal("update database structure: add fileid col"); } if( columns.indexOf(QLatin1String("remotePerm")) == -1 ) { QSqlQuery query(_db); query.prepare("ALTER TABLE metadata ADD COLUMN remotePerm VARCHAR(128);"); - re = query.exec(); + re = re && query.exec(); commitInternal("update database structure (remotePerm"); } + if( 1 ) { + QSqlQuery query(_db); + query.prepare("CREATE UNIQUE INDEX IF NOT EXISTS metadata_inode ON metadata(inode);"); + re = re && query.exec(); + + commitInternal("update database structure: add inode index"); + + } return re; } From b09498d852ca21801aa05e14314e28de209cc950 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 14 Aug 2014 13:52:44 +0200 Subject: [PATCH 19/94] csync journal: Improve get_below_path query. Add another index on the pathlen column. Use that column to deselect all rows that are shorter than the path to search files below. That shrinks the amount of rows to examine using LIKE tremendously by a cheaply to query for criteria. --- csync/src/csync_statedb.c | 9 ++++++--- src/mirall/syncjournaldb.cpp | 11 ++++++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/csync/src/csync_statedb.c b/csync/src/csync_statedb.c index d04c2d20ee..0a26f810e2 100644 --- a/csync/src/csync_statedb.c +++ b/csync/src/csync_statedb.c @@ -467,7 +467,7 @@ char *csync_statedb_get_etag( CSYNC *ctx, uint64_t jHash ) { return ret; } -#define BELOW_PATH_QUERY "SELECT phash, pathlen, path, inode, uid, gid, mode, modtime, type, md5, fileid, remotePerm FROM metadata WHERE path LIKE(?)" +#define BELOW_PATH_QUERY "SELECT phash, pathlen, path, inode, uid, gid, mode, modtime, type, md5, fileid, remotePerm FROM metadata WHERE pathlen>? AND path LIKE(?)" int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) { int rc; @@ -475,6 +475,7 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) { int64_t cnt = 0; char *likepath; int asp; + int min_path_len; if( !path ) { return -1; @@ -486,7 +487,7 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) { rc = sqlite3_prepare_v2(ctx->statedb.db, BELOW_PATH_QUERY, -1, &stmt, NULL); if( rc != SQLITE_OK ) { - CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Unable to create stmt for hash query."); + CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Unable to create stmt for below path query."); return -1; } @@ -500,7 +501,9 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) { return -1; } - sqlite3_bind_text(stmt, 1, likepath, -1, SQLITE_STATIC); + min_path_len = strlen(path); + sqlite3_bind_int(stmt, 1, min_path_len); + sqlite3_bind_text(stmt, 2, likepath, -1, SQLITE_STATIC); cnt = 0; diff --git a/src/mirall/syncjournaldb.cpp b/src/mirall/syncjournaldb.cpp index 89c1238743..35a51bac63 100644 --- a/src/mirall/syncjournaldb.cpp +++ b/src/mirall/syncjournaldb.cpp @@ -331,11 +331,20 @@ bool SyncJournalDb::updateDatabaseStructure() if( 1 ) { QSqlQuery query(_db); - query.prepare("CREATE UNIQUE INDEX IF NOT EXISTS metadata_inode ON metadata(inode);"); + query.prepare("CREATE INDEX IF NOT EXISTS metadata_inode ON metadata(inode);"); re = re && query.exec(); commitInternal("update database structure: add inode index"); + } + + if( 1 ) { + QSqlQuery query(_db); + query.prepare("CREATE INDEX IF NOT EXISTS metadata_pathlen ON metadata(pathlen);"); + re = re && query.exec(); + + commitInternal("update database structure: add pathlen index"); + } return re; } From 78e50747e4e2337cf0a6d8159777947481b87c10 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 14 Aug 2014 17:07:47 +0200 Subject: [PATCH 20/94] Updated the about text for the generic ownCloud Theme. --- src/mirall/generalsettings.cpp | 1 + src/mirall/owncloudtheme.cpp | 6 +++++- src/mirall/theme.cpp | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/mirall/generalsettings.cpp b/src/mirall/generalsettings.cpp index 6c8fe59148..0377fbfeef 100644 --- a/src/mirall/generalsettings.cpp +++ b/src/mirall/generalsettings.cpp @@ -46,6 +46,7 @@ GeneralSettings::GeneralSettings(QWidget *parent) : _ui->aboutGroupBox->hide(); } else { _ui->aboutLabel->setText(about); + _ui->aboutLabel->setWordWrap(true); _ui->aboutLabel->setOpenExternalLinks(true); } diff --git a/src/mirall/owncloudtheme.cpp b/src/mirall/owncloudtheme.cpp index f73aa7c552..75049ef9d1 100644 --- a/src/mirall/owncloudtheme.cpp +++ b/src/mirall/owncloudtheme.cpp @@ -59,8 +59,12 @@ QString ownCloudTheme::about() const return QCoreApplication::translate("ownCloudTheme::about()", "

Version %2. " "For more information visit %4

" - "

By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.
" + "

By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.
" "Based on Mirall by Duncan Mac-Vicar P.

" + "

Copyright ownCloud, Inc.

" + "

Licensed under the GNU Public License (GPL) Version 2.0
" + "ownCloud and the ownCloud Logo is a registered trademark of ownCloud," + "Inc. in the United States, other countries, or both

" "%7" ) .arg(MIRALL_VERSION_STRING) diff --git a/src/mirall/theme.cpp b/src/mirall/theme.cpp index cd804949d4..1643091b5f 100644 --- a/src/mirall/theme.cpp +++ b/src/mirall/theme.cpp @@ -217,9 +217,9 @@ QString Theme::updateCheckUrl() const QString Theme::about() const { return tr("

Version %1 For more information please visit %3.

" - "

Copyright ownCloud, Inc.

" + "

Copyright ownCloud, Inc.

" "

Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.
" - "%5 and the %5 logo are registered trademarks of %4 in the
" + "%5 and the %5 logo are registered trademarks of %4 in the " "United States, other countries, or both.

") .arg(MIRALL_VERSION_STRING).arg("http://" MIRALL_STRINGIFY(APPLICATION_DOMAIN)) .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN)).arg(APPLICATION_VENDOR).arg(APPLICATION_NAME); From 390910243684354a3337217fc79198d535557139 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Fri, 15 Aug 2014 01:25:29 -0400 Subject: [PATCH 21/94] [tx-robot] updated from transifex --- translations/mirall_ca.ts | 30 ++++++++++++++-------------- translations/mirall_cs.ts | 30 ++++++++++++++-------------- translations/mirall_de.ts | 30 ++++++++++++++-------------- translations/mirall_el.ts | 31 ++++++++++++++--------------- translations/mirall_en.ts | 26 ++++++++++++------------ translations/mirall_es.ts | 30 ++++++++++++++-------------- translations/mirall_es_AR.ts | 28 +++++++++++++------------- translations/mirall_et.ts | 30 ++++++++++++++-------------- translations/mirall_eu.ts | 30 ++++++++++++++-------------- translations/mirall_fa.ts | 26 ++++++++++++------------ translations/mirall_fi.ts | 28 +++++++++++++------------- translations/mirall_fr.ts | 30 ++++++++++++++-------------- translations/mirall_gl.ts | 38 ++++++++++++++++++------------------ translations/mirall_hu.ts | 26 ++++++++++++------------ translations/mirall_it.ts | 30 ++++++++++++++-------------- translations/mirall_ja.ts | 30 ++++++++++++++-------------- translations/mirall_nl.ts | 30 ++++++++++++++-------------- translations/mirall_pl.ts | 30 ++++++++++++++-------------- translations/mirall_pt.ts | 30 ++++++++++++++-------------- translations/mirall_pt_BR.ts | 30 ++++++++++++++-------------- translations/mirall_ru.ts | 30 ++++++++++++++-------------- translations/mirall_sk.ts | 30 ++++++++++++++-------------- translations/mirall_sl.ts | 30 ++++++++++++++-------------- translations/mirall_sv.ts | 30 ++++++++++++++-------------- translations/mirall_th.ts | 26 ++++++++++++------------ translations/mirall_tr.ts | 30 ++++++++++++++-------------- translations/mirall_uk.ts | 26 ++++++++++++------------ translations/mirall_zh_CN.ts | 28 +++++++++++++------------- translations/mirall_zh_TW.ts | 26 ++++++++++++------------ 29 files changed, 424 insertions(+), 425 deletions(-) diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts index 2aa0e32cae..c4b7958dae 100644 --- a/translations/mirall_ca.ts +++ b/translations/mirall_ca.ts @@ -1970,48 +1970,48 @@ Proveu de sincronitzar-los de nou. No es pot obrir el diari de sincronització - + Not allowed because you don't have permission to add sub-directories in that directory No es permet perquè no teniu permisos per afegir subcarpetes en aquesta carpeta - + Not allowed because you don't have permission to add parent directory No es permet perquè no teniu permisos per afegir una carpeta inferior - + Not allowed because you don't have permission to add files in that directory No es permet perquè no teniu permisos per afegir fitxers en aquesta carpeta - + Not allowed to upload this file because it is read-only on the server, restoring No es permet pujar aquest fitxer perquè només és de lectura en el servidor, es restaura - - + + Not allowed to remove, restoring No es permet l'eliminació, es restaura - + Move not allowed, item restored No es permet moure'l, l'element es restaura - + Move not allowed because %1 is read-only No es permet moure perquè %1 només és de lectura - + the destination el destí - + the source l'origen @@ -2028,8 +2028,8 @@ Proveu de sincronitzar-los de nou. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> - <p>Versió %1 Per més informació visiteu <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distribuït per %4 i amb Llicència Pública General GNU (GPL) Versió 2.0.<br>%5 i el %5 logo són marques registrades de %4 als<br>Estats Units, altres països, o ambdós.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2400,7 +2400,7 @@ Proveu de sincronitzar-los de nou. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Si encara no teniu un servidor ownCloud, mireu <a href="https://owncloud.com">owncloud.com</a> per més informació. @@ -2415,8 +2415,8 @@ Proveu de sincronitzar-los de nou. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Versió %2. Per més informació visiteu <a href="%3">%4</a></p><p><small>Per Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Basat en Mirall per Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts index 44f9be30c5..306cf9af66 100644 --- a/translations/mirall_cs.ts +++ b/translations/mirall_cs.ts @@ -1971,48 +1971,48 @@ Zkuste provést novou synchronizaci. Nelze otevřít synchronizační žurnál - + Not allowed because you don't have permission to add sub-directories in that directory Není povoleno, protože nemáte oprávnění vytvářet podadresáře v tomto adresáři. - + Not allowed because you don't have permission to add parent directory Není povoleno, protože nemáte oprávnění vytvořit rodičovský adresář. - + Not allowed because you don't have permission to add files in that directory Není povoleno, protože nemáte oprávnění přidávat soubory do tohoto adresáře - + Not allowed to upload this file because it is read-only on the server, restoring Není povoleno nahrát tento soubor, protože je na serveru uložen pouze pro čtení, obnovuji - - + + Not allowed to remove, restoring Odstranění není povoleno, obnovuji - + Move not allowed, item restored Přesun není povolen, položka obnovena - + Move not allowed because %1 is read-only Přesun není povolen, protože %1 je pouze pro čtení - + the destination cílové umístění - + the source zdroj @@ -2029,8 +2029,8 @@ Zkuste provést novou synchronizaci. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> - <p>Verze %1. Pro více informací navštivte <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distribuováno %4 a licencováno pod GNU General Public License (GPL) Version 2.0.<br>%5 a logo %5 jsou registrované obchodní známky %4 ve <br>Spojených státech, ostatních zemích nebo obojí.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2401,7 +2401,7 @@ Zkuste provést novou synchronizaci. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Pokud zatím nemáte ownCloud server, získáte více informací na <a href="https://owncloud.com">owncloud.com</a> @@ -2416,8 +2416,8 @@ Zkuste provést novou synchronizaci. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Verze %2. Pro více informací navštivte <a href="%3">%4</a></p><p><small>Vytvořili Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Založeno na Mirall od Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts index bef7bb6ead..7164d84f83 100644 --- a/translations/mirall_de.ts +++ b/translations/mirall_de.ts @@ -1971,48 +1971,48 @@ Versuchen Sie diese nochmals zu synchronisieren. Synchronisationsbericht kann nicht geöffnet werden - + Not allowed because you don't have permission to add sub-directories in that directory Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben - + Not allowed because you don't have permission to add parent directory Nicht erlaubt, da Sie keine Rechte zur Erstellung von Hauptordnern haben - + Not allowed because you don't have permission to add files in that directory Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben - + Not allowed to upload this file because it is read-only on the server, restoring Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist, Wiederherstellung - - + + Not allowed to remove, restoring Löschen nicht erlaubt, Wiederherstellung - + Move not allowed, item restored Verschieben nicht erlaubt, Element wiederhergestellt - + Move not allowed because %1 is read-only Verschieben nicht erlaubt, da %1 schreibgeschützt ist - + the destination Das Ziel - + the source Die Quelle @@ -2029,8 +2029,8 @@ Versuchen Sie diese nochmals zu synchronisieren. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> - <p>Version %1 Für weitere Informationen besuchen Sie bitte <a href='%2'>%3</a>.</p><p>Urheberrecht von ownCloud, Inc.<p><p>Zur Verfügung gestellt durch %4 und lizensiert unter der GNU General Public License (GPL) Version 2.0.<br>%5 und das %5 Logo sind eingetragene Warenzeichen von %4 in den <br>Vereinigten Staaten, anderen Ländern oder beides.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2401,7 +2401,7 @@ Versuchen Sie diese nochmals zu synchronisieren. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Wenn Sie noch keinen ownCloud-Server haben, informieren Sie sich unter <a href="https://owncloud.com">owncloud.com</a>. @@ -2416,8 +2416,8 @@ Versuchen Sie diese nochmals zu synchronisieren. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Version %2. Für mehr Informationen besuchen Sie <a href="%3">%4</a></p><p><small> Von Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc., <br> Basierend auf Mirall von Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts index 390e7d7c58..3f0b204d20 100644 --- a/translations/mirall_el.ts +++ b/translations/mirall_el.ts @@ -1971,48 +1971,48 @@ It is not advisable to use it. Αδυναμία ανοίγματος του αρχείου συγχρονισμού - + Not allowed because you don't have permission to add sub-directories in that directory Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε υπο-καταλόγους σε αυτό τον κατάλογο - + Not allowed because you don't have permission to add parent directory Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε στο γονεϊκό κατάλογο - + Not allowed because you don't have permission to add files in that directory Δεν επιτρέπεται επειδή δεν έχεται δικαιώματα να προσθέσετε αρχεία σε αυτόν τον κατάλογο - + Not allowed to upload this file because it is read-only on the server, restoring Δεν επιτρέπεται να μεταφορτώσετε αυτό το αρχείο επειδή είναι μόνο για ανάγνωση στο διακομιστή, αποκατάσταση σε εξέλιξη - - + + Not allowed to remove, restoring Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη - + Move not allowed, item restored Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε - + Move not allowed because %1 is read-only Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση - + the destination ο προορισμός - + the source η προέλευση @@ -2029,8 +2029,8 @@ It is not advisable to use it. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> - <p>Έκδοση %1 Για περισσότερες πληροφορίες, παρακαλώ επισκεφθείτε την ιστοσελίδα <a href='%2'>%3</a>.</p><p>Πνευματική ιδιοκτησία ownCloud, Inc.<p><p>Διανέμεται από %4 και αδειοδοτείται με την GNU General Public License (GPL) Έκδοση 2.0.<br>Το %5 και το λογότυπο %5 είναι σήμα κατατεθέν του %4 στις<br>Ηνωμένες Πολιτείες, άλλες χώρες ή και τα δυο.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2401,7 +2401,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Εάν δεν έχετε ένα διακομιστή ownCloud ακόμα, δείτε στην διεύθυνση <a href="https://owncloud.com">owncloud.com</a> για περισσότερες πληροφορίες. @@ -2416,9 +2416,8 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Έκδοση %2. Για περισσότερες πληροφορίες επισκεφθείτε<a href="%3"> -%4</a></p><p><small>Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Βασισμένη στο Mirall από τον Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts index d1d798e8ec..3fef48300c 100644 --- a/translations/mirall_en.ts +++ b/translations/mirall_en.ts @@ -1962,48 +1962,48 @@ It is not advisable to use it. - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2020,7 +2020,7 @@ It is not advisable to use it. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2392,7 +2392,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! @@ -2407,7 +2407,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts index 50e6f11794..62f2481a5e 100644 --- a/translations/mirall_es.ts +++ b/translations/mirall_es.ts @@ -1970,48 +1970,48 @@ Intente sincronizar los archivos nuevamente. No es posible abrir el diario de sincronización - + Not allowed because you don't have permission to add sub-directories in that directory No está permitido, porque no tiene permisos para añadir subcarpetas en este directorio. - + Not allowed because you don't have permission to add parent directory No está permitido porque no tiene permisos para añadir un directorio - + Not allowed because you don't have permission to add files in that directory No está permitido, porque no tiene permisos para crear archivos en este directorio - + Not allowed to upload this file because it is read-only on the server, restoring No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando. - - + + Not allowed to remove, restoring No está permitido borrar, restaurando. - + Move not allowed, item restored No está permitido mover, elemento restaurado. - + Move not allowed because %1 is read-only No está permitido mover, porque %1 es solo lectura. - + the destination destino - + the source origen @@ -2028,8 +2028,8 @@ Intente sincronizar los archivos nuevamente. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> - <p>Versión %1 Para mayor información, visite <a href='%2'>%3</a>.</p><p>Derechos reservados ownCloud, Inc.<p><p>Distribuido por %4 y con licencia GNU General Public License (GPL) Versión 2.0.<br>%5 y el logo de %5 son marcas registradas %4 en los<br>Estados Unidos, otros países, o en ambos.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2400,7 +2400,7 @@ Intente sincronizar los archivos nuevamente. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Si aún no tiene un servidor ownCloud, visite <a href="https://owncloud.com">owncloud.com</a> para obtener más información. @@ -2415,8 +2415,8 @@ Intente sincronizar los archivos nuevamente. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Versión %2. Para más información visite <a href="%3">%4</a></p><p><small>Por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Basado en Mirall por Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts index e138c84ed4..a81da0cd5f 100644 --- a/translations/mirall_es_AR.ts +++ b/translations/mirall_es_AR.ts @@ -1965,48 +1965,48 @@ Intente sincronizar estos nuevamente. - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2023,7 +2023,7 @@ Intente sincronizar estos nuevamente. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2396,7 +2396,7 @@ Intente sincronizar estos nuevamente. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Si todavía no tenés un servidor ownCloud, visitá <a href="https://owncloud.com">owncloud.com</a> para obtener más información. @@ -2411,8 +2411,8 @@ Intente sincronizar estos nuevamente. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Versión %2. Para más información visite <a href="%3">%4</a></p><p><small>Por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Basado en Mirall por Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts index 6d95c286e1..d17028da1f 100644 --- a/translations/mirall_et.ts +++ b/translations/mirall_et.ts @@ -1970,48 +1970,48 @@ Proovi neid uuesti sünkroniseerida. Ei suuda avada sünkroniseeringu zurnaali - + Not allowed because you don't have permission to add sub-directories in that directory Pole lubatud, kuna sul puuduvad õigused lisada sellesse kataloogi lisada alam-kataloogi - + Not allowed because you don't have permission to add parent directory Pole lubatud, kuna sul puuduvad õigused lisada ülemkataloog - + Not allowed because you don't have permission to add files in that directory Pole lubatud, kuna sul puuduvad õigused sellesse kataloogi faile lisada - + Not allowed to upload this file because it is read-only on the server, restoring Pole lubatud üles laadida, kuna tegemist on ainult-loetava serveriga, taastan - - + + Not allowed to remove, restoring Eemaldamine pole lubatud, taastan - + Move not allowed, item restored Liigutamine pole lubatud, üksus taastatud - + Move not allowed because %1 is read-only Liigutamien pole võimalik kuna %1 on ainult lugemiseks - + the destination sihtkoht - + the source allikas @@ -2028,8 +2028,8 @@ Proovi neid uuesti sünkroniseerida. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> - <p>Versioon %1. Täpsema info saamiseks palun külasta <a href='%2'>%3</a>.</p><p>Autoriõigus ownCloud, Inc.</p><p>Levitatatud %4 poolt ning litsenseeritud GNU General Public License (GPL) Version 2.0.<br>%5 ja %5 logo on %4 registreeritud kaubamärgid <br>USA-s ja teistes riikides</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2400,7 +2400,7 @@ Proovi neid uuesti sünkroniseerida. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Kui sul poole veel oma ownCloud serverit, vaata <a href="https://owncloud.com">owncloud.com</a> rohkema info saamiseks. @@ -2415,8 +2415,8 @@ Proovi neid uuesti sünkroniseerida. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Versioon %2. Täpsemaks infoks külasta <a href="%3">%4</a></p><p><small>Loodud Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc. poolt<br>Põhineb Mirall loodud Duncan Mac-Vicar P. poolt</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts index 746a2af1df..5723f41b48 100644 --- a/translations/mirall_eu.ts +++ b/translations/mirall_eu.ts @@ -1967,48 +1967,48 @@ Saiatu horiek berriz sinkronizatzen. - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2025,8 +2025,8 @@ Saiatu horiek berriz sinkronizatzen. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> - <p>%1 Bertsioa, informazio gehiago eskuratzeko ikusi <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p> %4-k GNU General Public License (GPL) 2.0 bertsioaren lizentziapean banatuta.<br>%5 eta %5 logoa %4ren marka erregistratuak dira <br>Amerikako Estatu Batuetan, beste herrialdeetan edo bietan.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2397,7 +2397,7 @@ Saiatu horiek berriz sinkronizatzen. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! ownCloud zerbitzaririk ez baduzu, ikusi <a href="https://owncloud.com">owncloud.com</a> informazio gehiago eskuratzeko. @@ -2412,8 +2412,8 @@ Saiatu horiek berriz sinkronizatzen. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>%2 Bertsioa, informazio gehiago eskuratzeko ikusi <a href="%3">%4</a></p><p><small>Egileak: Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br> Duncan Mac-Vicar P.-ek egindako Mirall programan oinarrituta</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts index b7a6a2276f..4e912910ae 100644 --- a/translations/mirall_fa.ts +++ b/translations/mirall_fa.ts @@ -1960,48 +1960,48 @@ It is not advisable to use it. - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2018,7 +2018,7 @@ It is not advisable to use it. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2390,7 +2390,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! اگر شما هنوز یک سرور ownCloud ندارید، <a href="https://owncloud.com">owncloud.com</a> را برای اطلاعات بیشتر ببینید. @@ -2405,7 +2405,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts index 103ef80153..9f4941f0d7 100644 --- a/translations/mirall_fi.ts +++ b/translations/mirall_fi.ts @@ -1965,48 +1965,48 @@ Osoitteen käyttäminen ei ole suositeltavaa. - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory Ei sallittu, koska sinulla ei ole oikeutta lisätä tiedostoja kyseiseen kansioon - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring Poistaminen ei ole sallittua, palautetaan - + Move not allowed, item restored Siirtäminen ei ole sallittua, kohde palautettu - + Move not allowed because %1 is read-only Siirto ei ole sallittu, koska %1 on "vain luku"-tilassa - + the destination kohde - + the source lähde @@ -2023,7 +2023,7 @@ Osoitteen käyttäminen ei ole suositeltavaa. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2395,7 +2395,7 @@ Osoitteen käyttäminen ei ole suositeltavaa. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Jos käytössäsi ei ole vielä ownCloud-palvelinta, lue lisätietoja osoitteessa <a href="https://owncloud.com">owncloud.com</a>. @@ -2410,8 +2410,8 @@ Osoitteen käyttäminen ei ole suositeltavaa. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Versio %2. Lisätietoja osoitteessa <a href="%3">%4</a></p><p><small>Tehnyt Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Pohjautuu Duncan Mac-Vicar P:n Miralliin</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts index 11d4aae0f7..805ec6640d 100644 --- a/translations/mirall_fr.ts +++ b/translations/mirall_fr.ts @@ -1970,48 +1970,48 @@ Il est déconseillé de l'utiliser. Impossible d'ouvrir le journal de synchronisation - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory Non autorisé parce-que vous n'avez pas la permission d'ajouter des fichiers dans ce dossier - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only Déplacement non autorisé car %1 est en mode lecture seule - + the destination la destination - + the source la source @@ -2028,8 +2028,8 @@ Il est déconseillé de l'utiliser. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> - <p>Version %1 Pour plus d'informations, veuillez visiter <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2400,7 +2400,7 @@ Il est déconseillé de l'utiliser. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Si vous n'avez pas encore de serveur ownCloud, consultez <a href="https://owncloud.com">owncloud.com</a> pour obtenir plus d'informations. @@ -2415,8 +2415,8 @@ Il est déconseillé de l'utiliser. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Version %2. Pour plus d'informations, consultez <a href="%3">%4</a></p><p><small>Par Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Basé sur Mirall par Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts index c620e2c755..09c56ecfdc 100644 --- a/translations/mirall_gl.ts +++ b/translations/mirall_gl.ts @@ -382,7 +382,7 @@ Confirma que quere realizar esta operación? An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. - Atopouse un rexistro de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningún aplicativo. + Atopouse un rexistro de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningunha aplicación. @@ -947,7 +947,7 @@ actualización pode pedir privilexios adicionais durante o proceso. Version %1 available. Restart application to start the update. - Dispoñíbel a versión %1. Reinicie o aplicativo para iniciar a actualización. + Dispoñíbel a versión %1. Reinicie a aplicación para iniciar a actualización. @@ -1218,7 +1218,7 @@ Recomendámoslle que non o use. Skip folders configuration - + Omitir a configuración dos cartafoles @@ -1970,48 +1970,48 @@ Tente sincronizalos de novo. Non foi posíbel abrir o rexistro de sincronización - + Not allowed because you don't have permission to add sub-directories in that directory Non está permitido xa que non ten permiso para engadir subdirectorios nese directorio - + Not allowed because you don't have permission to add parent directory Non está permitido xa que non ten permiso para engadir un directorio pai - + Not allowed because you don't have permission to add files in that directory Non está permitido xa que non ten permiso para engadir ficheiros nese directorio - + Not allowed to upload this file because it is read-only on the server, restoring Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando - - + + Not allowed to remove, restoring Non está permitido retiralo, restaurando - + Move not allowed, item restored Nos está permitido movelo, elemento restaurado - + Move not allowed because %1 is read-only Bon está permitido movelo xa que %1 é só de lectura - + the destination o destino - + the source a orixe @@ -2028,8 +2028,8 @@ Tente sincronizalos de novo. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> - <p>Versión %1 Para obter máis información vexa <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distribuído por %4 e licenciado baixo a Licenza Pública Xeral GPL/GNU Versión 2.0.<br>Os logotipos %5 e %5 son marcas rexistradas de %4 nos<br>Estados Unidos de Norte América e/ou outros países.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2394,13 +2394,13 @@ Tente sincronizalos de novo. %1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again. - %1 require dunha área de notificación. Se está executando XFCE, siga <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">estas instrucións</a>. Senón, instale un aplicativo de área de notificación como «trayer» e ténteo de novo. + %1 require dunha área de notificación. Se está executando XFCE, siga <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">estas instrucións</a>. Senón, instale unha aplicación de área de notificación como «trayer» e ténteo de novo. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Se aínda non ten un servidor ownCloud, vexa <a href="https://owncloud.com">owncloud.com</a> para obter máis información. @@ -2415,8 +2415,8 @@ Tente sincronizalos de novo. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Versión %2.Versión <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Baseado no Mirall por Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts index 31a87cfaa4..380bf30d00 100644 --- a/translations/mirall_hu.ts +++ b/translations/mirall_hu.ts @@ -1960,48 +1960,48 @@ It is not advisable to use it. - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2018,7 +2018,7 @@ It is not advisable to use it. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2390,7 +2390,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! @@ -2405,7 +2405,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts index 45cbb21e94..376348c28a 100644 --- a/translations/mirall_it.ts +++ b/translations/mirall_it.ts @@ -1969,48 +1969,48 @@ Prova a sincronizzare nuovamente. Impossibile aprire il registro di sincronizzazione - + Not allowed because you don't have permission to add sub-directories in that directory Non consentito poiché non disponi dei permessi per aggiungere sottocartelle in quella cartella - + Not allowed because you don't have permission to add parent directory Non consentito poiché non disponi dei permessi per aggiungere la cartella superiore - + Not allowed because you don't have permission to add files in that directory Non consentito poiché non disponi dei permessi per aggiungere file in quella cartella - + Not allowed to upload this file because it is read-only on the server, restoring Il caricamento di questo file non è consentito poiché è in sola lettura sul server, ripristino - - + + Not allowed to remove, restoring Rimozione non consentita, ripristino - + Move not allowed, item restored Spostamento non consentito, elemento ripristinato - + Move not allowed because %1 is read-only Spostamento non consentito poiché %1 è in sola lettura - + the destination la destinazione - + the source l'origine @@ -2027,8 +2027,8 @@ Prova a sincronizzare nuovamente. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> - <p>Versione %1 Per ulteriori informazioni visita <a href='%2'>%3</a>. </p><p>Copyright ownCloud, Inc.<p><p>Distribuito da %4 e sotto licenza GNU General Public License (GPL) versione 2.0.<br>%5 e il logo %5 sono marchi registrati di %4 negli <br>Stati Uniti, in altri paesi, o entrambi.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2399,7 +2399,7 @@ Prova a sincronizzare nuovamente. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Se non hai ancora un server ownCloud, visita <a href="https://owncloud.com">owncloud.com</a> per ulteriori informazioni. @@ -2414,8 +2414,8 @@ Prova a sincronizzare nuovamente. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Versione %2. Per ulteriori informazioni, visita <a href="%3">%4</a></p><p><small>scritto da Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc..<br>Basato su Mirall di Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts index 5c8fe3415b..f33e7c504d 100644 --- a/translations/mirall_ja.ts +++ b/translations/mirall_ja.ts @@ -1968,48 +1968,48 @@ It is not advisable to use it. 同期ジャーナルを開くことができません - + Not allowed because you don't have permission to add sub-directories in that directory そのディレクトリにサブディレクトリを追加する権限がありません - + Not allowed because you don't have permission to add parent directory 親ディレクトリを追加する権限がありません - + Not allowed because you don't have permission to add files in that directory そのディレクトリにファイルを追加する権限がありません - + Not allowed to upload this file because it is read-only on the server, restoring サーバーでは読み取り専用となっているため、このファイルをアップロードすることはできません、復元しています - - + + Not allowed to remove, restoring 削除できません、復元しています - + Move not allowed, item restored 移動できません、項目を復元しました - + Move not allowed because %1 is read-only %1 は読み取り専用のため移動できません - + the destination 移動先 - + the source 移動元 @@ -2026,8 +2026,8 @@ It is not advisable to use it. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> - <p>バージョン %1 詳細については、<a href='%2'>%3</a>をご覧ください。</p><p>著作権 ownCloud, Inc.<p><p>%4 が配布し、 GNU General Public License (GPL) バージョン2.0 の下でライセンスされています。<br>%5 及び %5 のロゴはアメリカ合衆国またはその他の国、あるいはその両方における<br> %4 の登録商標です。</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2398,7 +2398,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! ownCloudサーバーをまだ所有していない場合は、<a href="https://owncloud.com">owncloud.com</a>で詳細を参照してください。 @@ -2413,8 +2413,8 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Version %2. 詳細な情報は、<a href="%3">%4</a>を参照してください。</p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts index 6afd10fc79..5dd11203c8 100644 --- a/translations/mirall_nl.ts +++ b/translations/mirall_nl.ts @@ -1970,48 +1970,48 @@ Probeer opnieuw te synchroniseren. Kan het sync journal niet openen - + Not allowed because you don't have permission to add sub-directories in that directory Niet toegestaan, omdat u geen rechten hebt om sub-directories aan te maken in die directory - + Not allowed because you don't have permission to add parent directory Niet toegestaan, omdat u geen rechten hebt om een bovenliggende directories toe te voegen - + Not allowed because you don't have permission to add files in that directory Niet toegestaan, omdat u geen rechten hebt om bestanden in die directory toe te voegen - + Not allowed to upload this file because it is read-only on the server, restoring Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen - - + + Not allowed to remove, restoring Niet toegestaan te verwijderen, herstellen - + Move not allowed, item restored Verplaatsen niet toegestaan, object hersteld - + Move not allowed because %1 is read-only Verplaatsen niet toegestaan omdat %1 alleen-lezen is - + the destination bestemming - + the source bron @@ -2028,8 +2028,8 @@ Probeer opnieuw te synchroniseren. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> - <p>Versie %1 Voor meer informatie bezoekt u <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Gedistribueer door %4 en verstrekt onder de GNU General Public License (GPL) Versie 2.0.<br>%5 en het %5 logo zijn geregistereerde handelsmerken van %4 in de<br>Verenigde Staten, andere landen, of beide.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2400,7 +2400,7 @@ Probeer opnieuw te synchroniseren. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Bezoek <a href="https://owncloud.com">owncloud.com</a> als u nog geen ownCloud-server heeft. @@ -2415,8 +2415,8 @@ Probeer opnieuw te synchroniseren. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Versie %2. Bezoek voor meer informatie <a href="%3">%4</a></p><p><small>Geschreven door Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Gebaseerd op Mirall van Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts index e5d42a52d4..a22e324542 100644 --- a/translations/mirall_pl.ts +++ b/translations/mirall_pl.ts @@ -1970,48 +1970,48 @@ Niezalecane jest jego użycie. Nie można otworzyć dziennika synchronizacji - + Not allowed because you don't have permission to add sub-directories in that directory Nie masz uprawnień do dodawania podkatalogów w tym katalogu. - + Not allowed because you don't have permission to add parent directory Nie masz uprawnień by dodać katalog nadrzędny - + Not allowed because you don't have permission to add files in that directory Nie masz uprawnień by dodać pliki w tym katalogu - + Not allowed to upload this file because it is read-only on the server, restoring Wgrywanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie - - + + Not allowed to remove, restoring Brak uprawnień by usunąć, przywracanie - + Move not allowed, item restored Przenoszenie niedozwolone, obiekt przywrócony - + Move not allowed because %1 is read-only Przenoszenie niedozwolone, ponieważ %1 jest tylko do odczytu - + the destination docelowy - + the source źródło @@ -2028,8 +2028,8 @@ Niezalecane jest jego użycie. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> - <p>Wersja %1 Aby uzyskać więcej informacji kliknij <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Rozprowadzany przez %4 i licencjonowany według GNU General Public License (GPL) Wersja 2.0.<br>%5 oraz logo %5 są zarejestrowanymi znakami towarowymi %4 w<br>Stanach Zjednoczonych, innych krajach lub obydwu.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2401,7 +2401,7 @@ Kliknij ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Jeśli nie masz jeszcze serwera ownCloud, wejdź na <a href="https://owncloud.com">owncloud.com</a> aby dowiedzieć się jak go zainstalować. @@ -2416,8 +2416,8 @@ Kliknij - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Wersja %2. Aby uzyskać więcej informacji odwiedź <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Oparty na Mirall by Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts index 8902787a71..36119b2fc0 100644 --- a/translations/mirall_pt.ts +++ b/translations/mirall_pt.ts @@ -1968,48 +1968,48 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n Impossível abrir o jornal de sincronismo - + Not allowed because you don't have permission to add sub-directories in that directory Não permitido, porque não tem permissão para adicionar sub-directórios ao directório - + Not allowed because you don't have permission to add parent directory Não permitido, porque não tem permissão para adicionar o directório principal - + Not allowed because you don't have permission to add files in that directory Não permitido, porque não tem permissão para adicionar ficheiros no directório - + Not allowed to upload this file because it is read-only on the server, restoring Não é permitido fazer o envio deste ficheiro porque é só de leitura no servidor, restaurando - - + + Not allowed to remove, restoring Não autorizado para remoção, restaurando - + Move not allowed, item restored Mover não foi permitido, item restaurado - + Move not allowed because %1 is read-only Mover não foi autorizado porque %1 é só de leitura - + the destination o destino - + the source a origem @@ -2026,8 +2026,8 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> - <p>Versão %1 Para mais informações por favor visite <a href='%2'>%3</a>.</p><p>Direitos de autor ownCloud, Inc.<p><p>Distribuido por %4 e licenciado através da versão 2.0 GNU General Public License (GPL) .<br>%5 e os %5 logotipos são marca registada de %4 nos<br>Estados Unidos, outros paises ou em ambos.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2398,7 +2398,7 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Se ainda não tem um servidor ownCloud, visite <a href="https://owncloud.com">owncloud.com</a> para mais informações. @@ -2413,8 +2413,8 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Versão %2. Para mais informações visite <a href="%3">%4</a></p><p><small>Desenvolvido por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Baseado em Mirall by Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts index 371f94ef1a..86a011ed3a 100644 --- a/translations/mirall_pt_BR.ts +++ b/translations/mirall_pt_BR.ts @@ -1968,48 +1968,48 @@ Tente sincronizar novamente. Não é possível abrir o arquivo de sincronização - + Not allowed because you don't have permission to add sub-directories in that directory Não permitido porque você não tem permissão de criar sub-pastas nesta pasta - + Not allowed because you don't have permission to add parent directory Não permitido porque você não tem permissão de criar pastas mãe - + Not allowed because you don't have permission to add files in that directory Não permitido porque você não tem permissão de adicionar arquivos a esta pasta - + Not allowed to upload this file because it is read-only on the server, restoring Não é permitido fazer o upload deste arquivo porque ele é somente leitura no servidor, restaurando - - + + Not allowed to remove, restoring Não é permitido remover, restaurando - + Move not allowed, item restored Não é permitido mover, item restaurado - + Move not allowed because %1 is read-only Não é permitido mover porque %1 é somente para leitura - + the destination o destino - + the source a fonte @@ -2026,8 +2026,8 @@ Tente sincronizar novamente. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> - <p>Versão %1 Para mais informações, visite <a href='%2'>%3</a>. </p> Direitos autorais ownCloud, Inc. <p><p> Distribuído por 4% e licenciado sob a GNU General Public License (GPL) Versão 2.0.<br>%5 e o logotipo 5% são marcas comerciais registradas da 4% no de Estados Unidos, outros países, ou ambos. </p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2398,7 +2398,7 @@ Tente sincronizar novamente. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Se você ainda não tem um servidor ownCloud, acesse <a href="https://owncloud.com">owncloud.com</a> para obter mais informações. @@ -2413,8 +2413,8 @@ Tente sincronizar novamente. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Versão %2. Para mais informações visite <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Baseado em Mirall by Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts index c34963ea9e..8947c4ace4 100644 --- a/translations/mirall_ru.ts +++ b/translations/mirall_ru.ts @@ -1970,48 +1970,48 @@ It is not advisable to use it. Не удаётся открыть журнал синхронизации - + Not allowed because you don't have permission to add sub-directories in that directory Недопустимо из-за отсутствия у вас разрешений на добавление подпапок в этой папке - + Not allowed because you don't have permission to add parent directory Недопустимо из-за отсутствия у вас разрешений на добавление родительской папки - + Not allowed because you don't have permission to add files in that directory Недопустимо из-за отсутствия у вас разрешений на добавление файлов в эту папку - + Not allowed to upload this file because it is read-only on the server, restoring Недопустимо отправить этот файл поскольку на севрере он помечен только для чтения, восстанавливаем - - + + Not allowed to remove, restoring Недопустимо удалить, восстанавливаем - + Move not allowed, item restored Перемещение недопустимо, элемент восстановлен - + Move not allowed because %1 is read-only Перемещение недопустимо, поскольку %1 помечен только для чтения - + the destination Назначение - + the source Источник @@ -2028,8 +2028,8 @@ It is not advisable to use it. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> - <p>Версия %1 Подробнее <a href='%2'>%3</a>.</p><p>Копирайт ownCloud, Inc.<p><p>Распространяется %4 и лицензировано под GNU General Public License (GPL) Версии 2.0.<br>%5 и %5 и логотип являются зарегистрированными торговыми марками %4 в<br>США и других странах,.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2400,7 +2400,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Если у Вас ещё нет сервера ownCloud, обратитесь за дополнительной информацией на <a href="https://owncloud.com">owncloud.com</a> @@ -2415,8 +2415,8 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Версия %2. Дополнительная информация: <a href="%3">%4</a></p><p><small>Авторы: Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Основано на Mirall, автор Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts index a54b9ed7a3..4e87a32d3c 100644 --- a/translations/mirall_sk.ts +++ b/translations/mirall_sk.ts @@ -1968,48 +1968,48 @@ Nie je vhodné ju používať. Nemožno otvoriť sync žurnál - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2026,8 +2026,8 @@ Nie je vhodné ju používať. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> - <p>Verzia %1. Pre získanie viac informácií navštívte <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distribuované %4 a licencované pod GNU General Public License (GPL) Version 2.0.<br>%5 a logo %5 sú registrované obchodné známky %4 v <br>Spojených štátoch, ostatných krajinách alebo oboje.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2398,7 +2398,7 @@ Nie je vhodné ju používať. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Ak ešte nemáte vlastný ownCloud server, na stránke <a href="https://owncloud.com">owncloud.com</a> nájdete viac informácií. @@ -2413,8 +2413,8 @@ Nie je vhodné ju používať. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Verzia %2. Pre získanie viac informácií navštívte stránku <a href="%3">%4</a></p><p><small>Od Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Založené na Mirall od Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts index 4b5a3b46d7..3f88880bd6 100644 --- a/translations/mirall_sl.ts +++ b/translations/mirall_sl.ts @@ -1969,48 +1969,48 @@ Te je treba uskladiti znova. Ni mogoče odpreti dnevnika usklajevanja - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination cilj - + the source vir @@ -2027,8 +2027,8 @@ Te je treba uskladiti znova. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> - <p>Različica %1. Več podrobnosti je zabeleženih na <a href='%2'>%3</a>.</p><p>Avtorske pravice ownCloud, Inc.<p><p>Programski paket objavlja %4 z dovoljenjem GNU General Public License (GPL) Version 2.0.<br>%5 in logotip %5 sta blagovni znamki %4 v <br>Združenih državah, drugih državah ali oboje.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2399,7 +2399,7 @@ Te je treba uskladiti znova. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! V primeru, da lastnega strežnika ownCloud še nimate, za več podrobnosti o možnostih obiščite spletišče <a href="https://owncloud.com">owncloud.com</a>. @@ -2414,8 +2414,8 @@ Te je treba uskladiti znova. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Različica %2. Za več podrobnosti obiščite <a href="%3">%4</a></p><p><small>Avtorji Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt in skupina ownCloud Inc.<br>Programski paket je zasnovan na sistemu Mirall avtorja Duncana P. Mac-Vicarja.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts index 3a9ede3fe1..e8b0b817dc 100644 --- a/translations/mirall_sv.ts +++ b/translations/mirall_sv.ts @@ -1970,48 +1970,48 @@ Försök att synka dessa igen. Kunde inte öppna synk journalen - + Not allowed because you don't have permission to add sub-directories in that directory Går ej att genomföra då du saknar rättigheter att lägga till underkataloger i den katalogen - + Not allowed because you don't have permission to add parent directory Går ej att genomföra då du saknar rättigheter att lägga till någon moderkatalog - + Not allowed because you don't have permission to add files in that directory Går ej att genomföra då du saknar rättigheter att lägga till filer i den katalogen - + Not allowed to upload this file because it is read-only on the server, restoring Inte behörig att ladda upp denna fil då den är skrivskyddad på servern, återställer - - + + Not allowed to remove, restoring Inte behörig att radera, återställer - + Move not allowed, item restored Det gick inte att genomföra flytten, objektet återställs - + Move not allowed because %1 is read-only Det gick inte att genomföra flytten då %1 är skrivskyddad - + the destination destinationen - + the source källan @@ -2028,8 +2028,8 @@ Försök att synka dessa igen. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> - <p>Version %1 För mer information besök <a href='%2'>%3</a>.</p><p>Upphovsrätt ownCloud, Inc.<p><p>Distribuerad av %4 och licensierad under GNU General Public License (GPL) version 2.0.<br>%5 och %5 logotypen är registrerade varumärken som tillhör %4 i <br>USA, andra länder, eller både och.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2400,7 +2400,7 @@ Försök att synka dessa igen. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Om du inte har en ownCloud-server ännu, besök <a href="https://owncloud.com">owncloud.com</a> för mer info. @@ -2415,8 +2415,8 @@ Försök att synka dessa igen. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Version %2. För mer information besök <a href="%3">%4</a></p><p><small>Skriven av Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Baserad på Mirall av Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts index c7c1514bb4..a430466df0 100644 --- a/translations/mirall_th.ts +++ b/translations/mirall_th.ts @@ -1960,48 +1960,48 @@ It is not advisable to use it. - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2018,7 +2018,7 @@ It is not advisable to use it. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2390,7 +2390,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! @@ -2405,7 +2405,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts index e3f768001a..35ca36617e 100644 --- a/translations/mirall_tr.ts +++ b/translations/mirall_tr.ts @@ -1970,48 +1970,48 @@ Bu dosyaları tekrar eşitlemeyi deneyin. Eşitleme günlüğü açılamıyor - + Not allowed because you don't have permission to add sub-directories in that directory Bu dizine alt dizin ekleme yetkiniz olmadığından izin verilmedi - + Not allowed because you don't have permission to add parent directory Üst dizin ekleme yetkiniz olmadığından izin verilmedi - + Not allowed because you don't have permission to add files in that directory Bu dizine dosya ekleme yetkiniz olmadığından izin verilmedi - + Not allowed to upload this file because it is read-only on the server, restoring Sunucuda salt okunur olduğundan, bu dosya yüklenemedi, geri alınıyor - - + + Not allowed to remove, restoring Kaldırmaya izin verilmedi, geri alınıyor - + Move not allowed, item restored Taşımaya izin verilmedi, öge geri alındı - + Move not allowed because %1 is read-only %1 salt okunur olduğundan taşımaya izin verilmedi - + the destination hedef - + the source kaynak @@ -2028,8 +2028,8 @@ Bu dosyaları tekrar eşitlemeyi deneyin. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> - <p>Sürüm %1 Daha fazla bilgi için lütfen <a href='%2'>%3</a> adresini ziyaret edin.</p><p>Telif hakkı ownCloud, Inc.<p><p>Dağıtım %4 ve GNU Genel Kamu Lisansı (GPL) Sürüm 2.0 ile lisanslanmıştır.<br>%5 ve %5 logoları <br>ABD ve/veya diğer ülkelerde %4 tescili markalarıdır.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2400,7 +2400,7 @@ Bu dosyaları tekrar eşitlemeyi deneyin. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Eğer hala bir ownCloud sunucunuz yoksa, daha fazla bilgi için <a href="https://owncloud.com">owncloud.com</a> adresine bakın. @@ -2415,8 +2415,8 @@ Bu dosyaları tekrar eşitlemeyi deneyin. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>Sürüm %2. Daha fazla bilgi için <a href="%3">%4</a> sitesini ziyaret edin.</p><p><small>Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Anonim.<br>Duncan Mac-Vicar P tarafından yazılan Mirall tabanlıdır.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts index 1e23d8ea54..755bc5afa7 100644 --- a/translations/mirall_uk.ts +++ b/translations/mirall_uk.ts @@ -1962,48 +1962,48 @@ It is not advisable to use it. - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2020,7 +2020,7 @@ It is not advisable to use it. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2392,7 +2392,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Якщо ви ще не маєте власного сервера ownCloud, подивіться <a href="https://owncloud.com">owncloud.com</a> з цього приводу. @@ -2407,7 +2407,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts index 4a04925149..38f583bb47 100644 --- a/translations/mirall_zh_CN.ts +++ b/translations/mirall_zh_CN.ts @@ -1966,48 +1966,48 @@ It is not advisable to use it. 无法打开同步日志 - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2024,7 +2024,7 @@ It is not advisable to use it. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2396,7 +2396,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! 如果您还没有一个 ownCloud 服务器，请到 <a href="https://owncloud.com"> 获取更多信息。 @@ -2411,8 +2411,8 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 - <p>版本 %2。更多信息请登录 <a href="%3">%4</a></p><p><small>由 Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc 制作。<br>基于 Duncan Mac-Vicar P 的 Mirall。</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts index 64ceac92ff..c6f9a256e6 100644 --- a/translations/mirall_zh_TW.ts +++ b/translations/mirall_zh_TW.ts @@ -1960,48 +1960,48 @@ It is not advisable to use it. - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2018,7 +2018,7 @@ It is not advisable to use it. Mirall::Theme - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p> + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2390,7 +2390,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! 若您尚未擁有ownCloud伺服器，可參閱<a href="https://owncloud.com">owncloud.com</a> 來獲得更多資訊。 @@ -2405,7 +2405,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 From c1831f4946a2f88c7365cb618c283a47f813fd78 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 15 Aug 2014 12:29:10 +0200 Subject: [PATCH 22/94] Selective sync: use a black list instead of a white list --- csync/src/csync_exclude.c | 4 ++-- csync/src/csync_private.h | 4 ++-- src/mirall/discoveryphase.cpp | 33 +++++++++++------------------- src/mirall/discoveryphase.h | 4 ++-- src/mirall/folder.cpp | 2 +- src/mirall/folder.h | 8 ++++---- src/mirall/folderman.cpp | 4 ++-- src/mirall/selectivesyncdialog.cpp | 24 +++++++++++----------- src/mirall/selectivesyncdialog.h | 2 +- src/mirall/syncengine.cpp | 2 +- src/mirall/syncengine.h | 2 +- 11 files changed, 40 insertions(+), 49 deletions(-) diff --git a/csync/src/csync_exclude.c b/csync/src/csync_exclude.c index 0458795732..eb97eeaa4b 100644 --- a/csync/src/csync_exclude.c +++ b/csync/src/csync_exclude.c @@ -313,8 +313,8 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype) { SAFE_FREE(dname); } - if (match == CSYNC_NOT_EXCLUDED && ctx->checkWhiteListHook) { - if (!ctx->checkWhiteListHook(ctx->checkWhiteListData, path)) { + if (match == CSYNC_NOT_EXCLUDED && ctx->checkBlackListHook) { + if (ctx->checkBlackListHook(ctx->checkBlackListData, path)) { match = CSYNC_FILE_EXCLUDE_LIST; } } diff --git a/csync/src/csync_private.h b/csync/src/csync_private.h index e2da3ea56a..80b4053e70 100644 --- a/csync/src/csync_private.h +++ b/csync/src/csync_private.h @@ -146,8 +146,8 @@ struct csync_s { struct csync_owncloud_ctx_s *owncloud_context; /* hooks for checking the white list */ - void *checkWhiteListData; - int (*checkWhiteListHook)(void*, const char*); + void *checkBlackListData; + int (*checkBlackListHook)(void*, const char*); }; diff --git a/src/mirall/discoveryphase.cpp b/src/mirall/discoveryphase.cpp index 8cd5860ed9..1b9c754d00 100644 --- a/src/mirall/discoveryphase.cpp +++ b/src/mirall/discoveryphase.cpp @@ -16,33 +16,24 @@ #include #include -bool DiscoveryJob::isInWhiteList(const QString& path) const +bool DiscoveryJob::isInBlackList(const QString& path) const { - if (_selectiveSyncWhiteList.isEmpty()) { - // If there is no white list, everything is allowed - return true; + if (_selectiveSyncBlackList.isEmpty()) { + // If there is no black list, everything is allowed + return false; } - // If the path is a prefix of any item of the list, this means we need to go deeper, so we sync. - // (this means it was partially checked) - // If one of the item in the white list is a prefix of the path, it means this path need to + // If one of the item in the black list is a prefix of the path, it means this path need not to // be synced. // // We know the list is sorted (for it is done in DiscoveryJob::start) - // So we can do a binary search. If the path is a prefix if another item, this item will be - // equal, or right after in the lexical order. - // If an item has the path as a prefix, it will be right before in the lexicographic order. + // So we can do a binary search. If the path is a prefix if another item or right after in the lexical order. QString pathSlash = path + QLatin1Char('/'); - auto it = std::lower_bound(_selectiveSyncWhiteList.begin(), _selectiveSyncWhiteList.end(), pathSlash); - if (it != _selectiveSyncWhiteList.end() && (*it + QLatin1Char('/')).startsWith(pathSlash)) { - // If the path is a prefix of something in the white list, we need to sync the contents - return true; - } + auto it = std::lower_bound(_selectiveSyncBlackList.begin(), _selectiveSyncBlackList.end(), pathSlash); - // If the item before is a prefix of the path, we are also good - if (it == _selectiveSyncWhiteList.begin()) { + if (it == _selectiveSyncBlackList.begin()) { return false; } --it; @@ -54,14 +45,14 @@ bool DiscoveryJob::isInWhiteList(const QString& path) const int DiscoveryJob::isInWhiteListCallBack(void *data, const char *path) { - return static_cast(data)->isInWhiteList(QString::fromUtf8(path)); + return static_cast(data)->isInBlackList(QString::fromUtf8(path)); } void DiscoveryJob::start() { - _selectiveSyncWhiteList.sort(); - _csync_ctx->checkWhiteListHook = isInWhiteListCallBack; - _csync_ctx->checkWhiteListData = this; + _selectiveSyncBlackList.sort(); + _csync_ctx->checkBlackListHook = isInWhiteListCallBack; + _csync_ctx->checkBlackListData = this; csync_set_log_callback(_log_callback); csync_set_log_level(_log_level); csync_set_log_userdata(_log_userdata); diff --git a/src/mirall/discoveryphase.h b/src/mirall/discoveryphase.h index 2044b62c92..88b5581a08 100644 --- a/src/mirall/discoveryphase.h +++ b/src/mirall/discoveryphase.h @@ -35,7 +35,7 @@ class DiscoveryJob : public QObject { * return true if the given path should be synced, * false if the path should be ignored */ - bool isInWhiteList(const QString &path) const; + bool isInBlackList(const QString &path) const; static int isInWhiteListCallBack(void *, const char *); public: @@ -48,7 +48,7 @@ public: _log_userdata = csync_get_log_userdata(); } - QStringList _selectiveSyncWhiteList; + QStringList _selectiveSyncBlackList; Q_INVOKABLE void start(); signals: void finished(int result); diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp index b0efb5e10b..dd293b7d01 100644 --- a/src/mirall/folder.cpp +++ b/src/mirall/folder.cpp @@ -596,7 +596,7 @@ void Folder::startSync(const QStringList &pathList) connect(_engine.data(), SIGNAL(jobCompleted(SyncFileItem)), this, SLOT(slotJobCompleted(SyncFileItem))); setDirtyNetworkLimits(); - _engine->setSelectiveSyncWhiteList(selectiveSyncList()); + _engine->setSelectiveSyncBlackList(selectiveSyncBlackList()); QMetaObject::invokeMethod(_engine.data(), "startSync", Qt::QueuedConnection); diff --git a/src/mirall/folder.h b/src/mirall/folder.h index 52304c8818..5b84783ee3 100644 --- a/src/mirall/folder.h +++ b/src/mirall/folder.h @@ -121,9 +121,9 @@ public: SyncJournalDb *journalDb() { return &_journal; } CSYNC *csyncContext() { return _csync_ctx; } - QStringList selectiveSyncList() { return _selectiveSyncWhiteList; } - void setSelectiveSyncList(const QStringList &whiteList) - { _selectiveSyncWhiteList = whiteList; } + QStringList selectiveSyncBlackList() { return _selectiveSyncBlackList; } + void setSelectiveSyncBlackList(const QStringList &blackList) + { _selectiveSyncBlackList = blackList; } signals: @@ -192,7 +192,7 @@ private: SyncResult _syncResult; QScopedPointer _engine; QStringList _errors; - QStringList _selectiveSyncWhiteList; + QStringList _selectiveSyncBlackList; bool _csyncError; bool _csyncUnavail; bool _wipeDb; diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp index 554ea34b44..24ad667436 100644 --- a/src/mirall/folderman.cpp +++ b/src/mirall/folderman.cpp @@ -312,7 +312,7 @@ Folder* FolderMan::setupFolderFromConfigFile(const QString &file) { QString backend = settings.value(QLatin1String("backend")).toString(); QString targetPath = settings.value( QLatin1String("targetPath")).toString(); bool paused = settings.value( QLatin1String("paused"), false).toBool(); - QStringList whiteList = settings.value( QLatin1String("whiteList")).toStringList(); + QStringList blackList = settings.value( QLatin1String("blackList")).toStringList(); // QString connection = settings.value( QLatin1String("connection") ).toString(); QString alias = unescapeAlias( escapedAlias ); @@ -328,7 +328,7 @@ Folder* FolderMan::setupFolderFromConfigFile(const QString &file) { folder = new Folder( alias, path, targetPath, this ); folder->setConfigFile(cfgFile.absoluteFilePath()); - folder->setSelectiveSyncList(whiteList); + folder->setSelectiveSyncBlackList(blackList); qDebug() << "Adding folder to Folder Map " << folder; _folderMap[alias] = folder; if (paused) { diff --git a/src/mirall/selectivesyncdialog.cpp b/src/mirall/selectivesyncdialog.cpp index ceeba0eb19..35cecd2ac9 100644 --- a/src/mirall/selectivesyncdialog.cpp +++ b/src/mirall/selectivesyncdialog.cpp @@ -91,10 +91,10 @@ void SelectiveSyncDialog::recursiveInsert(QTreeWidgetItem* parent, QStringList p } else if (parent->checkState(0) == Qt::Unchecked) { item->setCheckState(0, Qt::Unchecked); } else { - item->setCheckState(0, Qt::Unchecked); - foreach(const QString &str , _folder->selectiveSyncList()) { + item->setCheckState(0, Qt::Checked); + foreach(const QString &str , _folder->selectiveSyncBlackList()) { if (str + "/" == path) { - item->setCheckState(0, Qt::Checked); + item->setCheckState(0, Qt::Unchecked); break; } else if (str.startsWith(path)) { item->setCheckState(0, Qt::PartiallyChecked); @@ -123,7 +123,7 @@ void SelectiveSyncDialog::slotUpdateDirectories(const QStringList &list) root->setText(0, _folder->alias()); root->setIcon(0, Theme::instance()->applicationIcon()); root->setData(0, Qt::UserRole, _folder->remotePath()); - if (_folder->selectiveSyncList().isEmpty() || _folder->selectiveSyncList().contains(QString())) { + if (_folder->selectiveSyncBlackList().isEmpty() || _folder->selectiveSyncBlackList().contains(QString())) { root->setCheckState(0, Qt::Checked); } else { root->setCheckState(0, Qt::PartiallyChecked); @@ -212,7 +212,7 @@ void SelectiveSyncDialog::slotItemChanged(QTreeWidgetItem *item, int col) } } -QStringList SelectiveSyncDialog::createWhiteList(QTreeWidgetItem* root) const +QStringList SelectiveSyncDialog::createBlackList(QTreeWidgetItem* root) const { if (!root) { root = _treeView->topLevelItem(0); @@ -220,9 +220,9 @@ QStringList SelectiveSyncDialog::createWhiteList(QTreeWidgetItem* root) const if (!root) return {}; switch(root->checkState(0)) { - case Qt::Checked: - return { root->data(0, Qt::UserRole).toString() }; case Qt::Unchecked: + return { root->data(0, Qt::UserRole).toString() }; + case Qt::Checked: return {}; case Qt::PartiallyChecked: break; @@ -231,12 +231,12 @@ QStringList SelectiveSyncDialog::createWhiteList(QTreeWidgetItem* root) const QStringList result; if (root->childCount()) { for (int i = 0; i < root->childCount(); ++i) { - result += createWhiteList(root->child(i)); + result += createBlackList(root->child(i)); } } else { // We did not load from the server so we re-use the one from the old white list QString path = root->data(0, Qt::UserRole).toString(); - foreach (const QString & it, _folder->selectiveSyncList()) { + foreach (const QString & it, _folder->selectiveSyncBlackList()) { if (it.startsWith(path)) result += it; } @@ -246,13 +246,13 @@ QStringList SelectiveSyncDialog::createWhiteList(QTreeWidgetItem* root) const void SelectiveSyncDialog::accept() { - QStringList whiteList = createWhiteList(); - _folder->setSelectiveSyncList(whiteList); + QStringList blackList = createBlackList(); + _folder->setSelectiveSyncBlackList(blackList); // FIXME: Use MirallConfigFile QSettings settings(_folder->configFile(), QSettings::IniFormat); settings.beginGroup(FolderMan::escapeAlias(_folder->alias())); - settings.setValue("whiteList", whiteList); + settings.setValue("blackList", blackList); QDialog::accept(); } diff --git a/src/mirall/selectivesyncdialog.h b/src/mirall/selectivesyncdialog.h index a74a7aaa23..809f2c1670 100644 --- a/src/mirall/selectivesyncdialog.h +++ b/src/mirall/selectivesyncdialog.h @@ -27,7 +27,7 @@ public: explicit SelectiveSyncDialog(Folder *folder, QWidget* parent = 0, Qt::WindowFlags f = 0); virtual void accept() Q_DECL_OVERRIDE; - QStringList createWhiteList(QTreeWidgetItem* root = 0) const; + QStringList createBlackList(QTreeWidgetItem* root = 0) const; private slots: void refreshFolders(); diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp index a207349ac9..5f2e278413 100644 --- a/src/mirall/syncengine.cpp +++ b/src/mirall/syncengine.cpp @@ -533,7 +533,7 @@ void SyncEngine::startSync() qDebug() << "#### Discovery start #################################################### >>"; DiscoveryJob *job = new DiscoveryJob(_csync_ctx); - job->_selectiveSyncWhiteList = _selectiveSyncWhiteList; + job->_selectiveSyncBlackList = _selectiveSyncWhiteList; job->moveToThread(&_thread); connect(job, SIGNAL(finished(int)), this, SLOT(slotDiscoveryJobFinished(int))); QMetaObject::invokeMethod(job, "start", Qt::QueuedConnection); diff --git a/src/mirall/syncengine.h b/src/mirall/syncengine.h index 71b4505763..292ba35db8 100644 --- a/src/mirall/syncengine.h +++ b/src/mirall/syncengine.h @@ -59,7 +59,7 @@ public: Utility::StopWatch &stopWatch() { return _stopWatch; } - void setSelectiveSyncWhiteList(const QStringList &list) + void setSelectiveSyncBlackList(const QStringList &list) { _selectiveSyncWhiteList = list; } signals: From 4c4d02c0d0acf8905ad7924647aef3a6d0958f9f Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 15 Aug 2014 14:58:16 +0200 Subject: [PATCH 23/94] Selective Sync: refactor the widget in its own class --- src/mirall/selectivesyncdialog.cpp | 99 +++++++++++++++++------------- src/mirall/selectivesyncdialog.h | 32 +++++++--- 2 files changed, 80 insertions(+), 51 deletions(-) diff --git a/src/mirall/selectivesyncdialog.cpp b/src/mirall/selectivesyncdialog.cpp index 35cecd2ac9..aa15f3916f 100644 --- a/src/mirall/selectivesyncdialog.cpp +++ b/src/mirall/selectivesyncdialog.cpp @@ -28,36 +28,21 @@ namespace Mirall { -SelectiveSyncDialog::SelectiveSyncDialog(Folder* folder, QWidget* parent, Qt::WindowFlags f) - : QDialog(parent, f), _folder(folder) +SelectiveSyncTreeView::SelectiveSyncTreeView(const QString& folderPath, const QString &rootName, + const QStringList &oldBlackList, QWidget* parent) + : QTreeWidget(parent), _folderPath(folderPath), _rootName(rootName), _oldBlackList(oldBlackList) { - QVBoxLayout *layout = new QVBoxLayout(this); - _treeView = new QTreeWidget; - connect(_treeView, SIGNAL(itemExpanded(QTreeWidgetItem*)), this, SLOT(slotItemExpanded(QTreeWidgetItem*))); - connect(_treeView, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(slotItemChanged(QTreeWidgetItem*,int))); - layout->addWidget(_treeView); - QDialogButtonBox *buttonBox = new QDialogButtonBox(Qt::Horizontal); - QPushButton *button; - button = buttonBox->addButton(QDialogButtonBox::Ok); - connect(button, SIGNAL(clicked()), this, SLOT(accept())); - button = buttonBox->addButton(QDialogButtonBox::Cancel); - connect(button, SIGNAL(clicked()), this, SLOT(reject())); - layout->addWidget(buttonBox); - - // Make sure we don't get crashes if the folder is destroyed while we are still open - connect(_folder, SIGNAL(destroyed(QObject*)), this, SLOT(deleteLater())); - - refreshFolders(); + connect(this, SIGNAL(itemExpanded(QTreeWidgetItem*)), this, SLOT(slotItemExpanded(QTreeWidgetItem*))); + connect(this, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(slotItemChanged(QTreeWidgetItem*,int))); } -void SelectiveSyncDialog::refreshFolders() +void SelectiveSyncTreeView::refreshFolders() { - LsColJob *job = new LsColJob(AccountManager::instance()->account(), _folder->remotePath(), this); + LsColJob *job = new LsColJob(AccountManager::instance()->account(), _folderPath, this); connect(job, SIGNAL(directoryListing(QStringList)), this, SLOT(slotUpdateDirectories(QStringList))); job->start(); - _treeView->clear(); - + clear(); } static QTreeWidgetItem* findFirstChild(QTreeWidgetItem *parent, const QString& text) @@ -71,8 +56,7 @@ static QTreeWidgetItem* findFirstChild(QTreeWidgetItem *parent, const QString& t return 0; } -void SelectiveSyncDialog::recursiveInsert(QTreeWidgetItem* parent, QStringList pathTrail, - QString path) +void SelectiveSyncTreeView::recursiveInsert(QTreeWidgetItem* parent, QStringList pathTrail, QString path) { QFileIconProvider prov; QIcon folderIcon = prov.icon(QFileIconProvider::Folder); @@ -92,7 +76,7 @@ void SelectiveSyncDialog::recursiveInsert(QTreeWidgetItem* parent, QStringList p item->setCheckState(0, Qt::Unchecked); } else { item->setCheckState(0, Qt::Checked); - foreach(const QString &str , _folder->selectiveSyncBlackList()) { + foreach(const QString &str , _oldBlackList) { if (str + "/" == path) { item->setCheckState(0, Qt::Unchecked); break; @@ -112,34 +96,45 @@ void SelectiveSyncDialog::recursiveInsert(QTreeWidgetItem* parent, QStringList p } } -void SelectiveSyncDialog::slotUpdateDirectories(const QStringList &list) +void SelectiveSyncTreeView::slotUpdateDirectories(const QStringList&list) { QScopedValueRollback isInserting(_inserting); _inserting = true; - QTreeWidgetItem *root = _treeView->topLevelItem(0); + QTreeWidgetItem *root = topLevelItem(0); if (!root) { - root = new QTreeWidgetItem(_treeView); - root->setText(0, _folder->alias()); + root = new QTreeWidgetItem(this); + root->setText(0, _rootName); root->setIcon(0, Theme::instance()->applicationIcon()); - root->setData(0, Qt::UserRole, _folder->remotePath()); - if (_folder->selectiveSyncBlackList().isEmpty() || _folder->selectiveSyncBlackList().contains(QString())) { + root->setData(0, Qt::UserRole, _folderPath); + if (_oldBlackList.isEmpty()) { root->setCheckState(0, Qt::Checked); } else { root->setCheckState(0, Qt::PartiallyChecked); } } - const QString folderPath = _folder->remoteUrl().path(); + + Account *account = AccountManager::instance()->account(); + QUrl url = account->davUrl(); + QString pathToRemove = url.path(); + if (!pathToRemove.endsWith('/')) { + pathToRemove.append('/'); + } + pathToRemove.append(_folderPath); + pathToRemove.append('/'); + foreach (QString path, list) { - path.remove(folderPath); + path.remove(pathToRemove); QStringList paths = path.split('/'); if (paths.last().isEmpty()) paths.removeLast(); + if (paths.isEmpty()) + continue; recursiveInsert(root, paths, path); } root->setExpanded(true); } -void SelectiveSyncDialog::slotItemExpanded(QTreeWidgetItem *item) +void SelectiveSyncTreeView::slotItemExpanded(QTreeWidgetItem *item) { QString dir = item->data(0, Qt::UserRole).toString(); LsColJob *job = new LsColJob(AccountManager::instance()->account(), dir, this); @@ -148,7 +143,7 @@ void SelectiveSyncDialog::slotItemExpanded(QTreeWidgetItem *item) job->start(); } -void SelectiveSyncDialog::slotItemChanged(QTreeWidgetItem *item, int col) +void SelectiveSyncTreeView::slotItemChanged(QTreeWidgetItem *item, int col) { if (col != 0 || _inserting) return; @@ -212,10 +207,10 @@ void SelectiveSyncDialog::slotItemChanged(QTreeWidgetItem *item, int col) } } -QStringList SelectiveSyncDialog::createBlackList(QTreeWidgetItem* root) const +QStringList SelectiveSyncTreeView::createBlackList(QTreeWidgetItem* root) const { if (!root) { - root = _treeView->topLevelItem(0); + root = topLevelItem(0); } if (!root) return {}; @@ -234,9 +229,9 @@ QStringList SelectiveSyncDialog::createBlackList(QTreeWidgetItem* root) const result += createBlackList(root->child(i)); } } else { - // We did not load from the server so we re-use the one from the old white list + // We did not load from the server so we re-use the one from the old black list QString path = root->data(0, Qt::UserRole).toString(); - foreach (const QString & it, _folder->selectiveSyncBlackList()) { + foreach (const QString & it, _oldBlackList) { if (it.startsWith(path)) result += it; } @@ -244,9 +239,31 @@ QStringList SelectiveSyncDialog::createBlackList(QTreeWidgetItem* root) const return result; } + + +SelectiveSyncDialog::SelectiveSyncDialog(Folder* folder, QWidget* parent, Qt::WindowFlags f) + : QDialog(parent, f), _folder(folder) +{ + QVBoxLayout *layout = new QVBoxLayout(this); + _treeView = new SelectiveSyncTreeView(_folder->remotePath(), _folder->alias(), _folder->selectiveSyncBlackList(), parent); + layout->addWidget(_treeView); + QDialogButtonBox *buttonBox = new QDialogButtonBox(Qt::Horizontal); + QPushButton *button; + button = buttonBox->addButton(QDialogButtonBox::Ok); + connect(button, SIGNAL(clicked()), this, SLOT(accept())); + button = buttonBox->addButton(QDialogButtonBox::Cancel); + connect(button, SIGNAL(clicked()), this, SLOT(reject())); + layout->addWidget(buttonBox); + + // Make sure we don't get crashes if the folder is destroyed while we are still open + connect(_folder, SIGNAL(destroyed(QObject*)), this, SLOT(deleteLater())); + + _treeView->refreshFolders(); +} + void SelectiveSyncDialog::accept() { - QStringList blackList = createBlackList(); + QStringList blackList = _treeView->createBlackList(); _folder->setSelectiveSyncBlackList(blackList); // FIXME: Use MirallConfigFile diff --git a/src/mirall/selectivesyncdialog.h b/src/mirall/selectivesyncdialog.h index 809f2c1670..45bc80997b 100644 --- a/src/mirall/selectivesyncdialog.h +++ b/src/mirall/selectivesyncdialog.h @@ -14,6 +14,7 @@ #pragma once #include +#include class QTreeWidgetItem; class QTreeWidget; @@ -21,26 +22,37 @@ namespace Mirall { class Folder; +class SelectiveSyncTreeView : public QTreeWidget { + Q_OBJECT +public: + explicit SelectiveSyncTreeView(const QString &folderPath, const QString &rootName, + const QStringList &oldBlackList, QWidget* parent = 0); + QStringList createBlackList(QTreeWidgetItem* root = 0) const; + void refreshFolders(); +private slots: + void slotUpdateDirectories(const QStringList &); + void slotItemExpanded(QTreeWidgetItem *); + void slotItemChanged(QTreeWidgetItem*,int); +private: + void recursiveInsert(QTreeWidgetItem* parent, QStringList pathTrail, QString path); + QString _folderPath; + QString _rootName; + QStringList _oldBlackList; + bool _inserting = false; // set to true when we are inserting new items on the list +}; + class SelectiveSyncDialog : public QDialog { Q_OBJECT public: explicit SelectiveSyncDialog(Folder *folder, QWidget* parent = 0, Qt::WindowFlags f = 0); virtual void accept() Q_DECL_OVERRIDE; - QStringList createBlackList(QTreeWidgetItem* root = 0) const; - -private slots: - void refreshFolders(); - void slotUpdateDirectories(const QStringList &); - void slotItemExpanded(QTreeWidgetItem *); - void slotItemChanged(QTreeWidgetItem*,int); private: - void recursiveInsert(QTreeWidgetItem* parent, QStringList pathTrail, QString path); + + SelectiveSyncTreeView *_treeView; Folder *_folder; - QTreeWidget *_treeView; - bool _inserting = false; // set to true when we are inserting new items on the list }; From 4c67a8812afb8dda78c3a1a6e187866470c22b4e Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Fri, 15 Aug 2014 15:01:01 +0200 Subject: [PATCH 24/94] Show folder icon a offline when account is offline Fixes #1959 --- src/mirall/accountsettings.cpp | 67 ++++++++++++++++++++++++---------- src/mirall/accountsettings.h | 2 + src/mirall/application.cpp | 1 - src/mirall/folder.cpp | 4 +- src/mirall/folderman.cpp | 10 ----- src/mirall/owncloudgui.cpp | 4 +- src/mirall/owncloudtheme.cpp | 6 --- src/mirall/owncloudtheme.h | 1 - src/mirall/settingsdialog.cpp | 28 ++++---------- src/mirall/settingsdialog.h | 4 +- src/mirall/syncresult.cpp | 3 -- src/mirall/syncresult.h | 3 +- src/mirall/theme.cpp | 18 +++++---- src/mirall/theme.h | 3 +- 14 files changed, 78 insertions(+), 76 deletions(-) diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp index 6259d44936..eeeec59d29 100644 --- a/src/mirall/accountsettings.cpp +++ b/src/mirall/accountsettings.cpp @@ -111,9 +111,13 @@ AccountSettings::AccountSettings(QWidget *parent) : this, SLOT(slotAccountChanged(Account*,Account*))); slotAccountChanged(AccountManager::instance()->account(), 0); - connect(FolderMan::instance(), SIGNAL(folderListLoaded(Folder::Map)), + FolderMan *folderMan = FolderMan::instance(); + connect(folderMan, SIGNAL(folderSyncStateChange(QString)), + this, SLOT(slotSyncStateChange(QString))); + connect(folderMan, SIGNAL(folderListLoaded(Folder::Map)), this, SLOT(setFolderList(Folder::Map))); setFolderList(FolderMan::instance()->map()); + slotSyncStateChange(); } void AccountSettings::slotAccountChanged(Account *newAccount, Account *oldAccount) @@ -122,6 +126,7 @@ void AccountSettings::slotAccountChanged(Account *newAccount, Account *oldAccoun disconnect(oldAccount, SIGNAL(stateChanged(int)), this, SLOT(slotAccountStateChanged(int))); disconnect(oldAccount->quotaInfo(), SIGNAL(quotaUpdated(qint64,qint64)), this, SLOT(slotUpdateQuota(qint64,qint64))); + disconnect(oldAccount, SIGNAL(stateChanged(int)), this, SLOT(slotAccountStateChanged(int))); } _account = newAccount; @@ -260,35 +265,39 @@ void AccountSettings::folderToModelItem( QStandardItem *item, Folder *f ) Theme *theme = Theme::instance(); item->setData( theme->statusHeaderText( status ), Qt::ToolTipRole ); - if( f->syncEnabled() ) { - if( status == SyncResult::SyncPrepare ) { - if( _wasDisabledBefore ) { - // if the folder was disabled before, set the sync icon + if (_account->state() == Account::Connected) { + if( f->syncEnabled() ) { + if( status == SyncResult::SyncPrepare ) { + if( _wasDisabledBefore ) { + // if the folder was disabled before, set the sync icon + item->setData( theme->syncStateIcon( SyncResult::SyncRunning), FolderStatusDelegate::FolderStatusIconRole ); + } // we keep the previous icon for the SyncPrepare state. + } else if( status == SyncResult::Undefined ) { + // startup, the sync was never done. + qDebug() << "XXX FIRST time sync, setting icon to sync running!"; item->setData( theme->syncStateIcon( SyncResult::SyncRunning), FolderStatusDelegate::FolderStatusIconRole ); - } // we keep the previous icon for the SyncPrepare state. - } else if( status == SyncResult::Undefined ) { - // startup, the sync was never done. - qDebug() << "XXX FIRST time sync, setting icon to sync running!"; - item->setData( theme->syncStateIcon( SyncResult::SyncRunning), FolderStatusDelegate::FolderStatusIconRole ); - } else { - // kepp the previous icon for the prepare phase. - if( status == SyncResult::Problem) { - item->setData( theme->syncStateIcon( SyncResult::Success), FolderStatusDelegate::FolderStatusIconRole ); } else { - item->setData( theme->syncStateIcon( status ), FolderStatusDelegate::FolderStatusIconRole ); + // kepp the previous icon for the prepare phase. + if( status == SyncResult::Problem) { + item->setData( theme->syncStateIcon( SyncResult::Success), FolderStatusDelegate::FolderStatusIconRole ); + } else { + item->setData( theme->syncStateIcon( status ), FolderStatusDelegate::FolderStatusIconRole ); + } } + } else { + item->setData( theme->folderDisabledIcon( ), FolderStatusDelegate::FolderStatusIconRole ); // size 48 before + _wasDisabledBefore = false; } } else { - item->setData( theme->folderDisabledIcon( ), FolderStatusDelegate::FolderStatusIconRole ); // size 48 before - _wasDisabledBefore = false; + item->setData( theme->folderOfflineIcon(), FolderStatusDelegate::FolderStatusIconRole); } + item->setData( theme->statusHeaderText( status ), FolderStatusDelegate::FolderStatus ); if( errorList.isEmpty() ) { if( (status == SyncResult::Error || status == SyncResult::SetupError || - status == SyncResult::SyncAbortRequested || - status == SyncResult::Unavailable)) { + status == SyncResult::SyncAbortRequested )) { errorList << theme->statusHeaderText(status); } } @@ -730,6 +739,11 @@ void AccountSettings::slotAccountStateChanged(int state) QUrl safeUrl(_account->url()); safeUrl.setPassword(QString()); // Remove the password from the URL to avoid showing it in the UI slotButtonsSetEnabled(); + FolderMan *folderMan = FolderMan::instance(); + foreach (Folder *folder, folderMan->map().values()) { + slotUpdateFolderState(folder); + } + slotSyncStateChange(); if (state == Account::Connected) { QString user; if (AbstractCredentials *cred = _account->credentials()) { @@ -755,6 +769,21 @@ void AccountSettings::slotAccountStateChanged(int state) } } +void AccountSettings::slotSyncStateChange(const QString& alias) +{ + Q_UNUSED(alias); + + FolderMan *folderMan = FolderMan::instance(); + SyncResult state = folderMan->accountStatus(folderMan->map().values()); + QIcon icon; + if (_account && _account->state() == Account::Connected) { + icon = Theme::instance()->syncStateIcon(state.status()); + } else { + icon = Theme::instance()->folderOfflineIcon(); + } + emit accountIconChanged(icon); +} + AccountSettings::~AccountSettings() { delete ui; diff --git a/src/mirall/accountsettings.h b/src/mirall/accountsettings.h index 4e64ea25e6..ee3bfd4392 100644 --- a/src/mirall/accountsettings.h +++ b/src/mirall/accountsettings.h @@ -54,6 +54,7 @@ signals: void openProtocol(); void openFolderAlias( const QString& ); void infoFolderAlias( const QString& ); + void accountIconChanged( const QIcon& ); public slots: void slotFolderActivated( const QModelIndex& ); @@ -62,6 +63,7 @@ public slots: void slotDoubleClicked( const QModelIndex& ); void slotSetProgress(const QString& folder, const Progress::Info& progress); void slotButtonsSetEnabled(); + void slotSyncStateChange(const QString& alias = QString()); void slotUpdateQuota( qint64,qint64 ); void slotIgnoreFilesEditor(); diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp index cf506f0e22..cd33cd9392 100644 --- a/src/mirall/application.cpp +++ b/src/mirall/application.cpp @@ -179,7 +179,6 @@ void Application::slotLogout() FolderMan *folderMan = FolderMan::instance(); folderMan->setSyncEnabled(false); folderMan->terminateSyncProcess(); - folderMan->unloadAllFolders(); a->setState(Account::SignedOut); // show result _gui->slotComputeOverallSyncStatus(); diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp index 0b59485212..9677ce6abd 100644 --- a/src/mirall/folder.cpp +++ b/src/mirall/folder.cpp @@ -287,7 +287,6 @@ void Folder::slotNetworkUnavailable() if (account && account->state() == Account::Connected) { account->setState(Account::Disconnected); } - _syncResult.setStatus(SyncResult::Unavailable); emit syncStateChange(); } @@ -662,7 +661,8 @@ void Folder::slotSyncFinished() _syncResult.setErrorStrings( _errors ); qDebug() << " * owncloud csync thread finished with error"; } else if (_csyncUnavail) { - _syncResult.setStatus(SyncResult::Unavailable); + _syncResult.setStatus(SyncResult::Error); + qDebug() << " ** csync not available."; } else if( _syncResult.warnCount() > 0 ) { // there have been warnings on the way. _syncResult.setStatus(SyncResult::Problem); diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp index 5729c4d35a..7ec10a3d6a 100644 --- a/src/mirall/folderman.cpp +++ b/src/mirall/folderman.cpp @@ -695,9 +695,6 @@ SyncResult FolderMan::accountStatus(const QList &folders) case SyncResult::SyncRunning: overallResult.setStatus( SyncResult::SyncRunning ); break; - case SyncResult::Unavailable: - overallResult.setStatus( SyncResult::Unavailable ); - break; case SyncResult::Problem: // don't show the problem icon in tray. case SyncResult::Success: if( overallResult.status() == SyncResult::Undefined ) @@ -724,7 +721,6 @@ SyncResult FolderMan::accountStatus(const QList &folders) int abortSeen = 0; int runSeen = 0; int various = 0; - int unavail = 0; foreach ( Folder *folder, folders ) { SyncResult folderResult = folder->syncResult(); @@ -739,9 +735,6 @@ SyncResult FolderMan::accountStatus(const QList &folders) case SyncResult::SyncRunning: runSeen++; break; - case SyncResult::Unavailable: - unavail++; - break; case SyncResult::Problem: // don't show the problem icon in tray. case SyncResult::Success: goodSeen++; @@ -795,9 +788,6 @@ QString FolderMan::statusToString( SyncResult syncStatus, bool enabled ) const case SyncResult::SyncRunning: folderMessage = tr( "Sync is running." ); break; - case SyncResult::Unavailable: - folderMessage = tr( "Server is currently not available." ); - break; case SyncResult::Success: folderMessage = tr( "Last Sync was successful." ); break; diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp index 7d6b2689bd..48dbdd921f 100644 --- a/src/mirall/owncloudgui.cpp +++ b/src/mirall/owncloudgui.cpp @@ -212,12 +212,12 @@ void ownCloudGui::slotComputeOverallSyncStatus() { if (Account *a = AccountManager::instance()->account()) { if (a->state() == Account::SignedOut) { - _tray->setIcon(Theme::instance()->syncStateIcon( SyncResult::Unavailable, true)); + _tray->setIcon(Theme::instance()->folderOfflineIcon(true)); _tray->setToolTip(tr("Please sign in")); return; } if (a->state() == Account::Disconnected) { - _tray->setIcon(Theme::instance()->syncStateIcon( SyncResult::Unavailable, true)); + _tray->setIcon(Theme::instance()->folderOfflineIcon(true)); _tray->setToolTip(tr("Disconnected from server")); return; } diff --git a/src/mirall/owncloudtheme.cpp b/src/mirall/owncloudtheme.cpp index f73aa7c552..5276095d2c 100644 --- a/src/mirall/owncloudtheme.cpp +++ b/src/mirall/owncloudtheme.cpp @@ -77,12 +77,6 @@ QIcon ownCloudTheme::trayFolderIcon( const QString& ) const return QIcon::fromTheme("folder", fallback); } -QIcon ownCloudTheme::folderDisabledIcon( ) const -{ - // Fixme: Do we really want the dialog-canel from theme here? - return themeIcon( QLatin1String("state-pause") ); -} - QIcon ownCloudTheme::applicationIcon( ) const { return themeIcon( QLatin1String("owncloud-icon") ); diff --git a/src/mirall/owncloudtheme.h b/src/mirall/owncloudtheme.h index 33b33e2a94..1d8e599475 100644 --- a/src/mirall/owncloudtheme.h +++ b/src/mirall/owncloudtheme.h @@ -31,7 +31,6 @@ public: QIcon folderIcon( const QString& ) const; QIcon trayFolderIcon( const QString& ) const Q_DECL_OVERRIDE; - QIcon folderDisabledIcon() const Q_DECL_OVERRIDE; QIcon applicationIcon() const Q_DECL_OVERRIDE; QVariant customMedia(CustomMediaType type) Q_DECL_OVERRIDE; diff --git a/src/mirall/settingsdialog.cpp b/src/mirall/settingsdialog.cpp index ff44af8696..cc7cc992ce 100644 --- a/src/mirall/settingsdialog.cpp +++ b/src/mirall/settingsdialog.cpp @@ -14,7 +14,6 @@ #include "settingsdialog.h" #include "ui_settingsdialog.h" -#include "mirall/folderman.h" #include "mirall/theme.h" #include "mirall/generalsettings.h" #include "mirall/networksettings.h" @@ -74,11 +73,8 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) : NetworkSettings *networkSettings = new NetworkSettings; _ui->stack->addWidget(networkSettings); - FolderMan *folderMan = FolderMan::instance(); - connect( folderMan, SIGNAL(folderSyncStateChange(QString)), - this, SLOT(slotSyncStateChange(QString))); - connect( _accountSettings, SIGNAL(folderChanged()), gui, SLOT(slotFoldersChanged())); + connect( _accountSettings, SIGNAL(accountIconChanged(QIcon)), SLOT(slotUpdateAccountIcon(QIcon))); connect( _accountSettings, SIGNAL(openFolderAlias(const QString&)), gui, SLOT(slotFolderOpenAction(QString))); @@ -130,22 +126,7 @@ void SettingsDialog::addAccount(const QString &title, QWidget *widget) _accountItem->setSizeHint(QSize(0, 32)); _ui->labelWidget->addItem(_accountItem); _ui->stack->addWidget(widget); - slotSyncStateChange(); - -} - -void SettingsDialog::slotSyncStateChange(const QString& alias) -{ - FolderMan *folderMan = FolderMan::instance(); - SyncResult state = folderMan->accountStatus(folderMan->map().values()); - _accountItem->setIcon(Theme::instance()->syncStateIcon(state.status())); - - if (!alias.isEmpty()) { - Folder *folder = folderMan->folder(alias); - if( folder ) { - _accountSettings->slotUpdateFolderState(folder); - } - } + _accountSettings->slotSyncStateChange(); } void SettingsDialog::setGeneralErrors(const QStringList &errors) @@ -168,6 +149,11 @@ void SettingsDialog::accept() { QDialog::accept(); } +void SettingsDialog::slotUpdateAccountIcon(const QIcon &icon) +{ + _accountItem->setIcon(icon); +} + void SettingsDialog::showActivityPage() { _ui->labelWidget->setCurrentRow(_protocolIdx); diff --git a/src/mirall/settingsdialog.h b/src/mirall/settingsdialog.h index fe82e77e56..1e60f6d21e 100644 --- a/src/mirall/settingsdialog.h +++ b/src/mirall/settingsdialog.h @@ -45,13 +45,15 @@ public: void setGeneralErrors( const QStringList& errors ); public slots: - void slotSyncStateChange(const QString& alias = QString()); void showActivityPage(); protected: void reject() Q_DECL_OVERRIDE; void accept() Q_DECL_OVERRIDE; +private slots: + void slotUpdateAccountIcon(const QIcon& icon); + private: Ui::SettingsDialog *_ui; AccountSettings *_accountSettings; diff --git a/src/mirall/syncresult.cpp b/src/mirall/syncresult.cpp index b10a1a4594..289b6a986d 100644 --- a/src/mirall/syncresult.cpp +++ b/src/mirall/syncresult.cpp @@ -64,9 +64,6 @@ QString SyncResult::statusString() const case Problem: re = QLatin1String("Success, some files were ignored."); break; - case Unavailable: - re = QLatin1String("Not availabe"); - break; case SyncAbortRequested: re = QLatin1String("Sync Request aborted by user"); break; diff --git a/src/mirall/syncresult.h b/src/mirall/syncresult.h index 3350eda726..229aac1d99 100644 --- a/src/mirall/syncresult.h +++ b/src/mirall/syncresult.h @@ -39,8 +39,7 @@ public: Problem, Error, SetupError, - Paused, - Unavailable + Paused }; SyncResult(); diff --git a/src/mirall/theme.cpp b/src/mirall/theme.cpp index cd804949d4..f63a8bffe3 100644 --- a/src/mirall/theme.cpp +++ b/src/mirall/theme.cpp @@ -68,9 +68,6 @@ QString Theme::statusHeaderText( SyncResult::Status status ) const case SyncResult::SetupError: resultStr = QCoreApplication::translate("theme", "Setup Error" ); break; - case SyncResult::Unavailable: - resultStr = QCoreApplication::translate("theme", "The server is currently unavailable" ); - break; case SyncResult::SyncPrepare: resultStr = QCoreApplication::translate("theme", "Preparing to sync" ); break; @@ -268,9 +265,6 @@ QIcon Theme::syncStateIcon( SyncResult::Status status, bool sysTray ) const switch( status ) { case SyncResult::Undefined: case SyncResult::NotYetStarted: - case SyncResult::Unavailable: - statusIcon = QLatin1String("state-offline"); - break; case SyncResult::SyncRunning: statusIcon = QLatin1String("state-sync"); break; @@ -287,7 +281,7 @@ QIcon Theme::syncStateIcon( SyncResult::Status status, bool sysTray ) const break; case SyncResult::Error: case SyncResult::SetupError: - statusIcon = QLatin1String("state-error"); // FIXME: Use state-problem once we have an icon. + // FIXME: Use state-problem once we have an icon. default: statusIcon = QLatin1String("state-error"); } @@ -295,6 +289,16 @@ QIcon Theme::syncStateIcon( SyncResult::Status status, bool sysTray ) const return themeIcon( statusIcon, sysTray ); } +QIcon Theme::folderDisabledIcon( ) const +{ + return themeIcon( QLatin1String("state-pause") ); +} + +QIcon Theme::folderOfflineIcon(bool systray) const +{ + return themeIcon( QLatin1String("state-offline"), systray ); +} + QColor Theme::wizardHeaderTitleColor() const { return qApp->palette().text().color(); diff --git a/src/mirall/theme.h b/src/mirall/theme.h index 7f8166e6c9..3c1d69cb4d 100644 --- a/src/mirall/theme.h +++ b/src/mirall/theme.h @@ -90,7 +90,8 @@ public: */ virtual QIcon syncStateIcon( SyncResult::Status, bool sysTray = false ) const; - virtual QIcon folderDisabledIcon() const = 0; + virtual QIcon folderDisabledIcon() const; + virtual QIcon folderOfflineIcon(bool systray = false) const; virtual QIcon applicationIcon() const = 0; #endif From b40b6706396fdb202390ca4a7b47bc3e1704c847 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Fri, 15 Aug 2014 15:11:29 +0200 Subject: [PATCH 25/94] Remove owncloud_logo_blue.png from mirall.qrc resource It not used in mirall itself. --- mirall.qrc | 1 - 1 file changed, 1 deletion(-) diff --git a/mirall.qrc b/mirall.qrc index 7329f50417..afd9dce946 100644 --- a/mirall.qrc +++ b/mirall.qrc @@ -13,7 +13,6 @@ resources/settings.png resources/activity.png resources/network.png - resources/owncloud_logo_blue.png resources/lock-http.png resources/lock-https.png From ce2741cebc2501e9099f7794702b1cfa1f066ff3 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Fri, 15 Aug 2014 15:00:10 +0200 Subject: [PATCH 26/94] SyncEngine & UI: Progress notifications for update phase For each directory (local and remote, we have UI update throtting code) a signal is emitted. It is used by the settings dialog and the tray menu. --- csync/src/csync.h | 20 +++------------- csync/src/csync_owncloud.c | 4 ++++ csync/src/csync_owncloud_recursive_propfind.c | 8 +++++++ csync/src/csync_private.h | 2 ++ csync/src/vio/csync_vio.c | 1 + src/mirall/accountsettings.cpp | 11 +++++++-- src/mirall/folder.cpp | 8 +++++++ src/mirall/folder.h | 1 + src/mirall/folderstatusmodel.cpp | 2 +- src/mirall/owncloudgui.cpp | 10 +++++--- src/mirall/progressdispatcher.cpp | 8 ++++--- src/mirall/progressdispatcher.h | 3 +++ src/mirall/syncengine.cpp | 24 +++++++++++++++++++ src/mirall/syncengine.h | 12 ++++++++++ 14 files changed, 88 insertions(+), 26 deletions(-) diff --git a/csync/src/csync.h b/csync/src/csync.h index 607e0a0f79..2a793eb031 100644 --- a/csync/src/csync.h +++ b/csync/src/csync.h @@ -134,23 +134,6 @@ enum csync_ftw_type_e { CSYNC_FTW_TYPE_SKIP }; -enum csync_notify_type_e { - CSYNC_NOTIFY_INVALID, - CSYNC_NOTIFY_START_SYNC_SEQUENCE, - CSYNC_NOTIFY_START_DOWNLOAD, - CSYNC_NOTIFY_START_UPLOAD, - CSYNC_NOTIFY_PROGRESS, - CSYNC_NOTIFY_FINISHED_DOWNLOAD, - CSYNC_NOTIFY_FINISHED_UPLOAD, - CSYNC_NOTIFY_FINISHED_SYNC_SEQUENCE, - CSYNC_NOTIFY_START_DELETE, - CSYNC_NOTIFY_END_DELETE, - CSYNC_NOTIFY_ERROR, - CSYNC_NOTIFY_START_LOCAL_UPDATE, - CSYNC_NOTIFY_FINISHED_LOCAL_UPDATE, - CSYNC_NOTIFY_START_REMOTE_UPDATE, - CSYNC_NOTIFY_FINISHED_REMOTE_UPDATE -}; /** * CSync File Traversal structure. @@ -203,6 +186,9 @@ typedef void (*csync_log_callback) (int verbosity, const char *buffer, void *userdata); +typedef void (*csync_update_callback) (bool local, + const char *dirUrl, + void *userdata); /** * @brief Allocate a csync context. diff --git a/csync/src/csync_owncloud.c b/csync/src/csync_owncloud.c index 1e24828981..74d166d5ec 100644 --- a/csync/src/csync_owncloud.c +++ b/csync/src/csync_owncloud.c @@ -24,6 +24,8 @@ #include +#include "csync_private.h" + /* * helper method to build up a user text for SSL problems, called from the @@ -537,6 +539,8 @@ static struct listdir_context *fetch_resource_list(csync_owncloud_ctx_t *ctx, co } } + ctx->csync_ctx->callbacks.update_callback(false, curi, ctx->csync_ctx->callbacks.update_callback_userdata); + fetchCtx = c_malloc( sizeof( struct listdir_context )); if (!fetchCtx) { errno = ENOMEM; diff --git a/csync/src/csync_owncloud_recursive_propfind.c b/csync/src/csync_owncloud_recursive_propfind.c index d4af3ce63d..f3e6699c7b 100644 --- a/csync/src/csync_owncloud_recursive_propfind.c +++ b/csync/src/csync_owncloud_recursive_propfind.c @@ -54,6 +54,7 @@ struct listdir_context *get_listdir_context_from_recursive_cache(csync_owncloud_ DEBUG_WEBDAV("get_listdir_context_from_recursive_cache No element %s in cache found", curi); return NULL; } + ctx->csync_ctx->callbacks.update_callback(false, curi, ctx->csync_ctx->callbacks.update_callback_userdata); /* Out of the element, create a listdir_context.. if we could be sure that it is immutable, we could ref instead.. need to investigate */ fetchCtx = c_malloc( sizeof( struct listdir_context )); @@ -141,6 +142,12 @@ static void propfind_results_recursive_callback(void *userdata, element->parent = NULL; c_rbtree_insert(ctx->propfind_recursive_cache, element); /* DEBUG_WEBDAV("results_recursive Added collection %s", newres->uri); */ + + // We do this here and in get_listdir_context_from_recursive_cache because + // a recursive PROPFIND might take some time but we still want to + // be informed. Later when get_listdir_context_from_recursive_cache is + // called the DB queries might be the problem causing slowness, so do it again there then. + ctx->csync_ctx->callbacks.update_callback(false, path, ctx->csync_ctx->callbacks.update_callback_userdata); } } @@ -189,6 +196,7 @@ void fetch_resource_list_recursive(csync_owncloud_ctx_t *ctx, const char *uri, c int depth = NE_DEPTH_INFINITE; DEBUG_WEBDAV("fetch_resource_list_recursive Starting recursive propfind %s %s", uri, curi); + ctx->csync_ctx->callbacks.update_callback(false, curi, ctx->csync_ctx->callbacks.update_callback_userdata); /* do a propfind request and parse the results in the results function, set as callback */ hdl = ne_propfind_create(ctx->dav_session.ctx, curi, depth); diff --git a/csync/src/csync_private.h b/csync/src/csync_private.h index 2e3674b567..1798826dd0 100644 --- a/csync/src/csync_private.h +++ b/csync/src/csync_private.h @@ -87,6 +87,8 @@ struct csync_s { struct { csync_auth_callback auth_function; void *userdata; + csync_update_callback update_callback; + void *update_callback_userdata; } callbacks; c_strlist_t *excludes; diff --git a/csync/src/vio/csync_vio.c b/csync/src/vio/csync_vio.c index 80d833bdfe..ae658dc591 100644 --- a/csync/src/vio/csync_vio.c +++ b/csync/src/vio/csync_vio.c @@ -48,6 +48,7 @@ csync_vio_handle_t *csync_vio_opendir(CSYNC *ctx, const char *name) { return owncloud_opendir(ctx, name); break; case LOCAL_REPLICA: + ctx->callbacks.update_callback(ctx->replica, name, ctx->callbacks.update_callback_userdata); return csync_vio_local_opendir(name); break; default: diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp index eeeec59d29..7298c2c139 100644 --- a/src/mirall/accountsettings.cpp +++ b/src/mirall/accountsettings.cpp @@ -573,6 +573,14 @@ void AccountSettings::slotSetProgress(const QString& folder, const Progress::Inf QStandardItem *item = itemForFolder( folder ); if( !item ) return; + // switch on extra space. + item->setData( QVariant(true), FolderStatusDelegate::AddProgressSpace ); + + if (!progress._currentDiscoveredFolder.isEmpty()) { + item->setData( tr("Discovering %1").arg(progress._currentDiscoveredFolder) , FolderStatusDelegate::SyncProgressItemString ); + return; + } + if(!progress._lastCompletedItem.isEmpty() && Progress::isWarningKind(progress._lastCompletedItem._status)) { int warnCount = item->data(FolderStatusDelegate::WarningCount).toInt(); @@ -600,8 +608,7 @@ void AccountSettings::slotSetProgress(const QString& folder, const Progress::Inf QString itemFileName = shortenFilename(folder, curItem._file); QString kindString = Progress::asActionString(curItem); - // switch on extra space. - item->setData( QVariant(true), FolderStatusDelegate::AddProgressSpace ); + QString fileProgressString; if (Progress::isSizeDependent(curItem._instruction)) { diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp index 9677ce6abd..6844e4999e 100644 --- a/src/mirall/folder.cpp +++ b/src/mirall/folder.cpp @@ -591,6 +591,7 @@ void Folder::startSync(const QStringList &pathList) //direct connection so the message box is blocking the sync. connect(_engine.data(), SIGNAL(aboutToRemoveAllFiles(SyncFileItem::Direction,bool*)), SLOT(slotAboutToRemoveAllFiles(SyncFileItem::Direction,bool*))); + connect(_engine.data(), SIGNAL(folderDiscovered(bool,QString)), this, SLOT(slotFolderDiscovered(bool,QString))); connect(_engine.data(), SIGNAL(transmissionProgress(Progress::Info)), this, SLOT(slotTransmissionProgress(Progress::Info))); connect(_engine.data(), SIGNAL(jobCompleted(SyncFileItem)), this, SLOT(slotJobCompleted(SyncFileItem))); @@ -688,6 +689,13 @@ void Folder::slotEmitFinishedDelayed() } +void Folder::slotFolderDiscovered(bool local, QString folderName) +{ + Progress::Info pi; + pi._currentDiscoveredFolder = folderName; + ProgressDispatcher::instance()->setProgressInfo(alias(), pi); +} + // the progress comes without a folder and the valid path set. Add that here // and hand the result over to the progress dispatcher. diff --git a/src/mirall/folder.h b/src/mirall/folder.h index 8a9d554112..0e5656c980 100644 --- a/src/mirall/folder.h +++ b/src/mirall/folder.h @@ -157,6 +157,7 @@ private slots: void slotCsyncUnavailable(); void slotSyncFinished(); + void slotFolderDiscovered(bool local, QString folderName); void slotTransmissionProgress(const Progress::Info& pi); void slotJobCompleted(const SyncFileItem&); diff --git a/src/mirall/folderstatusmodel.cpp b/src/mirall/folderstatusmodel.cpp index 0dac618b3b..c4eea0f978 100644 --- a/src/mirall/folderstatusmodel.cpp +++ b/src/mirall/folderstatusmodel.cpp @@ -246,7 +246,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem & h += aliasMargin; // Sync File Progress Bar: Show it if syncFile is not empty. - if( !overallString.isEmpty()) { + if( !overallString.isEmpty() || !itemString.isEmpty()) { int fileNameTextHeight = subFm.boundingRect(tr("File")).height(); int barHeight = qMax(fileNameTextHeight, aliasFm.height()+4); ; int overallWidth = option.rect.width()-2*aliasMargin; diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp index 48dbdd921f..f9bd2a309a 100644 --- a/src/mirall/owncloudgui.cpp +++ b/src/mirall/owncloudgui.cpp @@ -444,13 +444,16 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const Progress::Info { Q_UNUSED(folder); - QString totalSizeStr = Utility::octetsToString( progress._totalSize ); - if(progress._totalSize == 0 ) { + if (!progress._currentDiscoveredFolder.isEmpty()) { + _actionStatus->setText( tr("Discovering %1") + .arg( progress._currentDiscoveredFolder )); + } else if (progress._totalSize == 0 ) { quint64 currentFile = progress._completedFileCount + progress._currentItems.count(); _actionStatus->setText( tr("Syncing %1 of %2 (%3 left)") .arg( currentFile ).arg( progress._totalFileCount ) .arg( Utility::timeToDescriptiveString(progress.totalEstimate().getEtaEstimate(), 2, " ",true) ) ); } else { + QString totalSizeStr = Utility::octetsToString( progress._totalSize ); _actionStatus->setText( tr("Syncing %1 (%2 left)") .arg( totalSizeStr ) .arg( Utility::timeToDescriptiveString(progress.totalEstimate().getEtaEstimate(), 2, " ",true) ) ); @@ -491,7 +494,8 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const Progress::Info slotRebuildRecentMenus(); } - if (progress._completedFileCount == progress._totalFileCount) { + if (progress._completedFileCount == progress._totalFileCount + && progress._currentDiscoveredFolder.isEmpty()) { QTimer::singleShot(2000, this, SLOT(slotDisplayIdle())); } } diff --git a/src/mirall/progressdispatcher.cpp b/src/mirall/progressdispatcher.cpp index 384b78d034..ccf4025939 100644 --- a/src/mirall/progressdispatcher.cpp +++ b/src/mirall/progressdispatcher.cpp @@ -108,9 +108,11 @@ ProgressDispatcher::~ProgressDispatcher() void ProgressDispatcher::setProgressInfo(const QString& folder, const Progress::Info& progress) { - if( folder.isEmpty() || - (progress._currentItems.size() == 0 - && progress._totalFileCount == 0) ) { + if( folder.isEmpty()) +// The update phase now also has progress +// (progress._currentItems.size() == 0 +// && progress._totalFileCount == 0) ) + { return; } emit progressInfo( folder, progress ); diff --git a/src/mirall/progressdispatcher.h b/src/mirall/progressdispatcher.h index a3a1e0a319..54b6d33382 100644 --- a/src/mirall/progressdispatcher.h +++ b/src/mirall/progressdispatcher.h @@ -39,6 +39,9 @@ namespace Progress struct Info { Info() : _totalFileCount(0), _totalSize(0), _completedFileCount(0), _completedSize(0) {} + // Used during local and remote update phase + QString _currentDiscoveredFolder; + quint64 _totalFileCount; quint64 _totalSize; quint64 _completedFileCount; diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp index 764adbb5b8..824f4f4272 100644 --- a/src/mirall/syncengine.cpp +++ b/src/mirall/syncengine.cpp @@ -41,6 +41,7 @@ #include #include #include +#include namespace Mirall { @@ -452,6 +453,24 @@ void SyncEngine::handleSyncError(CSYNC *ctx, const char *state) { finalize(); } +void update_job_update_callback (bool local, + const char *dirUrl, + void *userdata) +{ + // Don't wanna overload the UI + static QElapsedTimer throttleTimer; + if (throttleTimer.elapsed() < 200) { + return; + } + throttleTimer.restart(); + + UpdateJob *updateJob = static_cast(userdata); + if (updateJob) { + QString path = QString::fromUtf8(dirUrl).section('/', -1); + emit updateJob->folderDiscovered(local, path); + } +} + void SyncEngine::startSync() { Q_ASSERT(!_syncRunning); @@ -534,11 +553,16 @@ void SyncEngine::startSync() UpdateJob *job = new UpdateJob(_csync_ctx); job->moveToThread(&_thread); connect(job, SIGNAL(finished(int)), this, SLOT(slotUpdateFinished(int))); + connect(job, SIGNAL(folderDiscovered(bool,QString)), + this, SIGNAL(folderDiscovered(bool,QString))); QMetaObject::invokeMethod(job, "start", Qt::QueuedConnection); } void SyncEngine::slotUpdateFinished(int updateResult) { + // To clean the progress info + emit folderDiscovered(false, QString()); + if (updateResult < 0 ) { handleSyncError(_csync_ctx, "csync_update"); return; diff --git a/src/mirall/syncengine.h b/src/mirall/syncengine.h index 5e44d46b62..99a5b36c5d 100644 --- a/src/mirall/syncengine.h +++ b/src/mirall/syncengine.h @@ -27,6 +27,9 @@ #include +// when do we go away with this private/public separation? +#include + #include "mirall/syncfileitem.h" #include "mirall/progressdispatcher.h" #include "mirall/utility.h" @@ -62,6 +65,9 @@ signals: void csyncError( const QString& ); void csyncUnavailable(); + // During update, before reconcile + void folderDiscovered(bool local, QString folderUrl); + // before actual syncing (after update+reconcile) for each item void syncItemDiscovered(const SyncFileItem&); // after the above signals. with the items that actually need propagating @@ -141,6 +147,9 @@ private: QHash _remotePerms; }; +void update_job_update_callback (bool local, + const char *dirname, + void *userdata); class UpdateJob : public QObject { Q_OBJECT @@ -152,6 +161,8 @@ class UpdateJob : public QObject { csync_set_log_callback(_log_callback); csync_set_log_level(_log_level); csync_set_log_userdata(_log_userdata); + _csync_ctx->callbacks.update_callback = update_job_update_callback; + _csync_ctx->callbacks.update_callback_userdata = this; emit finished(csync_update(_csync_ctx)); deleteLater(); } @@ -165,6 +176,7 @@ public: _log_userdata = csync_get_log_userdata(); } signals: + void folderDiscovered(bool local, QString folderUrl); void finished(int result); }; From 64a70255226bc9941bc73f8f60146fef675245a5 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Fri, 15 Aug 2014 15:54:13 +0200 Subject: [PATCH 27/94] CSync: Add a 30 second connect (not read) timeout --- csync/src/csync_owncloud.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/csync/src/csync_owncloud.c b/csync/src/csync_owncloud.c index 74d166d5ec..860d25eb79 100644 --- a/csync/src/csync_owncloud.c +++ b/csync/src/csync_owncloud.c @@ -432,6 +432,8 @@ static int dav_connect(csync_owncloud_ctx_t *ctx, const char *base_url) { ne_set_read_timeout(ctx->dav_session.ctx, ctx->dav_session.read_timeout); DEBUG_WEBDAV("Timeout set to %u seconds", ctx->dav_session.read_timeout ); } + // Should never take more than some seconds, 30 is really a max. + ne_set_connect_timeout(ctx->dav_session.ctx, 30); snprintf( uaBuf, sizeof(uaBuf), "Mozilla/5.0 (%s) csyncoC/%s", csync_owncloud_get_platform(), CSYNC_STRINGIFY( LIBCSYNC_VERSION )); From c27f1514511e9bb5f0f365ddc7434f7312a8412d Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Fri, 15 Aug 2014 16:11:51 +0200 Subject: [PATCH 28/94] SyncEngine & UI: Make the function part of UpdateJob That way we can easily emit UploadJob's signals --- src/mirall/syncengine.cpp | 2 +- src/mirall/syncengine.h | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp index 824f4f4272..544b37a690 100644 --- a/src/mirall/syncengine.cpp +++ b/src/mirall/syncengine.cpp @@ -453,7 +453,7 @@ void SyncEngine::handleSyncError(CSYNC *ctx, const char *state) { finalize(); } -void update_job_update_callback (bool local, +void UpdateJob::update_job_update_callback (bool local, const char *dirUrl, void *userdata) { diff --git a/src/mirall/syncengine.h b/src/mirall/syncengine.h index 99a5b36c5d..e31a920c34 100644 --- a/src/mirall/syncengine.h +++ b/src/mirall/syncengine.h @@ -147,10 +147,6 @@ private: QHash _remotePerms; }; -void update_job_update_callback (bool local, - const char *dirname, - void *userdata); - class UpdateJob : public QObject { Q_OBJECT CSYNC *_csync_ctx; @@ -166,6 +162,9 @@ class UpdateJob : public QObject { emit finished(csync_update(_csync_ctx)); deleteLater(); } + static void update_job_update_callback (bool local, + const char *dirname, + void *userdata); public: explicit UpdateJob(CSYNC *ctx, QObject* parent = 0) : QObject(parent), _csync_ctx(ctx) { From 88072a985a01ed3841aeb4394d641b1d28bc33dd Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Fri, 15 Aug 2014 16:20:43 +0200 Subject: [PATCH 29/94] SyncEngine & UI: Move QElapsedTimer to object Using a function static is too dangerous when multiple threads are involved. --- src/mirall/syncengine.cpp | 16 +++++++++------- src/mirall/syncengine.h | 4 +++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp index 544b37a690..4c5ad4df3f 100644 --- a/src/mirall/syncengine.cpp +++ b/src/mirall/syncengine.cpp @@ -457,15 +457,17 @@ void UpdateJob::update_job_update_callback (bool local, const char *dirUrl, void *userdata) { - // Don't wanna overload the UI - static QElapsedTimer throttleTimer; - if (throttleTimer.elapsed() < 200) { - return; - } - throttleTimer.restart(); - UpdateJob *updateJob = static_cast(userdata); if (updateJob) { + // Don't wanna overload the UI + if (!updateJob->lastUpdateProgressCallbackCall.isValid()) { + updateJob->lastUpdateProgressCallbackCall.restart(); // first call + } else if (updateJob->lastUpdateProgressCallbackCall.elapsed() < 200) { + return; + } else { + updateJob->lastUpdateProgressCallbackCall.restart(); + } + QString path = QString::fromUtf8(dirUrl).section('/', -1); emit updateJob->folderDiscovered(local, path); } diff --git a/src/mirall/syncengine.h b/src/mirall/syncengine.h index e31a920c34..88a56381f3 100644 --- a/src/mirall/syncengine.h +++ b/src/mirall/syncengine.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include @@ -153,12 +153,14 @@ class UpdateJob : public QObject { csync_log_callback _log_callback; int _log_level; void* _log_userdata; + QElapsedTimer lastUpdateProgressCallbackCall; Q_INVOKABLE void start() { csync_set_log_callback(_log_callback); csync_set_log_level(_log_level); csync_set_log_userdata(_log_userdata); _csync_ctx->callbacks.update_callback = update_job_update_callback; _csync_ctx->callbacks.update_callback_userdata = this; + lastUpdateProgressCallbackCall.invalidate(); emit finished(csync_update(_csync_ctx)); deleteLater(); } From b6eda9076e37b81127da463e094f373dd61e5e63 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 15 Aug 2014 16:26:38 +0200 Subject: [PATCH 30/94] Selective sync: add a page in the folder wizard --- src/mirall/accountsettings.cpp | 5 ++- src/mirall/folderman.cpp | 4 ++- src/mirall/folderman.h | 3 +- src/mirall/folderwizard.cpp | 50 +++++++++++++++++++++++++++++- src/mirall/folderwizard.h | 25 ++++++++++++++- src/mirall/selectivesyncdialog.cpp | 12 +++---- src/mirall/selectivesyncdialog.h | 10 ++++-- 7 files changed, 96 insertions(+), 13 deletions(-) diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp index f76d5a4eb2..934fbba1e3 100644 --- a/src/mirall/accountsettings.cpp +++ b/src/mirall/accountsettings.cpp @@ -193,10 +193,13 @@ void AccountSettings::slotFolderWizardAccepted() QString alias = folderWizard->field(QLatin1String("alias")).toString(); QString sourceFolder = folderWizard->field(QLatin1String("sourceFolder")).toString(); QString targetPath = folderWizard->property("targetPath").toString(); + QStringList selectiveSyncBlackList + = folderWizard->property("selectiveSyncBlackList").toStringList(); if (!FolderMan::ensureJournalGone( sourceFolder )) return; - folderMan->addFolderDefinition(alias, sourceFolder, targetPath ); + + folderMan->addFolderDefinition(alias, sourceFolder, targetPath, selectiveSyncBlackList ); Folder *f = folderMan->setupFolderFromConfigFile( alias ); slotAddFolder( f ); folderMan->setSyncEnabled(true); diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp index 24ad667436..185d47c52f 100644 --- a/src/mirall/folderman.cpp +++ b/src/mirall/folderman.cpp @@ -516,7 +516,8 @@ void FolderMan::slotFolderSyncFinished( const SyncResult& ) QTimer::singleShot(200, this, SLOT(slotScheduleFolderSync())); } -void FolderMan::addFolderDefinition(const QString& alias, const QString& sourceFolder, const QString& targetPath ) +void FolderMan::addFolderDefinition(const QString& alias, const QString& sourceFolder, + const QString& targetPath, const QStringList &selectiveSyncBlackList ) { QString escapedAlias = escapeAlias(alias); // Create a settings file named after the alias @@ -527,6 +528,7 @@ void FolderMan::addFolderDefinition(const QString& alias, const QString& sourceF // for compat reasons settings.setValue(QLatin1String("backend"), "owncloud" ); settings.setValue(QLatin1String("connection"), Theme::instance()->appName()); + settings.setValue(QLatin1String("blackList"), selectiveSyncBlackList); settings.sync(); } diff --git a/src/mirall/folderman.h b/src/mirall/folderman.h index abfaf12534..469b24b405 100644 --- a/src/mirall/folderman.h +++ b/src/mirall/folderman.h @@ -50,7 +50,8 @@ public: * QString sourceFolder on local machine * QString targetPath on remote */ - void addFolderDefinition(const QString&, const QString&, const QString& ); + void addFolderDefinition(const QString&, const QString&, const QString& , + const QStringList &selectiveSyncBlacklist = QStringList{} ); /** Returns the folder which the file or directory stored in path is in */ Folder* folderForPath(const QString& path); diff --git a/src/mirall/folderwizard.cpp b/src/mirall/folderwizard.cpp index e5792abe07..e619cd78c2 100644 --- a/src/mirall/folderwizard.cpp +++ b/src/mirall/folderwizard.cpp @@ -18,6 +18,7 @@ #include "mirall/theme.h" #include "mirall/networkjobs.h" #include "mirall/account.h" +#include "selectivesyncdialog.h" #include #include @@ -30,6 +31,7 @@ #include #include #include +#include #include @@ -424,6 +426,50 @@ void FolderWizardRemotePath::showWarn( const QString& msg ) const // ==================================================================================== +FolderWizardSelectiveSync::FolderWizardSelectiveSync() +{ + QVBoxLayout *layout = new QVBoxLayout(this); + _treeView = new SelectiveSyncTreeView(this); + layout->addWidget(new QLabel(tr("Selective Sync: You can optionally deselect subfolders you do not wish to synchronize."))); + layout->addWidget(_treeView); +} + +FolderWizardSelectiveSync::~FolderWizardSelectiveSync() +{ +} + + +void FolderWizardSelectiveSync::initializePage() +{ + QString alias = wizard()->field(QLatin1String("alias")).toString(); + QString targetPath = wizard()->property("targetPath").toString(); + if (targetPath.startsWith('/')) { + targetPath = targetPath.mid(1); + } + _treeView->setFolderInfo(targetPath, alias, {}); + QWizardPage::initializePage(); +} + +bool FolderWizardSelectiveSync::validatePage() +{ + wizard()->setProperty("selectiveSyncBlackList", QVariant(_treeView->createBlackList())); + return true; +} + +void FolderWizardSelectiveSync::cleanupPage() +{ + QString alias = wizard()->field(QLatin1String("alias")).toString(); + QString targetPath = wizard()->property("targetPath").toString(); + _treeView->setFolderInfo(targetPath, alias, {}); + QWizardPage::cleanupPage(); +} + + + + +// ==================================================================================== + + /** * Folder wizard itself */ @@ -431,7 +477,8 @@ void FolderWizardRemotePath::showWarn( const QString& msg ) const FolderWizard::FolderWizard( QWidget *parent ) : QWizard(parent), _folderWizardSourcePage(new FolderWizardLocalPath), - _folderWizardTargetPage(0) + _folderWizardTargetPage(0), + _folderWizardSelectiveSyncPage(new FolderWizardSelectiveSync) { setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setPage(Page_Source, _folderWizardSourcePage ); @@ -439,6 +486,7 @@ FolderWizard::FolderWizard( QWidget *parent ) _folderWizardTargetPage = new FolderWizardRemotePath(); setPage(Page_Target, _folderWizardTargetPage ); } + setPage(Page_SelectiveSync, _folderWizardSelectiveSyncPage); setWindowTitle( tr("Add Folder") ); setOptions(QWizard::CancelButtonOnLeft); diff --git a/src/mirall/folderwizard.h b/src/mirall/folderwizard.h index 8db9b13194..157d29c24c 100644 --- a/src/mirall/folderwizard.h +++ b/src/mirall/folderwizard.h @@ -26,6 +26,8 @@ namespace Mirall { +class SelectiveSyncTreeView; + class ownCloudInfo; class FormatWarningsWizardPage : public QWizardPage { @@ -90,6 +92,25 @@ private: }; + +class FolderWizardSelectiveSync : public QWizardPage +{ + Q_OBJECT +public: + FolderWizardSelectiveSync(); + ~FolderWizardSelectiveSync(); + + virtual bool validatePage() Q_DECL_OVERRIDE; + + virtual void initializePage() Q_DECL_OVERRIDE; + virtual void cleanupPage() Q_DECL_OVERRIDE; + +private: + SelectiveSyncTreeView *_treeView; + +}; + + /** * */ @@ -100,7 +121,8 @@ public: enum { Page_Source, - Page_Target + Page_Target, + Page_SelectiveSync }; FolderWizard(QWidget *parent = 0); @@ -110,6 +132,7 @@ private: FolderWizardLocalPath *_folderWizardSourcePage; FolderWizardRemotePath *_folderWizardTargetPage; + FolderWizardSelectiveSync *_folderWizardSelectiveSyncPage; }; diff --git a/src/mirall/selectivesyncdialog.cpp b/src/mirall/selectivesyncdialog.cpp index aa15f3916f..64018718cf 100644 --- a/src/mirall/selectivesyncdialog.cpp +++ b/src/mirall/selectivesyncdialog.cpp @@ -28,9 +28,8 @@ namespace Mirall { -SelectiveSyncTreeView::SelectiveSyncTreeView(const QString& folderPath, const QString &rootName, - const QStringList &oldBlackList, QWidget* parent) - : QTreeWidget(parent), _folderPath(folderPath), _rootName(rootName), _oldBlackList(oldBlackList) +SelectiveSyncTreeView::SelectiveSyncTreeView(QWidget* parent) + : QTreeWidget(parent) { connect(this, SIGNAL(itemExpanded(QTreeWidgetItem*)), this, SLOT(slotItemExpanded(QTreeWidgetItem*))); connect(this, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(slotItemChanged(QTreeWidgetItem*,int))); @@ -121,7 +120,8 @@ void SelectiveSyncTreeView::slotUpdateDirectories(const QStringList&list) pathToRemove.append('/'); } pathToRemove.append(_folderPath); - pathToRemove.append('/'); + if (!_folderPath.isEmpty()) + pathToRemove.append('/'); foreach (QString path, list) { path.remove(pathToRemove); @@ -245,7 +245,7 @@ SelectiveSyncDialog::SelectiveSyncDialog(Folder* folder, QWidget* parent, Qt::Wi : QDialog(parent, f), _folder(folder) { QVBoxLayout *layout = new QVBoxLayout(this); - _treeView = new SelectiveSyncTreeView(_folder->remotePath(), _folder->alias(), _folder->selectiveSyncBlackList(), parent); + _treeView = new SelectiveSyncTreeView(parent); layout->addWidget(_treeView); QDialogButtonBox *buttonBox = new QDialogButtonBox(Qt::Horizontal); QPushButton *button; @@ -258,7 +258,7 @@ SelectiveSyncDialog::SelectiveSyncDialog(Folder* folder, QWidget* parent, Qt::Wi // Make sure we don't get crashes if the folder is destroyed while we are still open connect(_folder, SIGNAL(destroyed(QObject*)), this, SLOT(deleteLater())); - _treeView->refreshFolders(); + _treeView->setFolderInfo(_folder->remotePath(), _folder->alias(), _folder->selectiveSyncBlackList()); } void SelectiveSyncDialog::accept() diff --git a/src/mirall/selectivesyncdialog.h b/src/mirall/selectivesyncdialog.h index 45bc80997b..44cab643b7 100644 --- a/src/mirall/selectivesyncdialog.h +++ b/src/mirall/selectivesyncdialog.h @@ -25,10 +25,16 @@ class Folder; class SelectiveSyncTreeView : public QTreeWidget { Q_OBJECT public: - explicit SelectiveSyncTreeView(const QString &folderPath, const QString &rootName, - const QStringList &oldBlackList, QWidget* parent = 0); + explicit SelectiveSyncTreeView(QWidget* parent = 0); QStringList createBlackList(QTreeWidgetItem* root = 0) const; void refreshFolders(); + void setFolderInfo(const QString &folderPath, const QString &rootName, + const QStringList &oldBlackList) { + _folderPath = folderPath; + _rootName = rootName; + _oldBlackList = oldBlackList; + refreshFolders(); + } private slots: void slotUpdateDirectories(const QStringList &); void slotItemExpanded(QTreeWidgetItem *); From 9575271fcd2f25ec03fb55310b49ad210ba837bb Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 15 Aug 2014 16:49:22 +0200 Subject: [PATCH 31/94] Selective sync: hide the header --- src/mirall/selectivesyncdialog.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mirall/selectivesyncdialog.cpp b/src/mirall/selectivesyncdialog.cpp index 64018718cf..0012a91254 100644 --- a/src/mirall/selectivesyncdialog.cpp +++ b/src/mirall/selectivesyncdialog.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -33,6 +34,7 @@ SelectiveSyncTreeView::SelectiveSyncTreeView(QWidget* parent) { connect(this, SIGNAL(itemExpanded(QTreeWidgetItem*)), this, SLOT(slotItemExpanded(QTreeWidgetItem*))); connect(this, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(slotItemChanged(QTreeWidgetItem*,int))); + header()->hide(); } void SelectiveSyncTreeView::refreshFolders() From b4941817647ba1f4d7378d870a1f84599c62738d Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Fri, 15 Aug 2014 17:00:44 +0200 Subject: [PATCH 32/94] Nautilus Overlays: Use port 34001 by default. --- shell_integration/nautilus/ownCloud.py | 5 ++++- src/mirall/socketapi.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/shell_integration/nautilus/ownCloud.py b/shell_integration/nautilus/ownCloud.py index 9c5dc1f079..801c6c29b7 100755 --- a/shell_integration/nautilus/ownCloud.py +++ b/shell_integration/nautilus/ownCloud.py @@ -20,11 +20,14 @@ class ownCloudExtension(GObject.GObject, Nautilus.ColumnProvider, Nautilus.InfoP # try again in 5 seconds - attention, logic inverted! GObject.timeout_add(5000, self.connectToOwnCloud) + def port(self): + return 34001 # Fixme, read from config file. + def connectToOwnCloud(self): try: self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - self.sock.connect(("localhost", 33001)) + self.sock.connect(("localhost", self.port())) self.sock.settimeout(5) self.connected = True self.watch_id = GObject.io_add_watch(self.sock, GObject.IO_IN, self.handle_notify) diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp index 1f5f02a615..18a22b1b1b 100644 --- a/src/mirall/socketapi.cpp +++ b/src/mirall/socketapi.cpp @@ -48,7 +48,7 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype); } namespace { - const int PORT = 33001; + const int PORT = 34001; } namespace Mirall { From 4aec783362ec42a20cfe7952d09f736488e67957 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Fri, 15 Aug 2014 17:03:15 +0200 Subject: [PATCH 33/94] Nautilus Overlays: Fix: do not change an dictionary which is iterated. Also, item.invalidate_extension_info() is sufficient, no need to call update_file_info afterwards. --- shell_integration/nautilus/ownCloud.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/shell_integration/nautilus/ownCloud.py b/shell_integration/nautilus/ownCloud.py index 801c6c29b7..ac04a17d38 100755 --- a/shell_integration/nautilus/ownCloud.py +++ b/shell_integration/nautilus/ownCloud.py @@ -90,13 +90,19 @@ class ownCloudExtension(GObject.GObject, Nautilus.ColumnProvider, Nautilus.InfoP item = self.find_item_for_file(parts[2]) if item: item.add_emblem(emblem) + elif action == 'UPDATE_VIEW': + # Search all items underneath this path and invalidate them if parts[1] in self.registered_paths: + update_items = [] for p in self.nautilusVFSFile_table: - if p.startswith( parts[1] ): + if p == parts[1] or p.startswith( parts[1] ): item = self.nautilusVFSFile_table[p] - item.invalidate_extension_info() - self.update_file_info(item) + update_items.append(item) + + for item in update_items: + item.invalidate_extension_info() + # self.update_file_info(item) elif action == 'REGISTER_PATH': self.registered_paths[parts[1]] = 1 From 8d819956d348b91426bef3f5591af5d7170d17cf Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Fri, 15 Aug 2014 18:33:04 +0200 Subject: [PATCH 34/94] Tests: Fixed the CSync statedb test defined in the mirall module. --- test/testcsyncsqlite.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/testcsyncsqlite.h b/test/testcsyncsqlite.h index 92bdca2af3..0765668e14 100644 --- a/test/testcsyncsqlite.h +++ b/test/testcsyncsqlite.h @@ -16,10 +16,18 @@ class TestCSyncSqlite : public QObject Q_OBJECT private: + /* Attention !!!!!!!!!!!!!!!!!!! + * This struct MY_CSYNC has to be a copy of the CSYNC struct defined + * in csync_private.h until the end of struct statedb. + * Subsequent functions cast the struct to CSYNC. In order to get the + * same values as in the original struct, the start must be the same. + */ typedef struct { struct { csync_auth_callback auth_function; void *userdata; + csync_update_callback update_callback; + void *update_callback_userdata; } callbacks; c_strlist_t *excludes; From 25d519fed31c5510f356c26cc8673d170b00839e Mon Sep 17 00:00:00 2001 From: Volkan Gezer Date: Fri, 15 Aug 2014 20:49:47 +0200 Subject: [PATCH 35/94] subject verb agreement --- src/mirall/owncloudtheme.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mirall/owncloudtheme.cpp b/src/mirall/owncloudtheme.cpp index c6469a06c1..4ce2cf3058 100644 --- a/src/mirall/owncloudtheme.cpp +++ b/src/mirall/owncloudtheme.cpp @@ -63,7 +63,7 @@ QString ownCloudTheme::about() const "Based on Mirall by Duncan Mac-Vicar P.

" "

Copyright ownCloud, Inc.

" "

Licensed under the GNU Public License (GPL) Version 2.0
" - "ownCloud and the ownCloud Logo is a registered trademark of ownCloud," + "ownCloud and the ownCloud Logo are registered trademarks of ownCloud," "Inc. in the United States, other countries, or both

" "%7" ) From 7b114e2caee0930644155618001464a61633da70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20Knau=C3=9F?= Date: Sat, 16 Aug 2014 03:11:19 +0200 Subject: [PATCH 36/94] Use QStandardPaths for linux if building with qt>=5 --- src/mirall/utility_unix.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/mirall/utility_unix.cpp b/src/mirall/utility_unix.cpp index df90ed37e5..a73e003385 100644 --- a/src/mirall/utility_unix.cpp +++ b/src/mirall/utility_unix.cpp @@ -12,6 +12,10 @@ * for more details. */ +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + #include +#endif + static void setupFavLink_private(const QString &folder) { // Nautilus: add to ~/.gtk-bookmarks QFile gtkBookmarks(QDir::homePath()+QLatin1String("/.gtk-bookmarks")); @@ -28,14 +32,17 @@ static void setupFavLink_private(const QString &folder) { // returns the autostart directory the linux way // and respects the XDG_CONFIG_HOME env variable -// can be replaces for qt5 with QStandardPaths QString getUserAutostartDir_private() { +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + QString config = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation); +#else QString config = QFile::decodeName(qgetenv("XDG_CONFIG_HOME")); if (config.isEmpty()) { config = QDir::homePath()+QLatin1String("/.config"); } +#endif config += QLatin1String("/autostart/"); return config; } @@ -46,7 +53,6 @@ bool hasLaunchOnStartup_private(const QString &appName) return QFile::exists(desktopFileLocation); } - void setLaunchOnStartup_private(const QString &appName, const QString& guiName, bool enable) { QString userAutoStartPath = getUserAutostartDir_private(); From de2ce5a0a2f24fee8ad3824ef3e2a4354e1ade84 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 16 Aug 2014 01:25:23 -0400 Subject: [PATCH 37/94] [tx-robot] updated from transifex --- translations/mirall_ca.ts | 226 +++++++++++++++++----------------- translations/mirall_cs.ts | 226 +++++++++++++++++----------------- translations/mirall_de.ts | 232 +++++++++++++++++------------------ translations/mirall_el.ts | 226 +++++++++++++++++----------------- translations/mirall_en.ts | 226 +++++++++++++++++----------------- translations/mirall_es.ts | 230 +++++++++++++++++----------------- translations/mirall_es_AR.ts | 226 +++++++++++++++++----------------- translations/mirall_et.ts | 226 +++++++++++++++++----------------- translations/mirall_eu.ts | 226 +++++++++++++++++----------------- translations/mirall_fa.ts | 226 +++++++++++++++++----------------- translations/mirall_fi.ts | 226 +++++++++++++++++----------------- translations/mirall_fr.ts | 226 +++++++++++++++++----------------- translations/mirall_gl.ts | 226 +++++++++++++++++----------------- translations/mirall_hu.ts | 226 +++++++++++++++++----------------- translations/mirall_it.ts | 232 +++++++++++++++++------------------ translations/mirall_ja.ts | 226 +++++++++++++++++----------------- translations/mirall_nl.ts | 228 +++++++++++++++++----------------- translations/mirall_pl.ts | 230 +++++++++++++++++----------------- translations/mirall_pt.ts | 226 +++++++++++++++++----------------- translations/mirall_pt_BR.ts | 230 +++++++++++++++++----------------- translations/mirall_ru.ts | 226 +++++++++++++++++----------------- translations/mirall_sk.ts | 226 +++++++++++++++++----------------- translations/mirall_sl.ts | 226 +++++++++++++++++----------------- translations/mirall_sv.ts | 226 +++++++++++++++++----------------- translations/mirall_th.ts | 226 +++++++++++++++++----------------- translations/mirall_tr.ts | 230 +++++++++++++++++----------------- translations/mirall_uk.ts | 226 +++++++++++++++++----------------- translations/mirall_zh_CN.ts | 226 +++++++++++++++++----------------- translations/mirall_zh_TW.ts | 226 +++++++++++++++++----------------- 29 files changed, 3292 insertions(+), 3292 deletions(-) diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts index c4b7958dae..d7fda1e175 100644 --- a/translations/mirall_ca.ts +++ b/translations/mirall_ca.ts @@ -89,7 +89,7 @@ - + Pause Pausa @@ -119,53 +119,58 @@ <b>Nota</b> Algunes carpetes, incloent els fitxers muntats a través de xarxa o compartits, poden tenir límits diferents. - + Resume Continua - + Confirm Folder Remove Confirma l'eliminació de la carpeta - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Voleu aturar la sincronització de la carpeta <i>%1</i>?</p><p><b>Nota:</b> Això no eliminarà els fitxers del client.</p> - + Confirm Folder Reset Confirmeu la reinicialització de la carpeta - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Voleu reiniciar la carpeta <i>%1</i> i reconstruir la base de dades del client?</p><p><b>Nota:</b> Aquesta funció existeix només per tasques de manteniment. Cap fitxer no s'eliminarà, però podria provocar-se un transit de dades significant i podria trigar diversos minuts o hores en completar-se, depenent de la mida de la carpeta. Utilitzeu aquesta opció només si us ho recomana l'administrador.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) de %2 l'espai del servidor en ús. - + No connection to %1 at <a href="%2">%3</a>. No hi ha connexió amb %1 a <a href="%2">%3</a>. - + No %1 connection configured. La connexió %1 no està configurada. - + Sync Running S'està sincronitzant @@ -175,35 +180,35 @@ No hi ha cap compte configurat - + The syncing operation is running.<br/>Do you want to terminate it? S'està sincronitzant.<br/>Voleu parar-la? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 de %4) %5 pendents a un ràtio de %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 de %2, fitxer %3 de %4 Temps restant total %5 - + Connected to <a href="%1">%2</a>. Connectat a <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Connectat a <a href="%1">%2</a> com a <i>%3</i>. - + Currently there is no storage usage information available. Actualment no hi ha informació disponible de l'ús d'emmagatzemament. @@ -282,73 +287,73 @@ Temps restant total %5 No es pot llegir %1. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 i %2 altres fitxers s'han esborrat - + %1 has been removed. %1 names a file. S'ha esborrat '%1' - + %1 and %2 other files have been downloaded. %1 names a file. %1 i %2 altres fitxers s'han descarregat. - + %1 has been downloaded. %1 names a file. S'ha descarregat %1 - + %1 and %2 other files have been updated. %1 i %2 altres fitxer(s) s'han actualitzat. - + %1 has been updated. %1 names a file. S'ha actualitzat %1 - + %1 has been renamed to %2 and %3 other files have been renamed. %1 s'ha reanomenat a %2 i %3 altres fitxers s'han reanomenat. - + %1 has been renamed to %2. %1 and %2 name files. %1 s'ha reanomenat a %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 s'ha reanomenat a %2 i %3 altres fitxers s'han eliminat. - + %1 has been moved to %2. %1 s'ha mogut a %2. - + Sync Activity Activitat de sincronització - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -357,17 +362,17 @@ Això podria ser perquè la carpeta ha estat reconfigurada silenciosament, o que Esteu segur que voleu executar aquesta operació? - + Remove All Files? Esborra tots els fitxers? - + Remove all files Esborra tots els fitxers - + Keep files Mantén els fitxers @@ -385,57 +390,52 @@ Esteu segur que voleu executar aquesta operació? S'ha trobat un diari de sincronització antic '%1', però no s'ha pogut eliminar. Assegureu-vos que no hi ha cap aplicació que actualment en faci ús. - + Undefined State. Estat indefinit. - + Waits to start syncing. Espera per començar la sincronització. - + Preparing for sync. Perparant per la sincronització. - + Sync is running. S'està sincronitzant. - - Server is currently not available. - El servidor no està disponible actualment. - - - + Last Sync was successful. La darrera sincronització va ser correcta. - + Last Sync was successful, but with warnings on individual files. La última sincronització ha estat un èxit, però amb avisos en fitxers individuals. - + Setup Error. Error de configuració. - + User Abort. Cancel·la usuari. - + Sync is paused. La sincronització està en pausa. - + %1 (Sync is paused) %1 (Sync està pausat) @@ -1501,27 +1501,27 @@ Proveu de sincronitzar-los de nou. Arranjament - + %1 %1 - + Activity Activitat - + General General - + Network Xarxa - + Account Compte @@ -1789,229 +1789,229 @@ Proveu de sincronitzar-los de nou. Mirall::SyncEngine - + Success. Èxit. - + CSync failed to create a lock file. CSync ha fallat en crear un fitxer de bloqueig. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync ha fallat en carregar o crear el fitxer de revista. Assegureu-vos que yeniu permisos de lectura i escriptura en la carpeta local de sincronització. - + CSync failed to write the journal file. CSync ha fallat en escriure el fitxer de revista - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>No s'ha pogut carregar el connector %1 per csync.<br/>Comproveu la instal·lació!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. L'hora del sistema d'aquest client és diferent de l'hora del sistema del servidor. Useu un servei de sincronització de temps (NTP) en el servidor i al client perquè l'hora sigui la mateixa. - + CSync could not detect the filesystem type. CSync no ha pogut detectar el tipus de fitxers del sistema. - + CSync got an error while processing internal trees. CSync ha patit un error mentre processava els àrbres interns. - + CSync failed to reserve memory. CSync ha fallat en reservar memòria. - + CSync fatal parameter error. Error fatal de paràmetre en CSync. - + CSync processing step update failed. El pas d'actualització del processat de CSync ha fallat. - + CSync processing step reconcile failed. El pas de reconciliació del processat de CSync ha fallat. - + CSync processing step propagate failed. El pas de propagació del processat de CSync ha fallat. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>La carpeta destí no existeix.</p><p>Comproveu la configuració de sincronització</p> - + A remote file can not be written. Please check the remote access. No es pot escriure el fitxer remot. Reviseu l'acces remot. - + The local filesystem can not be written. Please check permissions. No es pot escriure al sistema de fitxers local. Reviseu els permisos. - + CSync failed to connect through a proxy. CSync ha fallat en connectar a través d'un proxy. - + CSync could not authenticate at the proxy. CSync no s'ha pogut acreditar amb el proxy. - + CSync failed to lookup proxy or server. CSync ha fallat en cercar el proxy o el servidor. - + CSync failed to authenticate at the %1 server. L'autenticació de CSync ha fallat al servidor %1. - + CSync failed to connect to the network. CSync ha fallat en connectar-se a la xarxa. - + A network connection timeout happened. Temps excedit en la connexió. - + A HTTP transmission error happened. S'ha produït un error en la transmissió HTTP. - + CSync failed due to not handled permission deniend. CSync ha fallat en no implementar el permís denegat. - + CSync failed to access CSync ha fallat en accedir - + CSync tried to create a directory that already exists. CSync ha intentat crear una carpeta que ja existeix. - - + + CSync: No space on %1 server available. CSync: No hi ha espai disponible al servidor %1. - + CSync unspecified error. Error inespecífic de CSync. - + Aborted by the user Aturat per l'usuari - + An internal error number %1 happened. S'ha produït l'error intern número %1. - + The item is not synced because of previous errors: %1 L'element no s'ha sincronitzat degut a errors previs: %1 - + Symbolic links are not supported in syncing. La sincronització d'enllaços simbòlics no està implementada. - + File is listed on the ignore list. El fitxer està a la llista d'ignorats. - + File contains invalid characters that can not be synced cross platform. El fitxer conté caràcters no vàlids que no es poden sincronitzar entre plataformes. - + Unable to initialize a sync journal. No es pot inicialitzar un periòdic de sincronització - + Cannot open the sync journal No es pot obrir el diari de sincronització - + Not allowed because you don't have permission to add sub-directories in that directory No es permet perquè no teniu permisos per afegir subcarpetes en aquesta carpeta - + Not allowed because you don't have permission to add parent directory No es permet perquè no teniu permisos per afegir una carpeta inferior - + Not allowed because you don't have permission to add files in that directory No es permet perquè no teniu permisos per afegir fitxers en aquesta carpeta - + Not allowed to upload this file because it is read-only on the server, restoring No es permet pujar aquest fitxer perquè només és de lectura en el servidor, es restaura - - + + Not allowed to remove, restoring No es permet l'eliminació, es restaura - + Move not allowed, item restored No es permet moure'l, l'element es restaura - + Move not allowed because %1 is read-only No es permet moure perquè %1 només és de lectura - + the destination el destí - + the source l'origen @@ -2027,7 +2027,7 @@ Proveu de sincronitzar-los de nou. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2140,22 +2140,27 @@ Proveu de sincronitzar-los de nou. No hi ha elements sincronitzats recentment - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) Sincronitzant %1 de %2 (%3 pendents) - + Syncing %1 (%2 left) Sincronitzant %1 (%2 pendents) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Actualitzat @@ -2400,7 +2405,7 @@ Proveu de sincronitzar-los de nou. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Si encara no teniu un servidor ownCloud, mireu <a href="https://owncloud.com">owncloud.com</a> per més informació. @@ -2539,21 +2544,16 @@ Proveu de sincronitzar-los de nou. - The server is currently unavailable - El servidor actualment no esta disponible - - - Preparing to sync Preparant per sincronitzar - + Aborting... Cancel·lant... - + Sync is paused La incronització està pausada. diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts index 306cf9af66..8aec186859 100644 --- a/translations/mirall_cs.ts +++ b/translations/mirall_cs.ts @@ -89,7 +89,7 @@ - + Pause Pozastavit @@ -119,53 +119,58 @@ <b>Poznámka:</b> Některé složky, včetně síťových či sdílených složek, mohou mít jiné limity. - + Resume Obnovit - + Confirm Folder Remove Potvrdit odstranění složky - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Opravdu chcete zastavit synchronizaci složky <i>%1</i>?</p><p><b>Poznámka:</b> Tato akce nesmaže soubory z místní složky.</p> - + Confirm Folder Reset Potvrdit restartování složky - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Skutečně chcete resetovat složku <i>%1</i> a znovu sestavit klientskou databázi?</p><p><b>Poznámka:</b> Tato funkce je určena pouze pro účely údržby. Žádné soubory nebudou smazány, ale může to způsobit velké datové přenosy a dokončení může trvat mnoho minut či hodin v závislosti na množství dat ve složce. Použijte tuto volbu pouze na pokyn správce.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) z %2 místa na disku použito. - + No connection to %1 at <a href="%2">%3</a>. Žádné spojení s %1 na <a href="%2">%3</a>. - + No %1 connection configured. Žádné spojení s %1 nenastaveno. - + Sync Running Synchronizace probíhá @@ -175,35 +180,35 @@ Žádný účet nenastaven. - + The syncing operation is running.<br/>Do you want to terminate it? Operace synchronizace právě probíhá.<br/>Přejete si ji ukončit? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 z %4) zbývající čas %5 při rychlosti %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 z %2, soubor %3 ze %4 Celkový zbývající čas %5 - + Connected to <a href="%1">%2</a>. Připojeno k <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Připojeno k <a href="%1">%2</a> jako <i>%3</i>. - + Currently there is no storage usage information available. Momentálně nejsou k dispozici žádné informace o využití úložiště @@ -282,73 +287,73 @@ Celkový zbývající čas %5 %1 není čitelný. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 a %2 dalších souborů bylo odebráno. - + %1 has been removed. %1 names a file. %1 byl odebrán. - + %1 and %2 other files have been downloaded. %1 names a file. %1 a %2 dalších souborů bylo staženo. - + %1 has been downloaded. %1 names a file. %1 byl stažen. - + %1 and %2 other files have been updated. %1 a %2 dalších souborů bylo aktualizováno. - + %1 has been updated. %1 names a file. %1 byl aktualizován. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 byl přejmenován na %2 a %3 dalších souborů bylo přejmenováno. - + %1 has been renamed to %2. %1 and %2 name files. %1 byl přejmenován na %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 byl přesunut do %2 a %3 dalších souborů bylo přesunuto. - + %1 has been moved to %2. %1 byl přemístěn do %2. - + Sync Activity Průběh synchronizace - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -357,17 +362,17 @@ Toto může být způsobeno změnou v nastavení synchronizace složky nebo tím Opravdu chcete provést tuto akci? - + Remove All Files? Odstranit všechny soubory? - + Remove all files Odstranit všechny soubory - + Keep files Ponechat soubory @@ -385,57 +390,52 @@ Opravdu chcete provést tuto akci? Byl nalezen starý záznam synchronizace '%1', ale nebylo možné jej odebrat. Ujistěte se, že není aktuálně používán jinou aplikací. - + Undefined State. Nedefinovaný stav. - + Waits to start syncing. Vyčkává na spuštění synchronizace. - + Preparing for sync. Příprava na synchronizaci. - + Sync is running. Synchronizace probíhá. - - Server is currently not available. - Server je nyní nedostupný. - - - + Last Sync was successful. Poslední synchronizace byla úspěšná. - + Last Sync was successful, but with warnings on individual files. Poslední synchronizace byla úspěšná, ale s varováním u některých souborů - + Setup Error. Chyba nastavení. - + User Abort. Zrušení uživatelem. - + Sync is paused. Synchronizace pozastavena. - + %1 (Sync is paused) %1 (Synchronizace je pozastavena) @@ -1502,27 +1502,27 @@ Zkuste provést novou synchronizaci. Nastavení - + %1 %1 - + Activity Aktivita - + General Hlavní - + Network Síť - + Account Účet @@ -1790,229 +1790,229 @@ Zkuste provést novou synchronizaci. Mirall::SyncEngine - + Success. Úspěch. - + CSync failed to create a lock file. CSync nemůže vytvořit soubor zámku. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync se nepodařilo načíst či vytvořit soubor žurnálu. Ujistěte se, že máte oprávnění pro čtení a zápis v místní synchronizované složce. - + CSync failed to write the journal file. CSync se nepodařilo zapsat do souboru žurnálu. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Plugin %1 pro csync nelze načíst.<br/>Zkontrolujte prosím instalaci!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Systémový čas na klientovi je rozdílný od systémového času serveru. Použijte, prosím, službu synchronizace času (NTP) na serveru i klientovi, aby byl čas na obou strojích stejný. - + CSync could not detect the filesystem type. CSync nemohl detekovat typ souborového systému. - + CSync got an error while processing internal trees. CSync obdrželo chybu při zpracování vnitřních struktur. - + CSync failed to reserve memory. CSync se nezdařilo rezervovat paměť. - + CSync fatal parameter error. CSync: kritická chyba parametrů. - + CSync processing step update failed. CSync se nezdařilo zpracovat krok aktualizace. - + CSync processing step reconcile failed. CSync se nezdařilo zpracovat krok sladění. - + CSync processing step propagate failed. CSync se nezdařilo zpracovat krok propagace. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Cílový adresář neexistuje.</p><p>Zkontrolujte, prosím, nastavení synchronizace.</p> - + A remote file can not be written. Please check the remote access. Vzdálený soubor nelze zapsat. Ověřte prosím vzdálený přístup. - + The local filesystem can not be written. Please check permissions. Do místního souborového systému nelze zapisovat. Ověřte, prosím, přístupová práva. - + CSync failed to connect through a proxy. CSync se nezdařilo připojit skrze proxy. - + CSync could not authenticate at the proxy. CSync se nemohlo přihlásit k proxy. - + CSync failed to lookup proxy or server. CSync se nezdařilo najít proxy server nebo cílový server. - + CSync failed to authenticate at the %1 server. CSync se nezdařilo přihlásit k serveru %1. - + CSync failed to connect to the network. CSync se nezdařilo připojit k síti. - + A network connection timeout happened. Došlo k vypršení časového limitu síťového spojení. - + A HTTP transmission error happened. Nastala chyba HTTP přenosu. - + CSync failed due to not handled permission deniend. CSync selhalo z důvodu nezpracovaného odmítnutí práv. - + CSync failed to access CSync se nezdařil přístup - + CSync tried to create a directory that already exists. CSync se pokusilo vytvořit adresář, který již existuje. - - + + CSync: No space on %1 server available. CSync: Nedostatek volného místa na serveru %1. - + CSync unspecified error. Nespecifikovaná chyba CSync. - + Aborted by the user Zrušeno uživatelem - + An internal error number %1 happened. Nastala vnitřní chyba číslo %1. - + The item is not synced because of previous errors: %1 Položka nebyla synchronizována kvůli předchozí chybě: %1 - + Symbolic links are not supported in syncing. Symbolické odkazy nejsou při synchronizaci podporovány. - + File is listed on the ignore list. Soubor se nachází na seznamu ignorovaných. - + File contains invalid characters that can not be synced cross platform. Soubor obsahuje alespoň jeden neplatný znak, který narušuje synchronizaci v prostředí více platforem. - + Unable to initialize a sync journal. Nemohu inicializovat synchronizační žurnál. - + Cannot open the sync journal Nelze otevřít synchronizační žurnál - + Not allowed because you don't have permission to add sub-directories in that directory Není povoleno, protože nemáte oprávnění vytvářet podadresáře v tomto adresáři. - + Not allowed because you don't have permission to add parent directory Není povoleno, protože nemáte oprávnění vytvořit rodičovský adresář. - + Not allowed because you don't have permission to add files in that directory Není povoleno, protože nemáte oprávnění přidávat soubory do tohoto adresáře - + Not allowed to upload this file because it is read-only on the server, restoring Není povoleno nahrát tento soubor, protože je na serveru uložen pouze pro čtení, obnovuji - - + + Not allowed to remove, restoring Odstranění není povoleno, obnovuji - + Move not allowed, item restored Přesun není povolen, položka obnovena - + Move not allowed because %1 is read-only Přesun není povolen, protože %1 je pouze pro čtení - + the destination cílové umístění - + the source zdroj @@ -2028,7 +2028,7 @@ Zkuste provést novou synchronizaci. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2141,22 +2141,27 @@ Zkuste provést novou synchronizaci. Žádné položky nebyly nedávno synchronizovány - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) Synchronizuji %1 ze %2 (zbývá %3) - + Syncing %1 (%2 left) Synchronizuji %1 (zbývá %2) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Aktuální @@ -2401,7 +2406,7 @@ Zkuste provést novou synchronizaci. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Pokud zatím nemáte ownCloud server, získáte více informací na <a href="https://owncloud.com">owncloud.com</a> @@ -2540,21 +2545,16 @@ Zkuste provést novou synchronizaci. - The server is currently unavailable - Server je momentálně nedostupný - - - Preparing to sync Připravuji na synchronizaci - + Aborting... Ruším... - + Sync is paused Synchronizace pozastavena diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts index 7164d84f83..cd8583bb4b 100644 --- a/translations/mirall_de.ts +++ b/translations/mirall_de.ts @@ -89,7 +89,7 @@ - + Pause Anhalten @@ -119,54 +119,59 @@ <b>Hinweis:</b> Einige Ordner, einschließlich über das Netzwerk verbundene oder freigegebene Ordner, können unterschiedliche Beschränkungen haben. - + Resume Fortsetzen - + Confirm Folder Remove Löschen des Ordners bestätigen - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Wollen Sie wirklich die Synchronisation des Ordners <i>%1</i> beenden?</p><p><b>Anmerkung:</b> Dies wird keine Dateien von ihrem Rechner löschen.</p> - + Confirm Folder Reset Zurücksetzen des Ordners bestätigen - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Wollen Sie wirklich den Ordner <i>%1</i> zurücksetzen und die Datenbank auf dem Client neu aufbauen?</p><p><b>Anmerkung:</b> Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entfernt, jedoch kann diese Aktion erheblichen Datenverkehr verursachen und je nach Umfang des Ordners mehrere Minuten oder Stunden in Anspruch nehmen. Verwenden Sie diese Funktion nur dann, wenn ihr Administrator dies ausdrücklich wünscht.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) von %2 Serverkapazität in Benutzung. - + No connection to %1 at <a href="%2">%3</a>. Keine Verbindung mit %1 zu <a href="%2">%3</a>. - + No %1 connection configured. Keine %1-Verbindung konfiguriert. - + Sync Running Synchronisation läuft @@ -176,35 +181,35 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf Kein Konto konfiguriert. - + The syncing operation is running.<br/>Do you want to terminate it? Die Synchronistation läuft gerade.<br/>Wollen Sie diese beenden? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 von %4) %5 übrig bei einer Rate von %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 von %2, Datei %3 von %4 Gesamtzeit übrig %5 - + Connected to <a href="%1">%2</a>. Verbunden mit <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Verbunden mit <a href="%1">%2</a> als <i>%3</i>. - + Currently there is no storage usage information available. Derzeit sind keine Speichernutzungsinformationen verfügbar. @@ -283,73 +288,73 @@ Gesamtzeit übrig %5 %1 ist nicht lesbar. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 und %2 andere Dateien wurden gelöscht. - + %1 has been removed. %1 names a file. %1 wurde gelöscht. - + %1 and %2 other files have been downloaded. %1 names a file. %1 und %2 andere Dateien wurden heruntergeladen. - + %1 has been downloaded. %1 names a file. %1 wurde heruntergeladen. - + %1 and %2 other files have been updated. %1 und %2 andere Dateien wurden aktualisiert. - + %1 has been updated. %1 names a file. %1 wurde aktualisiert. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 wurde in %2 umbenannt und %3 andere Dateien wurden umbenannt. - + %1 has been renamed to %2. %1 and %2 name files. %1 wurde in %2 umbenannt. - + %1 has been moved to %2 and %3 other files have been moved. %1 wurde in %2 verschoben und %3 andere Dateien wurden verschoben. - + %1 has been moved to %2. %1 wurde in %2 verschoben. - + Sync Activity Synchronisierungsaktivität - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -358,17 +363,17 @@ Vielleicht wurde der Ordner neu konfiguriert, oder alle Dateien wurden händisch Sind Sie sicher, dass sie diese Operation durchführen wollen? - + Remove All Files? Alle Dateien löschen? - + Remove all files Lösche alle Dateien - + Keep files Dateien behalten @@ -386,57 +391,52 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen? Ein altes Synchronisations-Journal '%1' wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet. - + Undefined State. Undefinierter Zustand. - + Waits to start syncing. Wartet auf Beginn der Synchronistation - + Preparing for sync. Synchronisation wird vorbereitet. - + Sync is running. Synchronisation läuft. - - Server is currently not available. - Der Server ist momentan nicht erreichbar. - - - + Last Sync was successful. Die letzte Synchronisation war erfolgreich. - + Last Sync was successful, but with warnings on individual files. Letzte Synchronisation war erfolgreich, aber mit Warnungen für einzelne Dateien. - + Setup Error. Setup-Fehler. - + User Abort. Benutzer-Abbruch - + Sync is paused. Synchronisation wurde angehalten. - + %1 (Sync is paused) %1 (Synchronisation ist pausiert) @@ -1219,7 +1219,7 @@ Es ist nicht ratsam, diese zu benutzen. Skip folders configuration - + Ordner-Konfiguration überspringen @@ -1502,27 +1502,27 @@ Versuchen Sie diese nochmals zu synchronisieren. Einstellungen - + %1 %1 - + Activity Aktivität - + General Allgemein - + Network Netzwerk - + Account Nutzerkonto @@ -1790,229 +1790,229 @@ Versuchen Sie diese nochmals zu synchronisieren. Mirall::SyncEngine - + Success. Erfolgreich - + CSync failed to create a lock file. CSync konnte keine lock-Datei erstellen. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync konnte den Synchronisationsbericht nicht laden oder erstellen. Stellen Sie bitte sicher, dass Sie Lese- und Schreibrechte auf das lokale Synchronisationsverzeichnis haben. - + CSync failed to write the journal file. CSync konnte den Synchronisationsbericht nicht schreiben. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Das %1-Plugin für csync konnte nicht geladen werden.<br/>Bitte überprüfen Sie die Installation!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Die Uhrzeit auf diesem Computer und dem Server sind verschieden. Bitte verwenden Sie ein Zeitsynchronisationsprotokolls (NTP) auf Ihrem Server und Klienten, damit die gleiche Uhrzeit verwendet wird. - + CSync could not detect the filesystem type. CSync konnte den Typ des Dateisystem nicht feststellen. - + CSync got an error while processing internal trees. CSync hatte einen Fehler bei der Verarbeitung von internen Strukturen. - + CSync failed to reserve memory. CSync konnte keinen Speicher reservieren. - + CSync fatal parameter error. CSync hat einen schwerwiegender Parameterfehler festgestellt. - + CSync processing step update failed. CSync Verarbeitungsschritt "Aktualisierung" fehlgeschlagen. - + CSync processing step reconcile failed. CSync Verarbeitungsschritt "Abgleich" fehlgeschlagen. - + CSync processing step propagate failed. CSync Verarbeitungsschritt "Übertragung" fehlgeschlagen. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Das Zielverzeichnis existiert nicht.</p><p>Bitte prüfen Sie die Synchronisationseinstellungen.</p> - + A remote file can not be written. Please check the remote access. Eine Remote-Datei konnte nicht geschrieben werden. Bitte den Remote-Zugriff überprüfen. - + The local filesystem can not be written. Please check permissions. Kann auf dem lokalen Dateisystem nicht schreiben. Bitte Berechtigungen überprüfen. - + CSync failed to connect through a proxy. CSync konnte sich nicht über einen Proxy verbinden. - + CSync could not authenticate at the proxy. CSync konnte sich nicht am Proxy authentifizieren. - + CSync failed to lookup proxy or server. CSync konnte den Proxy oder Server nicht auflösen. - + CSync failed to authenticate at the %1 server. CSync konnte sich nicht am Server %1 authentifizieren. - + CSync failed to connect to the network. CSync konnte sich nicht mit dem Netzwerk verbinden. - + A network connection timeout happened. Eine Zeitüberschreitung der Netzwerkverbindung ist aufgetreten. - + A HTTP transmission error happened. Es hat sich ein HTTP-Übertragungsfehler ereignet. - + CSync failed due to not handled permission deniend. CSync wegen fehlender Berechtigung fehlgeschlagen. - + CSync failed to access CSync-Zugriff fehlgeschlagen - + CSync tried to create a directory that already exists. CSync versuchte, ein Verzeichnis zu erstellen, welches bereits existiert. - - + + CSync: No space on %1 server available. CSync: Kein Platz auf Server %1 frei. - + CSync unspecified error. CSync unbekannter Fehler. - + Aborted by the user Abbruch durch den Benutzer - + An internal error number %1 happened. Interne Fehlernummer %1 aufgetreten. - + The item is not synced because of previous errors: %1 Das Element ist aufgrund vorheriger Fehler nicht synchronisiert: %1 - + Symbolic links are not supported in syncing. Symbolische Verknüpfungen werden bei der Synchronisation nicht unterstützt. - + File is listed on the ignore list. Die Datei ist in der Ignorierliste geführt. - + File contains invalid characters that can not be synced cross platform. Die Datei beinhaltet ungültige Zeichen und kann nicht plattformübergreifend synchronisiert werden. - + Unable to initialize a sync journal. Synchronisationsbericht konnte nicht initialisiert werden. - + Cannot open the sync journal Synchronisationsbericht kann nicht geöffnet werden - + Not allowed because you don't have permission to add sub-directories in that directory Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben - + Not allowed because you don't have permission to add parent directory Nicht erlaubt, da Sie keine Rechte zur Erstellung von Hauptordnern haben - + Not allowed because you don't have permission to add files in that directory Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben - + Not allowed to upload this file because it is read-only on the server, restoring Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist, Wiederherstellung - - + + Not allowed to remove, restoring Löschen nicht erlaubt, Wiederherstellung - + Move not allowed, item restored Verschieben nicht erlaubt, Element wiederhergestellt - + Move not allowed because %1 is read-only Verschieben nicht erlaubt, da %1 schreibgeschützt ist - + the destination Das Ziel - + the source Die Quelle @@ -2028,9 +2028,9 @@ Versuchen Sie diese nochmals zu synchronisieren. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - + <p>Version %1 Für weitere Informationen besuche bitte <a href='%2'>%3</a>.</p><p>Urheberrecht von ownCloud, Inc.<p><p>Zur Verfügung gestellt durch %4 und lizensiert unter der GNU General Public License (GPL) Version 2.0.<br>%5 und das %5 Logo sind eingetragene Warenzeichen von %4 in den Vereinigten Staaten, anderen Ländern oder beides.</p> @@ -2141,22 +2141,27 @@ Versuchen Sie diese nochmals zu synchronisieren. Keine kürzlich synchronisierten Elemente - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) Synchronisiere %1 von %2 (%3 übrig) - + Syncing %1 (%2 left) Synchronisiere %1 (%2 übrig) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Aktuell @@ -2401,7 +2406,7 @@ Versuchen Sie diese nochmals zu synchronisieren. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Wenn Sie noch keinen ownCloud-Server haben, informieren Sie sich unter <a href="https://owncloud.com">owncloud.com</a>. @@ -2417,7 +2422,7 @@ Versuchen Sie diese nochmals zu synchronisieren. <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 - + <p>Version %2 Für weitere Informationen besuchen Sie <a href='%3'>%4</a>.</p><p><small>Entwickelt durch Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz und andere.<br>Basiert auf Mirall von Duncan Mac-Vicar P.</small></p><p>Urheberrecht von ownCloud, Inc.</p><p>Lizenziert unter der GNU General Public License (GPL) Version 2.0.<br>ownCloud und das ownCloud-Logo sind eingetragene Warenzeichen von ownCloud in den Vereinigten Staaten, anderen Ländern oder beides.</p>%7 @@ -2540,21 +2545,16 @@ Versuchen Sie diese nochmals zu synchronisieren. - The server is currently unavailable - Der Server ist vorübergehend nicht erreichbar. - - - Preparing to sync Synchronisation wird vorbereitet - + Aborting... Abbrechen... - + Sync is paused Synchronisation wurde angehalten diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts index 3f0b204d20..261ad67f85 100644 --- a/translations/mirall_el.ts +++ b/translations/mirall_el.ts @@ -89,7 +89,7 @@ - + Pause Παύση @@ -119,53 +119,58 @@ <b>Σημείωση:</b> Κάποιοι φάκελοι, συμπεριλαμβανομένων των δικτυακών δίσκων ή των κοινόχρηστων φακέλων, μπορεί να έχουν διαφορετικά όρια. - + Resume Συνέχεια - + Confirm Folder Remove Επιβεβαίωση Αφαίρεσης Φακέλου - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Θέλετε στ' αλήθεια να σταματήσετε το συγχρονισμό του φακέλου <i>%1</i>;</p><p><b>Σημείωση:</b> Αυτό δεν θα αφαιρέσει τα αρχεία από το δέκτη.</p> - + Confirm Folder Reset Επιβεβαίωση Επαναφοράς Φακέλου - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Θέλετε στ' αλήθεια να επαναφέρετε το φάκελο <i>%1</i> και να επαναδημιουργήσετε τη βάση δεδομένων του δέκτη;</p><p><b>Σημείωση:</b> Αυτή η λειτουργία έχει σχεδιαστεί αποκλειστικά για λόγους συντήρησης. Κανένα αρχείο δεν θα αφαιρεθεί, αλλά αυτό μπορεί να προκαλέσει σημαντική κίνηση δεδομένων και να πάρει αρκετά λεπτά ή ώρες μέχρι να ολοκληρωθεί, ανάλογα με το μέγεθος του φακέλου. Χρησιμοποιείστε αυτή την επιλογή μόνο εάν έχετε συμβουλευτεί αναλόγως από το διαχειριστή σας.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) από %2 αποθηκευτικός χώρος διακομιστή σε χρήση. - + No connection to %1 at <a href="%2">%3</a>. Δεν υπάρχει σύνδεση με %1 στο <a href="%2">%3</a>. - + No %1 connection configured. Δεν έχει ρυθμιστεί σύνδεση με το %1. - + Sync Running Εκτελείται Συγχρονισμός @@ -175,18 +180,18 @@ Δεν ρυθμίστηκε λογαριασμός. - + The syncing operation is running.<br/>Do you want to terminate it? Η λειτουργία συγχρονισμού εκτελείται.<br/> Θέλετε να την τερματίσετε; - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 από %4) %5 απομένουν με ταχύτητα %6/δευτ - + %1 of %2, file %3 of %4 Total time left %5 %1 από %2, αρχείο %3 από%4 @@ -194,17 +199,17 @@ Total time left %5 Συνολικός χρόνος που απομένει %5 - + Connected to <a href="%1">%2</a>. Συνδεδεμένοι με <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Συνδεδεμένοι με <a href="%1">%2</a> ως <i>%3</i>. - + Currently there is no storage usage information available. Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες. @@ -283,73 +288,73 @@ Total time left %5 Το %1 δεν είναι αναγνώσιμο. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. Το %1 και άλλα %2 αρχεία αφαιρέθηκαν. - + %1 has been removed. %1 names a file. Το %1 αφαιρέθηκε. - + %1 and %2 other files have been downloaded. %1 names a file. Το αρχείο %1 και άλλα %2 αρχεία έχουν ληφθεί. - + %1 has been downloaded. %1 names a file. Το %1 έχει ληφθεί. - + %1 and %2 other files have been updated. Το αρχείο %1 και %2 άλλα αρχεία έχουν ενημερωθεί. - + %1 has been updated. %1 names a file. Το %1 έχει ενημερωθεί. - + %1 has been renamed to %2 and %3 other files have been renamed. Το αρχείο %1 έχει μετονομαστεί σε %2 και άλλα %3 αρχεία έχουν μετονομαστεί. - + %1 has been renamed to %2. %1 and %2 name files. Το %1 έχει μετονομαστεί σε %2. - + %1 has been moved to %2 and %3 other files have been moved. Το αρχείο %1 έχει μετακινηθεί στο %2 και %3 άλλα αρχεία έχουν μετακινηθεί. - + %1 has been moved to %2. Το %1 έχει μετακινηθεί στο %2. - + Sync Activity Δραστηριότητα Συγχρονισμού - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -358,17 +363,17 @@ Are you sure you want to perform this operation? Είστε σίγουροι ότι θέλετε να εκτελέσετε αυτή τη λειτουργία; - + Remove All Files? Αφαίρεση Όλων των Αρχείων; - + Remove all files Αφαίρεση όλων των αρχείων - + Keep files Διατήρηση αρχείων @@ -386,57 +391,52 @@ Are you sure you want to perform this operation? Βρέθηκε ένα παλαιότερο αρχείο συγχρονισμού '%1', αλλά δεν μπόρεσε να αφαιρεθεί. Παρακαλώ βεβαιωθείτε ότι καμμία εφαρμογή δεν το χρησιμοποιεί αυτή τη στιγμή. - + Undefined State. Απροσδιόριστη Κατάσταση. - + Waits to start syncing. Αναμονή έναρξης συγχρονισμού. - + Preparing for sync. Προετοιμασία για συγχρονισμό. - + Sync is running. Ο συγχρονισμός εκτελείται. - - Server is currently not available. - Ο διακομιστής δεν είναι διαθέσιμος προς το παρόν. - - - + Last Sync was successful. Ο τελευταίος συγχρονισμός ήταν επιτυχής. - + Last Sync was successful, but with warnings on individual files. Ο τελευταίος συγχρονισμός ήταν επιτυχής, αλλά υπήρχαν προειδοποιήσεις σε συγκεκριμένα αρχεία. - + Setup Error. Σφάλμα Ρύθμισης. - + User Abort. Ματαίωση από Χρήστη. - + Sync is paused. Παύση συγχρονισμού. - + %1 (Sync is paused) %1 (Παύση συγχρονισμού) @@ -1502,27 +1502,27 @@ It is not advisable to use it. Ρυθμίσεις - + %1 %1 - + Activity Δραστηριότητα - + General Γενικά - + Network Δίκτυο - + Account Λογαριασμός @@ -1790,229 +1790,229 @@ It is not advisable to use it. Mirall::SyncEngine - + Success. Επιτυχία. - + CSync failed to create a lock file. Το CSync απέτυχε να δημιουργήσει ένα αρχείο κλειδώματος. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. Το CSync απέτυχε να φορτώσει ή να δημιουργήσει το αρχείο καταλόγου. Βεβαιωθείτε ότι έχετε άδειες ανάγνωσης και εγγραφής στον τοπικό κατάλογο συγχρονισμού. - + CSync failed to write the journal file. Το CSync απέτυχε να εγγράψει στο αρχείο καταλόγου. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Το πρόσθετο του %1 για το csync δεν μπόρεσε να φορτωθεί.<br/>Παρακαλούμε επαληθεύσετε την εγκατάσταση!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Η ώρα του συστήματος στον τοπικό υπολογιστή διαφέρει από την ώρα του συστήματος στο διακομιστή. Παρακαλούμε χρησιμοποιήστε μια υπηρεσία χρονικού συγχρονισμού (NTP) στο διακομιστή και στον τοπικό υπολογιστή ώστε η ώρα να παραμένει η ίδια. - + CSync could not detect the filesystem type. To CSync δεν μπορούσε να ανιχνεύσει τον τύπο του συστήματος αρχείων. - + CSync got an error while processing internal trees. Το CSync έλαβε κάποιο μήνυμα λάθους κατά την επεξεργασία της εσωτερικής διεργασίας. - + CSync failed to reserve memory. Το CSync απέτυχε να δεσμεύσει μνήμη. - + CSync fatal parameter error. Μοιραίο σφάλμα παράμετρου CSync. - + CSync processing step update failed. Η ενημέρωση του βήματος επεξεργασίας του CSync απέτυχε. - + CSync processing step reconcile failed. CSync στάδιο επεξεργασίας συμφιλίωση απέτυχε. - + CSync processing step propagate failed. Η μετάδοση του βήματος επεξεργασίας του CSync απέτυχε. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Ο κατάλογος προορισμού δεν υπάρχει.</p><p>Παρακαλώ ελέγξτε τις ρυθμίσεις συγχρονισμού.</p> - + A remote file can not be written. Please check the remote access. Ένα απομακρυσμένο αρχείο δεν μπορεί να εγγραφεί. Παρακαλούμε ελέγξτε την απομακρυσμένη πρόσβαση. - + The local filesystem can not be written. Please check permissions. Το τοπικό σύστημα αρχείων δεν είναι εγγράψιμο. Παρακαλούμε ελέγξτε τα δικαιώματα. - + CSync failed to connect through a proxy. Το CSync απέτυχε να συνδεθεί μέσω ενός διαμεσολαβητή. - + CSync could not authenticate at the proxy. Το CSync δεν μπόρεσε να πιστοποιηθεί στο διακομιστή μεσολάβησης. - + CSync failed to lookup proxy or server. Το CSync απέτυχε να διερευνήσει το διαμεσολαβητή ή το διακομιστή. - + CSync failed to authenticate at the %1 server. Το CSync απέτυχε να πιστοποιηθεί στο διακομιστή 1%. - + CSync failed to connect to the network. Το CSync απέτυχε να συνδεθεί με το δίκτυο. - + A network connection timeout happened. Διακοπή σύνδεσης δικτύου. - + A HTTP transmission error happened. Ένα σφάλμα μετάδοσης HTTP συνέβη. - + CSync failed due to not handled permission deniend. Το CSync απέτυχε λόγω απόρριψης μη-διαχειρίσιμων δικαιωμάτων. - + CSync failed to access Το CSync απέτυχε να αποκτήσει πρόσβαση - + CSync tried to create a directory that already exists. Το CSync προσπάθησε να δημιουργήσει ένα κατάλογο που υπάρχει ήδη. - - + + CSync: No space on %1 server available. CSync: Δεν υπάρχει διαθέσιμος χώρος στο διακομιστή 1%. - + CSync unspecified error. Άγνωστο σφάλμα CSync. - + Aborted by the user Ματαιώθηκε από το χρήστη - + An internal error number %1 happened. Συνέβη εσωτερικό σφάλμα με αριθμό %1. - + The item is not synced because of previous errors: %1 Το αντικείμενο δεν είναι συγχρονισμένο λόγω προηγούμενων σφαλμάτων: %1 - + Symbolic links are not supported in syncing. Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό. - + File is listed on the ignore list. Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση. - + File contains invalid characters that can not be synced cross platform. Το αρχείο περιέχει άκυρους χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα. - + Unable to initialize a sync journal. Αδυναμία προετοιμασίας αρχείου συγχρονισμού. - + Cannot open the sync journal Αδυναμία ανοίγματος του αρχείου συγχρονισμού - + Not allowed because you don't have permission to add sub-directories in that directory Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε υπο-καταλόγους σε αυτό τον κατάλογο - + Not allowed because you don't have permission to add parent directory Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε στο γονεϊκό κατάλογο - + Not allowed because you don't have permission to add files in that directory Δεν επιτρέπεται επειδή δεν έχεται δικαιώματα να προσθέσετε αρχεία σε αυτόν τον κατάλογο - + Not allowed to upload this file because it is read-only on the server, restoring Δεν επιτρέπεται να μεταφορτώσετε αυτό το αρχείο επειδή είναι μόνο για ανάγνωση στο διακομιστή, αποκατάσταση σε εξέλιξη - - + + Not allowed to remove, restoring Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη - + Move not allowed, item restored Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε - + Move not allowed because %1 is read-only Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση - + the destination ο προορισμός - + the source η προέλευση @@ -2028,7 +2028,7 @@ It is not advisable to use it. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2141,22 +2141,27 @@ It is not advisable to use it. Κανένα στοιχείο δεν συγχρονίστηκε πρόσφατα - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) Συγχρονισμός %1 από %2 (%3 απομένουν) - + Syncing %1 (%2 left) Συγχρονισμός %1 (%2 απομένουν) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Ενημερωμένο @@ -2401,7 +2406,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Εάν δεν έχετε ένα διακομιστή ownCloud ακόμα, δείτε στην διεύθυνση <a href="https://owncloud.com">owncloud.com</a> για περισσότερες πληροφορίες. @@ -2540,21 +2545,16 @@ It is not advisable to use it. - The server is currently unavailable - Ο διακομιστής δεν είναι διαθέσιμος προς το παρόν - - - Preparing to sync Προετοιμασία για συγχρονισμό - + Aborting... Ματαίωση σε εξέλιξη... - + Sync is paused Παύση συγχρονισμού diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts index 3fef48300c..9d21b976a1 100644 --- a/translations/mirall_en.ts +++ b/translations/mirall_en.ts @@ -91,7 +91,7 @@ - + Pause @@ -121,53 +121,58 @@ - + Resume - + Confirm Folder Remove - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> - + Confirm Folder Reset - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. - + Sync Running @@ -177,34 +182,34 @@ - + The syncing operation is running.<br/>Do you want to terminate it? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. @@ -283,90 +288,90 @@ Total time left %5 - + %1: %2 - + %1 and %2 other files have been removed. %1 names a file. - + %1 has been removed. %1 names a file. - + %1 and %2 other files have been downloaded. %1 names a file. - + %1 has been downloaded. %1 names a file. - + %1 and %2 other files have been updated. - + %1 has been updated. %1 names a file. - + %1 has been renamed to %2 and %3 other files have been renamed. - + %1 has been renamed to %2. %1 and %2 name files. - + %1 has been moved to %2 and %3 other files have been moved. - + %1 has been moved to %2. - + Sync Activity - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? - + Remove All Files? - + Remove all files - + Keep files @@ -384,57 +389,52 @@ Are you sure you want to perform this operation? - + Undefined State. - + Waits to start syncing. - + Preparing for sync. - + Sync is running. - - Server is currently not available. - - - - + Last Sync was successful. - + Last Sync was successful, but with warnings on individual files. - + Setup Error. - + User Abort. - + Sync is paused. - + %1 (Sync is paused) @@ -1495,27 +1495,27 @@ It is not advisable to use it. - + %1 - + Activity - + General - + Network - + Account @@ -1781,229 +1781,229 @@ It is not advisable to use it. Mirall::SyncEngine - + Success. - + CSync failed to create a lock file. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. - + CSync failed to write the journal file. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. - + CSync could not detect the filesystem type. - + CSync got an error while processing internal trees. - + CSync failed to reserve memory. - + CSync fatal parameter error. - + CSync processing step update failed. - + CSync processing step reconcile failed. - + CSync processing step propagate failed. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> - + A remote file can not be written. Please check the remote access. - + The local filesystem can not be written. Please check permissions. - + CSync failed to connect through a proxy. - + CSync could not authenticate at the proxy. - + CSync failed to lookup proxy or server. - + CSync failed to authenticate at the %1 server. - + CSync failed to connect to the network. - + A network connection timeout happened. - + A HTTP transmission error happened. - + CSync failed due to not handled permission deniend. - + CSync failed to access - + CSync tried to create a directory that already exists. - - + + CSync: No space on %1 server available. - + CSync unspecified error. - + Aborted by the user - + An internal error number %1 happened. - + The item is not synced because of previous errors: %1 - + Symbolic links are not supported in syncing. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2019,7 +2019,7 @@ It is not advisable to use it. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2132,22 +2132,27 @@ It is not advisable to use it. - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date @@ -2392,7 +2397,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! @@ -2531,21 +2536,16 @@ It is not advisable to use it. - The server is currently unavailable - - - - Preparing to sync - + Aborting... - + Sync is paused diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts index 62f2481a5e..792417d9bb 100644 --- a/translations/mirall_es.ts +++ b/translations/mirall_es.ts @@ -89,7 +89,7 @@ - + Pause Pausar @@ -119,53 +119,58 @@ <b>Nota:</b> Algunas carpetas, incluyendo unidades de red o carpetas compartidas, pueden tener límites diferentes. - + Resume Continuar - + Confirm Folder Remove Confirmar la eliminación de la carpeta - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Realmente desea dejar de sincronizar la carpeta <i>%1</i>?</p><p><b>Note:</b> Esto no eliminará los archivos de su cliente.</p> - + Confirm Folder Reset Confirme que desea restablecer la carpeta - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Realmente desea restablecer la carpeta <i>%1</i> y reconstruir la base de datos de cliente?</p><p><b>Nota:</b> Esta función es para mantenimiento únicamente. No se eliminarán archivos, pero se puede causar alto tráfico en la red y puede tomar varios minutos u horas para terminar, dependiendo del tamaño de la carpeta. Únicamente utilice esta opción si así lo indica su administrador.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) de %2 espacio usado en el servidor. - + No connection to %1 at <a href="%2">%3</a>. No hay conexión a %1 en <a href="%2">%3</a>. - + No %1 connection configured. No hay ninguna conexión de %1 configurada. - + Sync Running Sincronización en curso @@ -175,35 +180,35 @@ No se ha configurado la cuenta. - + The syncing operation is running.<br/>Do you want to terminate it? La sincronización está en curso.<br/>¿Desea interrumpirla? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 de %4) quedan %5 a una velocidad de %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 de %2, archivo %3 de %4 Tiempo restante %5 - + Connected to <a href="%1">%2</a>. Conectado a <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Conectado a <a href="%1">%2</a> como <i>%3</i>. - + Currently there is no storage usage information available. Actualmente no hay información disponible sobre el uso de almacenamiento. @@ -282,73 +287,73 @@ Tiempo restante %5 %1 es ilegible. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 y %2 otros archivos han sido eliminados. - + %1 has been removed. %1 names a file. %1 ha sido eliminado. - + %1 and %2 other files have been downloaded. %1 names a file. %1 y %2 otros archivos han sido descargados. - + %1 has been downloaded. %1 names a file. %1 ha sido descargado. - + %1 and %2 other files have been updated. %1 y %2 otros archivos han sido actualizados. - + %1 has been updated. %1 names a file. %1 ha sido actualizado. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 ha sido renombrado a %2 y %3 otros archivos han sido renombrados. - + %1 has been renamed to %2. %1 and %2 name files. %1 ha sido renombrado a %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 ha sido movido a %2 y %3 otros archivos han sido movidos. - + %1 has been moved to %2. %1 ha sido movido a %2. - + Sync Activity Actividad en la Sincronización - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -357,17 +362,17 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q Está seguro de que desea realizar esta operación? - + Remove All Files? Eliminar todos los archivos? - + Remove all files Eliminar todos los archivos - + Keep files Conservar archivos @@ -385,57 +390,52 @@ Está seguro de que desea realizar esta operación? Un antiguo registro (journal) de sincronización '%1' se ha encontrado, pero no se ha podido eliminar. Por favor asegúrese que ninguna aplicación la está utilizando. - + Undefined State. Estado no definido. - + Waits to start syncing. Esperando el inicio de la sincronización. - + Preparing for sync. Preparándose para sincronizar. - + Sync is running. Sincronización en funcionamiento. - - Server is currently not available. - El servidor no está disponible en el momento - - - + Last Sync was successful. La última sincronización fue exitosa. - + Last Sync was successful, but with warnings on individual files. La última sincronización fue exitosa pero con advertencias para archivos individuales. - + Setup Error. Error de configuración. - + User Abort. Interrumpir. - + Sync is paused. La sincronización está en pausa. - + %1 (Sync is paused) %1 (Sincronización en pausa) @@ -1501,27 +1501,27 @@ Intente sincronizar los archivos nuevamente. Ajustes - + %1 %1 - + Activity Actividad - + General General - + Network Red - + Account Cuenta @@ -1789,229 +1789,229 @@ Intente sincronizar los archivos nuevamente. Mirall::SyncEngine - + Success. Completado con éxito. - + CSync failed to create a lock file. CSync no pudo crear un fichero de bloqueo. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync falló al cargar o crear el archivo de diario. Asegúrese de tener permisos de lectura y escritura en el directorio local de sincronización. - + CSync failed to write the journal file. CSync falló al escribir el archivo de diario. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>El %1 complemente para csync no se ha podido cargar.<br/>Por favor, verifique la instalación</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. La hora del sistema en este cliente es diferente de la hora del sistema en el servidor. Por favor use un servicio de sincronización de hora (NTP) en los servidores y clientes para que las horas se mantengan idénticas. - + CSync could not detect the filesystem type. CSync no pudo detectar el tipo de sistema de archivos. - + CSync got an error while processing internal trees. CSync encontró un error mientras procesaba los árboles de datos internos. - + CSync failed to reserve memory. Fallo al reservar memoria para Csync - + CSync fatal parameter error. Error fatal de parámetro en CSync. - + CSync processing step update failed. El proceso de actualización de CSync ha fallado. - + CSync processing step reconcile failed. Falló el proceso de composición de CSync - + CSync processing step propagate failed. Error en el proceso de propagación de CSync - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>El directorio de destino no existe.</p><p>Por favor verifique la configuración de sincronización.</p> - + A remote file can not be written. Please check the remote access. No se pudo escribir en un archivo remoto. Por favor, compruebe el acceso remoto. - + The local filesystem can not be written. Please check permissions. No se puede escribir en el sistema de archivos local. Por favor, compruebe los permisos. - + CSync failed to connect through a proxy. CSync falló al realizar la conexión a través del proxy - + CSync could not authenticate at the proxy. CSync no pudo autenticar el proxy. - + CSync failed to lookup proxy or server. CSync falló al realizar la búsqueda del proxy - + CSync failed to authenticate at the %1 server. CSync: Falló la autenticación con el servidor %1. - + CSync failed to connect to the network. CSync: Falló la conexión con la red. - + A network connection timeout happened. Se sobrepasó el tiempo de espera de la conexión de red. - + A HTTP transmission error happened. Ha ocurrido un error de transmisión HTTP. - + CSync failed due to not handled permission deniend. CSync: Falló debido a un permiso denegado. - + CSync failed to access Error al acceder CSync - + CSync tried to create a directory that already exists. CSync trató de crear un directorio que ya existe. - - + + CSync: No space on %1 server available. CSync: No queda espacio disponible en el servidor %1. - + CSync unspecified error. Error no especificado de CSync - + Aborted by the user Interrumpido por el usuario - + An internal error number %1 happened. Ha ocurrido un error interno número %1. - + The item is not synced because of previous errors: %1 El elemento no está sincronizado por errores previos: %1 - + Symbolic links are not supported in syncing. Los enlaces simbolicos no estan sopertados. - + File is listed on the ignore list. El fichero está en la lista de ignorados - + File contains invalid characters that can not be synced cross platform. El fichero contiene caracteres inválidos que no pueden ser sincronizados con la plataforma. - + Unable to initialize a sync journal. No se pudo inicializar un registro (journal) de sincronización. - + Cannot open the sync journal No es posible abrir el diario de sincronización - + Not allowed because you don't have permission to add sub-directories in that directory No está permitido, porque no tiene permisos para añadir subcarpetas en este directorio. - + Not allowed because you don't have permission to add parent directory No está permitido porque no tiene permisos para añadir un directorio - + Not allowed because you don't have permission to add files in that directory No está permitido, porque no tiene permisos para crear archivos en este directorio - + Not allowed to upload this file because it is read-only on the server, restoring No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando. - - + + Not allowed to remove, restoring No está permitido borrar, restaurando. - + Move not allowed, item restored No está permitido mover, elemento restaurado. - + Move not allowed because %1 is read-only No está permitido mover, porque %1 es solo lectura. - + the destination destino - + the source origen @@ -2027,9 +2027,9 @@ Intente sincronizar los archivos nuevamente. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - + <p>Versión %1 Para más información, visite <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distribuido por %4 y bajo la licencia GNU General Public License (GPL) Versión 2.0.<br>%5 y el logo %5 son marcas registradas de %4 en los Estados Unidos de América, otros países, o en ambos.</p> @@ -2140,22 +2140,27 @@ Intente sincronizar los archivos nuevamente. No se han sincronizado elementos recientemente - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) Sincronizando %1 de %2 (quedan %3) - + Syncing %1 (%2 left) Sincronizando %1 (quedan %2) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Actualizado @@ -2400,7 +2405,7 @@ Intente sincronizar los archivos nuevamente. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Si aún no tiene un servidor ownCloud, visite <a href="https://owncloud.com">owncloud.com</a> para obtener más información. @@ -2416,7 +2421,7 @@ Intente sincronizar los archivos nuevamente. <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 - + <p>Versión %2. Para mayor información, visite <a href="%3">%4</a></p><p><small>Por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz y otros.<br>Basado en Mirall por Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Distribuido bajo la licencia GNU Public License (GPL) Versión 2.0<br/>ownCloud y el logo de ownCloud son marcas registradas de ownCloud,Inc. en los Estados Unidos de América, otros países, o en ambos</p>%7 @@ -2539,21 +2544,16 @@ Intente sincronizar los archivos nuevamente. - The server is currently unavailable - El servidor no se encuentra disponible actualmente. - - - Preparing to sync Preparando para la sincronizacipon - + Aborting... Interrumpiendo... - + Sync is paused La sincronización se ha pausado diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts index a81da0cd5f..5a25af9012 100644 --- a/translations/mirall_es_AR.ts +++ b/translations/mirall_es_AR.ts @@ -89,7 +89,7 @@ - + Pause Pausar @@ -119,53 +119,58 @@ <b>Nota:</b> Algunas carpetas, incluidas las montadas en red o las carpetas compartidas, pueden tener diferentes límites. - + Resume Continuar - + Confirm Folder Remove Confirmá la eliminación del directorio - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>¿Realmente deseas detener la sincronización de la carpeta <i>%1</i>?</p><p><b>Nota:</b>Estp no removerá los archivos desde tu cliente.</p> - + Confirm Folder Reset Confirme el reseteo de la carpeta - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>¿Realmente deseas resetear el directorio <i>%1</i> y reconstruir la base de datos del cliente?</p><p><b>Nota:</b> Esta función está designada para propósitos de mantenimiento solamente. Ningún archivo será eliminado, pero puede causar un tráfico de datos significante y tomar varios minutos o horas para completarse, dependiendo del tamaño del directorio. Sólo use esta opción si es aconsejado por su administrador.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. No hay ninguna conexión de %1 configurada. - + Sync Running Sincronización en curso @@ -175,34 +180,34 @@ No hay cuenta configurada. - + The syncing operation is running.<br/>Do you want to terminate it? La sincronización está en curso.<br/>¿Querés interrumpirla? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. Conectado a <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Conectado a <a href="%1">%2</a> como <i>%3</i>. - + Currently there is no storage usage information available. Actualmente no hay información disponible acerca del uso del almacenamiento. @@ -281,73 +286,73 @@ Total time left %5 No se puede leer %1. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. - + %1 has been removed. %1 names a file. - + %1 and %2 other files have been downloaded. %1 names a file. - + %1 has been downloaded. %1 names a file. - + %1 and %2 other files have been updated. - + %1 has been updated. %1 names a file. - + %1 has been renamed to %2 and %3 other files have been renamed. - + %1 has been renamed to %2. %1 and %2 name files. - + %1 has been moved to %2 and %3 other files have been moved. - + %1 has been moved to %2. - + Sync Activity Actividad de Sync - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -356,17 +361,17 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o ¿Estás seguro de que querés realizar esta operación? - + Remove All Files? ¿Borrar todos los archivos? - + Remove all files Borrar todos los archivos - + Keep files Conservar archivos @@ -384,57 +389,52 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o Una antigua sincronización con journaling '%1' fue encontrada, pero no se pudo eliminar. Por favor, asegurate que ninguna aplicación la está utilizando. - + Undefined State. Estado no definido. - + Waits to start syncing. Esperando el comienzo de la sincronización. - + Preparing for sync. Preparando la sincronización. - + Sync is running. Sincronización en funcionamiento. - - Server is currently not available. - El servidor actualmente no está disponible. - - - + Last Sync was successful. La última sincronización fue exitosa. - + Last Sync was successful, but with warnings on individual files. El último Sync fue exitoso, pero hubo advertencias en archivos individuales. - + Setup Error. Error de configuración. - + User Abort. Interrumpir. - + Sync is paused. La sincronización está en pausa. - + %1 (Sync is paused) %1 (Sincronización en pausa) @@ -1498,27 +1498,27 @@ Intente sincronizar estos nuevamente. Configuración - + %1 %1 - + Activity Actividad - + General General - + Network Red - + Account Cuenta @@ -1784,229 +1784,229 @@ Intente sincronizar estos nuevamente. Mirall::SyncEngine - + Success. Éxito. - + CSync failed to create a lock file. Se registró un error en CSync cuando se intentaba crear un archivo de bloqueo. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. - + CSync failed to write the journal file. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>No fue posible cargar el plugin de %1 para csync.<br/>Por favor, verificá la instalación</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. La hora del sistema en este cliente es diferente de la hora del sistema en el servidor. Por favor, usá un servicio de sincronización (NTP) de hora en las máquinas cliente y servidor para que las horas se mantengan iguales. - + CSync could not detect the filesystem type. CSync no pudo detectar el tipo de sistema de archivos. - + CSync got an error while processing internal trees. CSync tuvo un error mientras procesaba los árboles de datos internos. - + CSync failed to reserve memory. CSync falló al reservar memoria. - + CSync fatal parameter error. Error fatal de parámetro en CSync. - + CSync processing step update failed. Falló el proceso de actualización de CSync. - + CSync processing step reconcile failed. Falló el proceso de composición de CSync - + CSync processing step propagate failed. Proceso de propagación de CSync falló - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>El directorio de destino %1 no existe.</p> Por favor, comprobá la configuración de sincronización. </p> - + A remote file can not be written. Please check the remote access. No se puede escribir un archivo remoto. Revisá el acceso remoto. - + The local filesystem can not be written. Please check permissions. No se puede escribir en el sistema de archivos local. Revisá los permisos. - + CSync failed to connect through a proxy. CSync falló al tratar de conectarse a través de un proxy - + CSync could not authenticate at the proxy. CSync no pudo autenticar el proxy. - + CSync failed to lookup proxy or server. CSync falló al realizar la busqueda del proxy. - + CSync failed to authenticate at the %1 server. CSync: fallo al autenticarse en el servidor %1. - + CSync failed to connect to the network. CSync: fallo al conectarse a la red - + A network connection timeout happened. - + A HTTP transmission error happened. Ha ocurrido un error de transmisión HTTP. - + CSync failed due to not handled permission deniend. CSync: Falló debido a un permiso denegado. - + CSync failed to access CSync falló al acceder - + CSync tried to create a directory that already exists. Csync trató de crear un directorio que ya existía. - - + + CSync: No space on %1 server available. CSync: No hay más espacio disponible en el servidor %1. - + CSync unspecified error. Error no especificado de CSync - + Aborted by the user Interrumpido por el usuario - + An internal error number %1 happened. - + The item is not synced because of previous errors: %1 - + Symbolic links are not supported in syncing. Los vínculos simbólicos no está soportados al sincronizar. - + File is listed on the ignore list. El archivo está en la lista de ignorados. - + File contains invalid characters that can not be synced cross platform. El archivo contiene caracteres inválidos que no pueden ser sincronizados entre plataforma. - + Unable to initialize a sync journal. Imposible inicializar un diario de sincronización. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2022,7 +2022,7 @@ Intente sincronizar estos nuevamente. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2135,22 +2135,27 @@ Intente sincronizar estos nuevamente. No se sincronizaron elementos recientemente - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) %1 (%2, %3) - + Up to date actualizado @@ -2396,7 +2401,7 @@ Intente sincronizar estos nuevamente. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Si todavía no tenés un servidor ownCloud, visitá <a href="https://owncloud.com">owncloud.com</a> para obtener más información. @@ -2535,21 +2540,16 @@ Intente sincronizar estos nuevamente. - The server is currently unavailable - El servidor no se encuentra disponible actualmente. - - - Preparing to sync Preparando para la sincronizacipon - + Aborting... Abortando... - + Sync is paused Sincronización Pausada diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts index d17028da1f..a196496626 100644 --- a/translations/mirall_et.ts +++ b/translations/mirall_et.ts @@ -89,7 +89,7 @@ - + Pause Paus @@ -119,53 +119,58 @@ <b>Märkus:</b> Mõned kataloogid, sealhulgas võrgust ühendatud või jagatud kataloogid, võivad omada erinevaid limiite. - + Resume Taasta - + Confirm Folder Remove Kinnita kausta eemaldamist - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Kas tõesti soovid peatada kataloogi <i>%1</i> sünkroniseerimist?.</p><p><b>Märkus:</b> See ei eemalda faile sinu kliendist.</p> - + Confirm Folder Reset Kinnita kataloogi algseadistus - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Kas tõesti soovid kataloogi <i>%1</i> algseadistada ning uuesti luua oma kliendi andmebaasi?</p><p><b>See funktsioon on mõeldud peamiselt ainult hooldustöödeks. Märkus:</b>Kuigi ühtegi faili ei eemaldata, siis see võib põhjustada märkimisväärset andmeliiklust ja võtta mitu minutit või tundi, sõltuvalt kataloogi suurusest. Kasuta seda võimalust ainult siis kui seda soovitab süsteemihaldur.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) %2-st serveri mahust on kasutuses. - + No connection to %1 at <a href="%2">%3</a>. Ühendus puudub %1 <a href="%2">%3</a>. - + No %1 connection configured. Ühtegi %1 ühendust pole seadistatud. - + Sync Running Sünkroniseerimine on käimas @@ -175,35 +180,35 @@ Ühtegi kontot pole seadistatud - + The syncing operation is running.<br/>Do you want to terminate it? Sünkroniseerimine on käimas.<br/>Kas sa soovid seda lõpetada? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 of %4) %5 jäänud kiirusel %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 of %2, fail %3 of %4 Aega kokku jäänud %5 - + Connected to <a href="%1">%2</a>. Ühendatud <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Ühendatud <a href="%1">%2</a> kui <i>%3</i>. - + Currently there is no storage usage information available. Hetkel pole mahu kasutuse info saadaval. @@ -282,73 +287,73 @@ Aega kokku jäänud %5 %1 pole loetav. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 ja %2 teist faili eemaldati. - + %1 has been removed. %1 names a file. %1 on eemaldatud. - + %1 and %2 other files have been downloaded. %1 names a file. %1 ja %2 teist faili on alla laaditud. - + %1 has been downloaded. %1 names a file. %1 on alla laaditud. - + %1 and %2 other files have been updated. %1 ja %2 teist faili on uuendatud. - + %1 has been updated. %1 names a file. %1 on uuendatud. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 on ümber nimetatud %2 ja %3 muud faili on samuti ümber nimetatud - + %1 has been renamed to %2. %1 and %2 name files. %1 on ümber nimetatud %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 on tõstetud %2 ning %3 muud faili on samuti liigutatud. - + %1 has been moved to %2. %1 on tõstetud %2. - + Sync Activity Sünkroniseerimise tegevus - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -357,17 +362,17 @@ See võib olla põhjustatud kataloogi ümberseadistusest või on toimunud kõiki Oled kindel, et soovid seda operatsiooni teostada? - + Remove All Files? Kustutada kõik failid? - + Remove all files Kustutada kõik failid - + Keep files Säilita failid @@ -385,57 +390,52 @@ Oled kindel, et soovid seda operatsiooni teostada? Leiti vana sünkroniseeringu zurnaal '%1', kuid selle eemaldamine ebaõnnenstus. Palun veendu, et seda kasutaks ükski programm. - + Undefined State. Määramata staatus. - + Waits to start syncing. Ootab sünkroniseerimise alustamist. - + Preparing for sync. Valmistun sünkroniseerima. - + Sync is running. Sünkroniseerimine on käimas. - - Server is currently not available. - Server pole hetkel saadaval. - - - + Last Sync was successful. Viimane sünkroniseerimine oli edukas. - + Last Sync was successful, but with warnings on individual files. Viimane sünkroniseering oli edukas, kuid mõned failid põhjustasid tõrkeid. - + Setup Error. Seadistamise viga. - + User Abort. Kasutaja tühistamine. - + Sync is paused. Sünkroniseerimine on peatatud. - + %1 (Sync is paused) %1 (Sünkroniseerimine on peatatud) @@ -1501,27 +1501,27 @@ Proovi neid uuesti sünkroniseerida. Seaded - + %1 %1 - + Activity Toimingud - + General Üldine - + Network Võrk - + Account Konto @@ -1789,229 +1789,229 @@ Proovi neid uuesti sünkroniseerida. Mirall::SyncEngine - + Success. Korras. - + CSync failed to create a lock file. CSync lukustusfaili loomine ebaõnnestus. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. Csync ei suutnud avada või luua registri faili. Tee kindlaks et sul on õigus lugeda ja kirjutada kohalikus sünkrooniseerimise kataloogis - + CSync failed to write the journal file. CSync ei suutnud luua registri faili. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Ei suuda laadida csync lisa %1.<br/>Palun kontrolli paigaldust!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Kliendi arvuti kellaeg erineb serveri omast. Palun kasuta õige aja hoidmiseks kella sünkroniseerimise teenust (NTP) nii serveris kui kliendi arvutites, et kell oleks kõikjal õige. - + CSync could not detect the filesystem type. CSync ei suutnud tuvastada failisüsteemi tüüpi. - + CSync got an error while processing internal trees. CSync sai vea sisemiste andmestruktuuride töötlemisel. - + CSync failed to reserve memory. CSync ei suutnud mälu reserveerida. - + CSync fatal parameter error. CSync parameetri saatuslik viga. - + CSync processing step update failed. CSync uuendusprotsess ebaõnnestus. - + CSync processing step reconcile failed. CSync tasakaalustuse protsess ebaõnnestus. - + CSync processing step propagate failed. CSync edasikandeprotsess ebaõnnestus. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Sihtkataloogi ei eksisteeri.</p><p>Palun kontrolli sünkroniseeringu seadistust</p> - + A remote file can not be written. Please check the remote access. Eemalolevasse faili ei saa kirjutada. Palun kontrolli kaugühenduse ligipääsu. - + The local filesystem can not be written. Please check permissions. Kohalikku failissüsteemi ei saa kirjutada. Palun kontrolli õiguseid. - + CSync failed to connect through a proxy. CSync ühendus läbi puhverserveri ebaõnnestus. - + CSync could not authenticate at the proxy. CSync ei suutnud puhverserveris autoriseerida. - + CSync failed to lookup proxy or server. Csync ei suuda leida puhverserverit. - + CSync failed to authenticate at the %1 server. CSync autoriseering serveris %1 ebaõnnestus. - + CSync failed to connect to the network. CSync võrguga ühendumine ebaõnnestus. - + A network connection timeout happened. Toimus võrgukatkestus. - + A HTTP transmission error happened. HTTP ülekande viga. - + CSync failed due to not handled permission deniend. CSync ebaõnnestus ligipääsu puudumisel. - + CSync failed to access CSyncile ligipääs ebaõnnestus - + CSync tried to create a directory that already exists. Csync proovis tekitada kataloogi, mis oli juba olemas. - - + + CSync: No space on %1 server available. CSync: Serveris %1 on ruum otsas. - + CSync unspecified error. CSync tuvastamatu viga. - + Aborted by the user Kasutaja poolt tühistatud - + An internal error number %1 happened. Tekkis sisemine viga number %1. - + The item is not synced because of previous errors: %1 Üksust ei sünkroniseeritud eelnenud vigade tõttu: %1 - + Symbolic links are not supported in syncing. Sümboolsed lingid ei ole sünkroniseerimisel toetatud. - + File is listed on the ignore list. Fail on märgitud ignoreeritavate nimistus. - + File contains invalid characters that can not be synced cross platform. Fail sisaldab sobimatuid sümboleid, mida ei saa sünkroniseerida erinevate platvormide vahel. - + Unable to initialize a sync journal. Ei suuda lähtestada sünkroniseeringu zurnaali. - + Cannot open the sync journal Ei suuda avada sünkroniseeringu zurnaali - + Not allowed because you don't have permission to add sub-directories in that directory Pole lubatud, kuna sul puuduvad õigused lisada sellesse kataloogi lisada alam-kataloogi - + Not allowed because you don't have permission to add parent directory Pole lubatud, kuna sul puuduvad õigused lisada ülemkataloog - + Not allowed because you don't have permission to add files in that directory Pole lubatud, kuna sul puuduvad õigused sellesse kataloogi faile lisada - + Not allowed to upload this file because it is read-only on the server, restoring Pole lubatud üles laadida, kuna tegemist on ainult-loetava serveriga, taastan - - + + Not allowed to remove, restoring Eemaldamine pole lubatud, taastan - + Move not allowed, item restored Liigutamine pole lubatud, üksus taastatud - + Move not allowed because %1 is read-only Liigutamien pole võimalik kuna %1 on ainult lugemiseks - + the destination sihtkoht - + the source allikas @@ -2027,7 +2027,7 @@ Proovi neid uuesti sünkroniseerida. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2140,22 +2140,27 @@ Proovi neid uuesti sünkroniseerida. Ühtegi üksust pole hiljuti sünkroniseeritud - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) Sünkroniseerin %1 %2-st (%3 veel) - + Syncing %1 (%2 left) Sünkroniseerin %1 (%2 veel) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Ajakohane @@ -2400,7 +2405,7 @@ Proovi neid uuesti sünkroniseerida. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Kui sul poole veel oma ownCloud serverit, vaata <a href="https://owncloud.com">owncloud.com</a> rohkema info saamiseks. @@ -2539,21 +2544,16 @@ Proovi neid uuesti sünkroniseerida. - The server is currently unavailable - Server pole hetkel saadaval. - - - Preparing to sync Sünkroniseerimiseks valmistumine - + Aborting... Tühistamine ... - + Sync is paused Sünkroniseerimine on peatatud diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts index 5723f41b48..70820f7684 100644 --- a/translations/mirall_eu.ts +++ b/translations/mirall_eu.ts @@ -89,7 +89,7 @@ - + Pause Pausarazi @@ -119,53 +119,58 @@ <b>Oharra:</b>Karpeta batzuk, sarekoa edo partekatutakoak, muga ezberdinak izan ditzazkete. - + Resume Berrekin - + Confirm Folder Remove Baieztatu karpetaren ezabatzea - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Bentan nahi duzu karpetaren sinkronizazioa gelditu? <i>%1</i>?</p><p><b>Oharra:</b>Honek ez du fitxategiak zure bezerotik ezabatuko.</p> - + Confirm Folder Reset Baieztatu Karpetaren Leheneratzea - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Benetan nahi duzu <i>%1</i> karpeta leheneratu eta zure bezeroaren datu basea berreraiki?</p><p><b>Oharra:</p> Funtzio hau mantenurako bakarrik diseinauta izan da. Ez da fitxategirik ezabatuko, baina honek datu trafiko handia sor dezake eta minutu edo ordu batzuk behar izango ditu burutzeko, karpetaren tamainaren arabera. Erabili aukera hau bakarrik zure kudeatzaileak esanez gero.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) tik %2 zerbitzariko lekua erabilia - + No connection to %1 at <a href="%2">%3</a>. Ez dago %1-ra konexiorik hemendik <a href="%2">%3</a>. - + No %1 connection configured. Ez dago %1 konexiorik konfiguratuta. - + Sync Running Sinkronizazioa martxan da @@ -175,35 +180,35 @@ Ez da konturik konfiguratu. - + The syncing operation is running.<br/>Do you want to terminate it? Sinkronizazio martxan da.<br/>Bukatu nahi al duzu? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 %2-tik %1, %4-tik %3 fitxategi Geratzen den denbora %5 - + Connected to <a href="%1">%2</a>. <a href="%1">%2</a>ra konektatuta. - + Connected to <a href="%1">%2</a> as <i>%3</i>. <a href="%1">%2</a>ra konektatuta <i>%3</i> erabiltzailearekin. - + Currently there is no storage usage information available. Orain ez dago eskuragarri biltegiratze erabileraren informazioa. @@ -282,73 +287,73 @@ Geratzen den denbora %5 %1 ezin da irakurri. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 eta beste %2 fitxategi ezabatu dira. - + %1 has been removed. %1 names a file. %1 ezabatua izan da. - + %1 and %2 other files have been downloaded. %1 names a file. %1 eta beste %2 fitxategi deskargatu dira. - + %1 has been downloaded. %1 names a file. %1 deskargatu da. - + %1 and %2 other files have been updated. %1 eta beste %2 fitxategi kargatu dira. - + %1 has been updated. %1 names a file. %1 kargatu da. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 %2-(e)ra berrizendatu da eta beste %3 fitxategi berrizendatu dira. - + %1 has been renamed to %2. %1 and %2 name files. %1 %2-(e)ra berrizendatu da. - + %1 has been moved to %2 and %3 other files have been moved. %1 %2-(e)ra berrizendatu da eta beste %3 fitxategi mugitu dira. - + %1 has been moved to %2. %1 %2-(e)ra mugitu da. - + Sync Activity Sinkronizazio Jarduerak - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -357,17 +362,17 @@ Izan daiteke karpeta isilpean birkonfiguratu delako edo fitxategi guztiak eskuz Ziur zaude eragiketa hau egin nahi duzula? - + Remove All Files? Ezabatu Fitxategi Guztiak? - + Remove all files Ezabatu fitxategi guztiak - + Keep files Mantendu fitxategiak @@ -385,57 +390,52 @@ Ziur zaude eragiketa hau egin nahi duzula? Aurkitu da '%1' sinkronizazio erregistro zaharra, baina ezin da ezabatu. Ziurtatu aplikaziorik ez dela erabiltzen ari. - + Undefined State. Definitu gabeko egoera. - + Waits to start syncing. Itxoiten sinkronizazioa hasteko. - + Preparing for sync. Sinkronizazioa prestatzen. - + Sync is running. Sinkronizazioa martxan da. - - Server is currently not available. - Zerbitzaria orain ez dago eskuragarri. - - - + Last Sync was successful. Azkeneko sinkronizazioa ongi burutu zen. - + Last Sync was successful, but with warnings on individual files. Azkenengo sinkronizazioa ongi burutu zen, baina banakako fitxategi batzuetan abisuak egon dira. - + Setup Error. Konfigurazio errorea. - + User Abort. Erabiltzaileak bertan behera utzi. - + Sync is paused. Sinkronizazioa pausatuta dago. - + %1 (Sync is paused) %1 (Sinkronizazioa pausatuta dago) @@ -1500,27 +1500,27 @@ Saiatu horiek berriz sinkronizatzen. Ezarpenak - + %1 %1 - + Activity Jarduera - + General Orokorra - + Network Sarea - + Account Kontua @@ -1786,229 +1786,229 @@ Saiatu horiek berriz sinkronizatzen. Mirall::SyncEngine - + Success. Arrakasta. - + CSync failed to create a lock file. CSyncek huts egin du lock fitxategia sortzean. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. - + CSync failed to write the journal file. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>csyncen %1 plugina ezin da kargatu.<br/>Mesedez egiaztatu instalazioa!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Bezero honetako sistemaren ordua zerbitzariarenaren ezberdina da. Mesedez erabili sinkronizazio zerbitzari bat (NTP) zerbitzari eta bezeroan orduak berdinak izan daitezen. - + CSync could not detect the filesystem type. CSyncek ezin du fitxategi sistema mota antzeman. - + CSync got an error while processing internal trees. CSyncek errorea izan du barne zuhaitzak prozesatzerakoan. - + CSync failed to reserve memory. CSyncek huts egin du memoria alokatzean. - + CSync fatal parameter error. CSync parametro larri errorea. - + CSync processing step update failed. CSync prozesatzearen eguneratu urratsak huts egin du. - + CSync processing step reconcile failed. CSync prozesatzearen berdinkatze urratsak huts egin du. - + CSync processing step propagate failed. CSync prozesatzearen hedatu urratsak huts egin du. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Helburu direktorioa ez da existitzen.</p><p>Egiazt6atu sinkronizazio konfigurazioa.</p> - + A remote file can not be written. Please check the remote access. Urruneko fitxategi bat ezin da idatzi. Mesedez egiaztatu urreneko sarbidea. - + The local filesystem can not be written. Please check permissions. Ezin da idatzi bertako fitxategi sisteman. Mesedez egiaztatu baimenak. - + CSync failed to connect through a proxy. CSyncek huts egin du proxiaren bidez konektatzean. - + CSync could not authenticate at the proxy. CSyncek ezin izan du proxya autentikatu. - + CSync failed to lookup proxy or server. CSyncek huts egin du zerbitzaria edo proxia bilatzean. - + CSync failed to authenticate at the %1 server. CSyncek huts egin du %1 zerbitzarian autentikatzean. - + CSync failed to connect to the network. CSyncek sarera konektatzean huts egin du. - + A network connection timeout happened. - + A HTTP transmission error happened. HTTP transmisio errore bat gertatu da. - + CSync failed due to not handled permission deniend. CSyncek huts egin du kudeatu gabeko baimen ukapen bat dela eta. - + CSync failed to access - + CSync tried to create a directory that already exists. CSyncek dagoeneko existitzen zen karpeta bat sortzen saiatu da. - - + + CSync: No space on %1 server available. CSync: Ez dago lekurik %1 zerbitzarian. - + CSync unspecified error. CSyncen zehaztugabeko errorea. - + Aborted by the user Erabiltzaileak bertan behera utzita - + An internal error number %1 happened. - + The item is not synced because of previous errors: %1 - + Symbolic links are not supported in syncing. Esteka sinbolikoak ezin dira sinkronizatu. - + File is listed on the ignore list. Fitxategia baztertutakoen zerrendan dago. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. Ezin izan da sinkronizazio egunerokoa hasieratu. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2024,7 +2024,7 @@ Saiatu horiek berriz sinkronizatzen. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2137,22 +2137,27 @@ Saiatu horiek berriz sinkronizatzen. Ez da azken aldian ezer sinkronizatu - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Eguneratua @@ -2397,7 +2402,7 @@ Saiatu horiek berriz sinkronizatzen. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! ownCloud zerbitzaririk ez baduzu, ikusi <a href="https://owncloud.com">owncloud.com</a> informazio gehiago eskuratzeko. @@ -2536,21 +2541,16 @@ Saiatu horiek berriz sinkronizatzen. - The server is currently unavailable - Zerbitzaria orain ez dago eskuragarri. - - - Preparing to sync Sinkronizazioa prestatzen - + Aborting... Bertan-behera uzten - + Sync is paused Sinkronizazioa pausatuta dago diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts index 4e912910ae..9dafcba2aa 100644 --- a/translations/mirall_fa.ts +++ b/translations/mirall_fa.ts @@ -89,7 +89,7 @@ - + Pause توقف کردن @@ -119,53 +119,58 @@ - + Resume از سر گیری - + Confirm Folder Remove قبول کردن پاک شدن پوشه - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> - + Confirm Folder Reset - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. - + Sync Running همگام سازی در حال اجراست @@ -175,34 +180,34 @@ - + The syncing operation is running.<br/>Do you want to terminate it? عملیات همگام سازی در حال اجراست.<br/>آیا دوست دارید آن را متوقف کنید؟ - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. @@ -281,90 +286,90 @@ Total time left %5 %1 قابل خواندن نیست. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. - + %1 has been removed. %1 names a file. %1 حذف شده است. - + %1 and %2 other files have been downloaded. %1 names a file. - + %1 has been downloaded. %1 names a file. %1 بارگزاری شد. - + %1 and %2 other files have been updated. - + %1 has been updated. %1 names a file. - + %1 has been renamed to %2 and %3 other files have been renamed. - + %1 has been renamed to %2. %1 and %2 name files. - + %1 has been moved to %2 and %3 other files have been moved. - + %1 has been moved to %2. - + Sync Activity فعالیت همگام سازی - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? - + Remove All Files? - + Remove all files - + Keep files نگه داشتن فایل ها @@ -382,57 +387,52 @@ Are you sure you want to perform this operation? - + Undefined State. موقعیت تعریف نشده - + Waits to start syncing. صبر کنید تا همگام سازی آغاز شود - + Preparing for sync. - + Sync is running. همگام سازی در حال اجراست - - Server is currently not available. - - - - + Last Sync was successful. آخرین همگام سازی موفقیت آمیز بود - + Last Sync was successful, but with warnings on individual files. - + Setup Error. خطا در پیکر بندی. - + User Abort. خارج کردن کاربر. - + Sync is paused. همگام سازی فعلا متوقف شده است - + %1 (Sync is paused) @@ -1493,27 +1493,27 @@ It is not advisable to use it. تنظیمات - + %1 - + Activity قعالیت - + General عمومی - + Network - + Account حساب کاربری @@ -1779,229 +1779,229 @@ It is not advisable to use it. Mirall::SyncEngine - + Success. موفقیت - + CSync failed to create a lock file. CSync موفق به ایجاد یک فایل قفل شده، نشد. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. - + CSync failed to write the journal file. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>ماژول %1 برای csync نمی تواند بارگذاری شود.<br/>لطفا نصب را بررسی کنید!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. سیستم زمان بر روی این مشتری با سیستم زمان بر روی سرور متفاوت است.لطفا از خدمات هماهنگ سازی زمان (NTP) بر روی ماشین های سرور و کلاینت استفاده کنید تا زمان ها یکسان باقی بمانند. - + CSync could not detect the filesystem type. CSync نوع فایل های سیستم را نتوانست تشخیص بدهد. - + CSync got an error while processing internal trees. CSync هنگام پردازش درختان داخلی یک خطا دریافت نمود. - + CSync failed to reserve memory. CSync موفق به رزرو حافظه نشد است. - + CSync fatal parameter error. - + CSync processing step update failed. مرحله به روز روسانی پردازش CSync ناموفق بود. - + CSync processing step reconcile failed. مرحله تطبیق پردازش CSync ناموفق بود. - + CSync processing step propagate failed. مرحله گسترش پردازش CSync ناموفق بود. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>پوشه هدف وجود ندارد.</p><p>لطفا راه اندازی همگام سازی را بررسی کنید.</p> - + A remote file can not be written. Please check the remote access. یک فایل از راه دور نمی تواند نوشته شود. لطفا دسترسی از راه دور را بررسی نمایید. - + The local filesystem can not be written. Please check permissions. بر روی فایل سیستمی محلی نمی توانید چیزی بنویسید.لطفا مجوزش را بررسی کنید. - + CSync failed to connect through a proxy. عدم موفقیت CSync برای اتصال از طریق یک پروکسی. - + CSync could not authenticate at the proxy. - + CSync failed to lookup proxy or server. عدم موفقیت CSync برای مراجعه به پروکسی یا سرور. - + CSync failed to authenticate at the %1 server. عدم موفقیت CSync برای اعتبار دادن در %1 سرور. - + CSync failed to connect to the network. عدم موفقیت CSync برای اتصال به شبکه. - + A network connection timeout happened. - + A HTTP transmission error happened. خطا در انتقال HTTP اتفاق افتاده است. - + CSync failed due to not handled permission deniend. - + CSync failed to access - + CSync tried to create a directory that already exists. CSync برای ایجاد یک پوشه که در حال حاضر موجود است تلاش کرده است. - - + + CSync: No space on %1 server available. CSync: فضا در %1 سرور در دسترس نیست. - + CSync unspecified error. خطای نامشخص CSync - + Aborted by the user - + An internal error number %1 happened. - + The item is not synced because of previous errors: %1 - + Symbolic links are not supported in syncing. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2017,7 +2017,7 @@ It is not advisable to use it. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2130,22 +2130,27 @@ It is not advisable to use it. - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date تا تاریخ @@ -2390,7 +2395,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! اگر شما هنوز یک سرور ownCloud ندارید، <a href="https://owncloud.com">owncloud.com</a> را برای اطلاعات بیشتر ببینید. @@ -2529,21 +2534,16 @@ It is not advisable to use it. - The server is currently unavailable - - - - Preparing to sync - + Aborting... - + Sync is paused diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts index 9f4941f0d7..b950af9df2 100644 --- a/translations/mirall_fi.ts +++ b/translations/mirall_fi.ts @@ -89,7 +89,7 @@ - + Pause Keskeytä @@ -119,53 +119,58 @@ <b>Huomio:</b> Joillakin kansioilla, mukaan lukien verkon yli liitetyt tai jaetut kansiot, voivat olla erilaisten rajoitusten piirissä. - + Resume Jatka - + Confirm Folder Remove Vahvista kansion poisto - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Haluatko varmasti lopettaa kansion <i>%i</i> synkronoinnin?</p><p><b>Huomio:</b> Tämä valinta ei poista tiedostoja asiakkaalta.</p> - + Confirm Folder Reset Vahvista kansion alustus - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) / %2 palvelimen tilasta käytössä. - + No connection to %1 at <a href="%2">%3</a>. Ei yhteyttä %1iin osoitteessa <a href="%2">%3</a>. - + No %1 connection configured. %1-yhteyttä ei ole määritelty. - + Sync Running Synkronointi meneillään @@ -175,35 +180,35 @@ Tiliä ei ole määritelty. - + The syncing operation is running.<br/>Do you want to terminate it? Synkronointioperaatio on meneillään.<br/>Haluatko keskeyttää sen? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3/%4) %5 jäljellä nopeudella %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1/%2, tiedosto %3/%4 Aikaa jäljellä yhteensä %5 - + Connected to <a href="%1">%2</a>. Muodosta yhteys - <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Yhdistetty kohteeseen <a href="%1">%2</a> käyttäjänä <i>%3</i>. - + Currently there is no storage usage information available. Tallennustilan käyttötietoja ei ole juuri nyt saatavilla. @@ -282,90 +287,90 @@ Aikaa jäljellä yhteensä %5 %1 ei ole luettavissa. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 ja %2 muuta tiedostoa on poistettu. - + %1 has been removed. %1 names a file. %1 on poistettu. - + %1 and %2 other files have been downloaded. %1 names a file. %1 ja %2 muuta tiedostoa on ladattu. - + %1 has been downloaded. %1 names a file. %1 on ladattu. - + %1 and %2 other files have been updated. %1 ja %2 muuta tiedostoa on päivitetty. - + %1 has been updated. %1 names a file. %1 on päivitetty. - + %1 has been renamed to %2 and %3 other files have been renamed. - + %1 has been renamed to %2. %1 and %2 name files. %1 on nimetty uudeelleen muotoon %2. - + %1 has been moved to %2 and %3 other files have been moved. - + %1 has been moved to %2. %1 on siirretty kohteeseen %2. - + Sync Activity Synkronointiaktiviteetti - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? - + Remove All Files? Poistetaanko kaikki tiedostot? - + Remove all files Poista kaikki tiedostot - + Keep files Säilytä tiedostot @@ -383,57 +388,52 @@ Are you sure you want to perform this operation? - + Undefined State. Määrittelemätön tila. - + Waits to start syncing. Odottaa synkronoinnin alkamista. - + Preparing for sync. Valmistellaan synkronointia. - + Sync is running. Synkronointi on meneillään. - - Server is currently not available. - Palvelin ei ole käytettävissä. - - - + Last Sync was successful. Viimeisin synkronointi suoritettiin onnistuneesti. - + Last Sync was successful, but with warnings on individual files. Viimeisin synkronointi onnistui, mutta yksittäisten tiedostojen kanssa ilmeni varoituksia. - + Setup Error. Asetusvirhe. - + User Abort. - + Sync is paused. Synkronointi on keskeytetty. - + %1 (Sync is paused) %1 (Synkronointi on keskeytetty) @@ -1496,27 +1496,27 @@ Osoitteen käyttäminen ei ole suositeltavaa. Asetukset - + %1 %1 - + Activity Toimet - + General Yleiset - + Network Verkko - + Account Tili @@ -1784,229 +1784,229 @@ Osoitteen käyttäminen ei ole suositeltavaa. Mirall::SyncEngine - + Success. Onnistui. - + CSync failed to create a lock file. Csync ei onnistunut luomaan lukitustiedostoa. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. - + CSync failed to write the journal file. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>%1-liitännäistä csyncia varten ei voitu ladata.<br/>Varmista asennuksen toimivuus!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Tämän koneen järjestelmäaika on erilainen verrattuna palvelimen aikaan. Käytä NTP-palvelua kummallakin koneella, jotta kellot pysyvät samassa ajassa. Muuten tiedostojen synkronointi ei toimi. - + CSync could not detect the filesystem type. Csync-synkronointipalvelu ei kyennyt tunnistamaan tiedostojärjestelmän tyyppiä. - + CSync got an error while processing internal trees. Csync-synkronointipalvelussa tapahtui virhe sisäisten puurakenteiden prosessoinnissa. - + CSync failed to reserve memory. CSync ei onnistunut varaamaan muistia. - + CSync fatal parameter error. - + CSync processing step update failed. - + CSync processing step reconcile failed. - + CSync processing step propagate failed. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Kohdekansiota ei ole olemassa.</p><p>Tarkasta synkronointiasetuksesi.</p> - + A remote file can not be written. Please check the remote access. Etätiedostoa ei pystytä kirjoittamaan. Tarkista, että etäpääsy toimii. - + The local filesystem can not be written. Please check permissions. Paikalliseen tiedostojärjestelmään kirjoittaminen epäonnistui. Tarkista kansion oikeudet. - + CSync failed to connect through a proxy. CSync ei onnistunut muodostamaan yhteyttä välityspalvelimen välityksellä. - + CSync could not authenticate at the proxy. - + CSync failed to lookup proxy or server. - + CSync failed to authenticate at the %1 server. - + CSync failed to connect to the network. CSync ei onnistunut yhdistämään verkkoon. - + A network connection timeout happened. Tapahtui verkon aikakatkaisu. - + A HTTP transmission error happened. Tapahtui HTTP-välitysvirhe. - + CSync failed due to not handled permission deniend. - + CSync failed to access - + CSync tried to create a directory that already exists. CSync yritti luoda olemassa olevan kansion. - - + + CSync: No space on %1 server available. CSync: %1-palvelimella ei ole tilaa vapaana. - + CSync unspecified error. CSync - määrittämätön virhe. - + Aborted by the user Keskeytetty käyttäjän toimesta - + An internal error number %1 happened. Ilmeni sisäinen virhe, jonka numero on %1. - + The item is not synced because of previous errors: %1 Kohdetta ei synkronoitu aiempien virheiden vuoksi: %1 - + Symbolic links are not supported in syncing. Symboliset linkit eivät ole tuettuja synkronoinnissa. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory Ei sallittu, koska sinulla ei ole oikeutta lisätä tiedostoja kyseiseen kansioon - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring Poistaminen ei ole sallittua, palautetaan - + Move not allowed, item restored Siirtäminen ei ole sallittua, kohde palautettu - + Move not allowed because %1 is read-only Siirto ei ole sallittu, koska %1 on "vain luku"-tilassa - + the destination kohde - + the source lähde @@ -2022,7 +2022,7 @@ Osoitteen käyttäminen ei ole suositeltavaa. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2135,22 +2135,27 @@ Osoitteen käyttäminen ei ole suositeltavaa. Kohteita ei ole synkronoitu äskettäin - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) Synkronoidaan %1/%2 (%3 jäljellä) - + Syncing %1 (%2 left) Synkronoidaan %1 (%2 jäljellä) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Ajan tasalla @@ -2395,7 +2400,7 @@ Osoitteen käyttäminen ei ole suositeltavaa. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Jos käytössäsi ei ole vielä ownCloud-palvelinta, lue lisätietoja osoitteessa <a href="https://owncloud.com">owncloud.com</a>. @@ -2534,21 +2539,16 @@ Osoitteen käyttäminen ei ole suositeltavaa. - The server is currently unavailable - Palvelin ei ole juuri nyt tavoitettavissa - - - Preparing to sync Valmistaudutaan synkronointiin - + Aborting... Keskeytetään... - + Sync is paused Synkronointi on keskeytetty diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts index 805ec6640d..a43edf43ae 100644 --- a/translations/mirall_fr.ts +++ b/translations/mirall_fr.ts @@ -89,7 +89,7 @@ - + Pause Mettre en pause @@ -119,53 +119,58 @@ <b>Note :</b> Certains fichiers, incluant des dossiers montés depuis le réseau ou des dossiers partagés, peuvent avoir des limites différentes. - + Resume Reprendre - + Confirm Folder Remove Confirmer le retrait du dossier - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Voulez-vous réellement arrêter la synchronisation du dossier <i>%1</i> ?</p><p><b>Note : </b> Cela ne supprimera pas les fichiers sur votre client.</p> - + Confirm Folder Reset Confirmation de la réinitialisation du dossier - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Voulez-vous réellement réinitialiser le dossier <i>%1</i> et reconstruire votre base de données cliente ?</p><p><b>Note :</b> Cette fonctionnalité existe pour des besoins de maintenance uniquement. Aucun fichier ne sera supprimé, mais cela peut causer un trafic de données conséquent et peut durer de plusieurs minutes à plusieurs heures, en fonction de la taille du dossier. Utilisez cette option uniquement sur avis de votre administrateur.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) de %2 d'espace utilisé sur le serveur. - + No connection to %1 at <a href="%2">%3</a>. Aucune connexion à %1 à <a href="%2">%3</a>. - + No %1 connection configured. Aucune connexion à %1 configurée - + Sync Running Synchronisation en cours @@ -175,35 +180,35 @@ Aucun compte configuré. - + The syncing operation is running.<br/>Do you want to terminate it? La synchronisation est en cours.<br/>Voulez-vous y mettre un terme? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 de %4) %5 restant à un débit de %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 de %2, fichier %3 de %4 Temps restant total %5 - + Connected to <a href="%1">%2</a>. Connecté à <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Connecté à <a href="%1">%2</a> en tant que <i>%3</i>. - + Currently there is no storage usage information available. Actuellement aucune information d'utilisation de stockage n'est disponible. @@ -282,73 +287,73 @@ Temps restant total %5 %1 ne peut pas être lu. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 et %2 autres fichiers ont été supprimés. - + %1 has been removed. %1 names a file. %1 a été supprimé. - + %1 and %2 other files have been downloaded. %1 names a file. %1 et %2 autres fichiers ont été téléchargés. - + %1 has been downloaded. %1 names a file. %1 a été téléchargé. - + %1 and %2 other files have been updated. %1 et %2 autres fichiers ont été mis à jour. - + %1 has been updated. %1 names a file. %1 a été mis à jour. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 a été renommé en %2 et %3 autres fichiers ont été renommés. - + %1 has been renamed to %2. %1 and %2 name files. %1 a été renommé en %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 a été déplacé vers %2 et %3 autres fichiers ont été déplacés. - + %1 has been moved to %2. %1 a été déplacé vers %2. - + Sync Activity Activité de synchronisation - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -357,17 +362,17 @@ Cela est peut-être du à une reconfiguration silencieuse du dossier, ou parce q Voulez-vous réellement effectuer cette opération ? - + Remove All Files? Supprimer tous les fichiers ? - + Remove all files Supprimer tous les fichiers - + Keep files Garder les fichiers @@ -385,57 +390,52 @@ Voulez-vous réellement effectuer cette opération ? Une synchronisation antérieure du journal de %1 a été trouvée, mais ne peut être supprimée. Veuillez vous assurer qu’aucune application n'est utilisée en ce moment. - + Undefined State. Statut indéfini. - + Waits to start syncing. En attente de synchronisation. - + Preparing for sync. Préparation de la synchronisation. - + Sync is running. La synchronisation est en cours. - - Server is currently not available. - Le serveur est indisponible actuellement. - - - + Last Sync was successful. Dernière synchronisation effectuée avec succès - + Last Sync was successful, but with warnings on individual files. La dernière synchronisation s'est achevée avec succès mais avec des messages d'avertissement sur des fichiers individuels. - + Setup Error. Erreur d'installation. - + User Abort. Abandon par l'utilisateur. - + Sync is paused. La synchronisation est en pause. - + %1 (Sync is paused) %1 (Synchronisation en pause) @@ -1501,27 +1501,27 @@ Il est déconseillé de l'utiliser. Paramètres - + %1 %1 - + Activity Activité - + General Généraux - + Network Réseau - + Account Compte @@ -1789,229 +1789,229 @@ Il est déconseillé de l'utiliser. Mirall::SyncEngine - + Success. Succès. - + CSync failed to create a lock file. CSync n'a pas pu créer le fichier de verrouillage. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync n’a pu charger ou créer le fichier de journalisation. Veuillez vérifier que vous possédez les droits en lecture/écriture dans le répertoire de synchronisation local. - + CSync failed to write the journal file. CSync n’a pu écrire le fichier de journalisation. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Le plugin %1 pour csync n'a pas pu être chargé.<br/>Merci de vérifier votre installation !</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. L'heure du client est différente de l'heure du serveur. Veuillez utiliser un service de synchronisation du temps (NTP) sur le serveur et le client afin que les horloges soient à la même heure. - + CSync could not detect the filesystem type. CSync n'a pas pu détecter le type de système de fichier. - + CSync got an error while processing internal trees. CSync obtient une erreur pendant le traitement des arbres internes. - + CSync failed to reserve memory. Erreur lors de l'allocation mémoire par CSync. - + CSync fatal parameter error. Erreur fatale CSync : mauvais paramètre. - + CSync processing step update failed. Erreur CSync lors de l'opération de mise à jour - + CSync processing step reconcile failed. Erreur CSync lors de l'opération d'harmonisation - + CSync processing step propagate failed. Erreur CSync lors de l'opération de propagation - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Le répertoire cible n'existe pas.</p><p>Veuillez vérifier la configuration de la synchronisation.</p> - + A remote file can not be written. Please check the remote access. Un fichier distant ne peut être écrit. Veuillez vérifier l’accès distant. - + The local filesystem can not be written. Please check permissions. Le système de fichiers local n'est pas accessible en écriture. Veuillez vérifier les permissions. - + CSync failed to connect through a proxy. CSync n'a pu établir une connexion à travers un proxy. - + CSync could not authenticate at the proxy. CSync ne peut s'authentifier auprès du proxy. - + CSync failed to lookup proxy or server. CSync n'a pu trouver un proxy ou serveur auquel se connecter. - + CSync failed to authenticate at the %1 server. CSync n'a pu s'authentifier auprès du serveur %1. - + CSync failed to connect to the network. CSync n'a pu établir une connexion au réseau. - + A network connection timeout happened. - + A HTTP transmission error happened. Une erreur de transmission HTTP s'est produite. - + CSync failed due to not handled permission deniend. CSync a échoué en raison d'une erreur de permission non prise en charge. - + CSync failed to access Echec de CSync pour accéder - + CSync tried to create a directory that already exists. CSync a tenté de créer un répertoire déjà présent. - - + + CSync: No space on %1 server available. CSync : Aucun espace disponibla sur le serveur %1. - + CSync unspecified error. Erreur CSync inconnue. - + Aborted by the user Abandonné par l'utilisateur - + An internal error number %1 happened. Une erreur interne numéro %1 s'est produite. - + The item is not synced because of previous errors: %1 Cet élément n'a pas été synchronisé en raison des erreurs précédentes : %1 - + Symbolic links are not supported in syncing. Les liens symboliques ne sont pas supportés par la synchronisation. - + File is listed on the ignore list. Le fichier est présent dans la liste de fichiers à ignorer. - + File contains invalid characters that can not be synced cross platform. Le fichier contient des caractères invalides qui ne peuvent être synchronisés entre plate-formes. - + Unable to initialize a sync journal. Impossible d'initialiser un journal de synchronisation. - + Cannot open the sync journal Impossible d'ouvrir le journal de synchronisation - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory Non autorisé parce-que vous n'avez pas la permission d'ajouter des fichiers dans ce dossier - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only Déplacement non autorisé car %1 est en mode lecture seule - + the destination la destination - + the source la source @@ -2027,7 +2027,7 @@ Il est déconseillé de l'utiliser. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2140,22 +2140,27 @@ Il est déconseillé de l'utiliser. Aucun item synchronisé récemment - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) Synchronisation %1 de %2 (%3 restant) - + Syncing %1 (%2 left) Synchronisation %1 (%2 restant) - + %1 (%2, %3) %1 (%2, %3) - + Up to date À jour @@ -2400,7 +2405,7 @@ Il est déconseillé de l'utiliser. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Si vous n'avez pas encore de serveur ownCloud, consultez <a href="https://owncloud.com">owncloud.com</a> pour obtenir plus d'informations. @@ -2539,21 +2544,16 @@ Il est déconseillé de l'utiliser. - The server is currently unavailable - Le serveur est indisponible actuellement. - - - Preparing to sync Préparation à la synchronisation - + Aborting... Annulation... - + Sync is paused La synchronisation est en pause diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts index 09c56ecfdc..543bd643a8 100644 --- a/translations/mirall_gl.ts +++ b/translations/mirall_gl.ts @@ -89,7 +89,7 @@ - + Pause Pausa @@ -119,53 +119,58 @@ <b>Nota:</b> Algúns cartafoles, como os cartafoles de rede montados ou os compartidos, poden ten diferentes límites. - + Resume Continuar - + Confirm Folder Remove Confirmar a eliminación do cartafol - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Confirma que quere deter a sincronización do cartafol <i>%1</i>?</p><p><b>Nota:</b> Isto non retirará os ficheiros no seu cliente.</p> - + Confirm Folder Reset Confirmar o restabelecemento do cartafol - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Confirma que quere restabelecer o cartafol <i>%1</i> e reconstruír as súa base datos no cliente?</p><p><b>Nota:</b> Esta función está deseñada só para fins de mantemento. Non se retirará ningún ficheiro, porén, isto pode xerar un tráfico de datos significativo e levarlle varios minutos ou horas en completarse, dependendo do tamaño do cartafol. Utilice esta opción só se o aconsella o administrador.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. Espazo usado do servidor %1 (%3%) de %2. - + No connection to %1 at <a href="%2">%3</a>. Sen conexión con %1 en <a href="%2">%3</a>. - + No %1 connection configured. Non se configurou a conexión %1. - + Sync Running Sincronización en proceso @@ -175,35 +180,35 @@ Non hai contas configuradas. - + The syncing operation is running.<br/>Do you want to terminate it? Estase realizando a sincronización.<br/>Quere interrompela e rematala? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 de %4) restan %5 a unha taxa de %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 de %2, ficheiro %3 of %4 Tempo total restante %5 - + Connected to <a href="%1">%2</a>. Conectado a <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Conectado a <a href="%1">%2</a> como <i>%3</i>. - + Currently there is no storage usage information available. Actualmente non hai dispoñíbel ningunha información sobre o uso do almacenamento. @@ -282,73 +287,73 @@ Tempo total restante %5 %1 non é lexíbel. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. O ficheiro %1 e outros %2 foron retirados satisfactoriamente. - + %1 has been removed. %1 names a file. %1 foi retirado satisfactoriamente. - + %1 and %2 other files have been downloaded. %1 names a file. O ficheiro %1 e outros %2 foron descargados satisfactoriamente. - + %1 has been downloaded. %1 names a file. %1 foi descargado satisfactoriamente. - + %1 and %2 other files have been updated. O ficheiro %1 e outros %2 foron enviados satisfactoriamente. - + %1 has been updated. %1 names a file. %1 foi enviado satisfactoriamente. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 foi renomeado satisfactoriamente a %2 e outros %3 tamén foron renomeados satisfactoriamente. - + %1 has been renamed to %2. %1 and %2 name files. %1 foi renomeado satisfactoriamente a %2 - + %1 has been moved to %2 and %3 other files have been moved. %1 foi movido satisfactoriamente a %2 e outros %3 tamén foron movidos satisfactoriamente. - + %1 has been moved to %2. %1 foi movido satisfactoriamente a %2 - + Sync Activity Actividade de sincronización - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -357,17 +362,17 @@ Isto podería ser debido a que o cartafol foi reconfigurado en silencio, ou a qu Confirma que quere realizar esta operación? - + Remove All Files? Retirar todos os ficheiros? - + Remove all files Retirar todos os ficheiros - + Keep files Manter os ficheiros @@ -385,57 +390,52 @@ Confirma que quere realizar esta operación? Atopouse un rexistro de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningunha aplicación. - + Undefined State. Estado sen definir. - + Waits to start syncing. Agardando polo comezo da sincronización. - + Preparing for sync. Preparando para sincronizar. - + Sync is running. Estase sincronizando. - - Server is currently not available. - O servidor non está dispoñíbel actualmente. - - - + Last Sync was successful. A última sincronización fíxose correctamente. - + Last Sync was successful, but with warnings on individual files. A última sincronización fíxose correctamente, mais con algún aviso en ficheiros individuais. - + Setup Error. Erro de configuración. - + User Abort. Interrompido polo usuario. - + Sync is paused. Sincronización en pausa. - + %1 (Sync is paused) %1 (sincronización en pausa) @@ -1501,27 +1501,27 @@ Tente sincronizalos de novo. Axustes - + %1 %1 - + Activity Actividade - + General Xeral - + Network Rede - + Account Conta @@ -1789,229 +1789,229 @@ Tente sincronizalos de novo. Mirall::SyncEngine - + Success. Correcto. - + CSync failed to create a lock file. Produciuse un fallo en CSync ao crear un ficheiro de bloqueo. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. Produciuse un fallo do Csync ao cargar ou crear o ficheiro de rexistro. Asegúrese de que ten permisos de lectura e escritura no directorio de sincronización local. - + CSync failed to write the journal file. Produciuse un fallo en CSync ao escribir o ficheiro de rexistro. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Non foi posíbel cargar o engadido %1 para CSync.<br/>Verifique a instalación!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. A diferenza de tempo neste cliente e diferente do tempo do sistema no servidor. Use o servido de sincronización de tempo (NTP) no servidor e nas máquinas cliente para que os tempos se manteñan iguais. - + CSync could not detect the filesystem type. CSync non pode detectar o tipo de sistema de ficheiros. - + CSync got an error while processing internal trees. CSync tivo un erro ao procesar árbores internas. - + CSync failed to reserve memory. Produciuse un fallo ao reservar memoria para CSync. - + CSync fatal parameter error. Produciuse un erro fatal de parámetro CSync. - + CSync processing step update failed. Produciuse un fallo ao procesar o paso de actualización de CSync. - + CSync processing step reconcile failed. Produciuse un fallo ao procesar o paso de reconciliación de CSync. - + CSync processing step propagate failed. Produciuse un fallo ao procesar o paso de propagación de CSync. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Non existe o directorio de destino.</p><p>Comprobe a configuración da sincronización.</p> - + A remote file can not be written. Please check the remote access. Non é posíbel escribir un ficheiro remoto. Comprobe o acceso remoto. - + The local filesystem can not be written. Please check permissions. Non é posíbel escribir no sistema de ficheiros local. Comprobe os permisos. - + CSync failed to connect through a proxy. CSYNC no puido conectarse a través dun proxy. - + CSync could not authenticate at the proxy. CSync non puido autenticarse no proxy. - + CSync failed to lookup proxy or server. CSYNC no puido atopar o servidor proxy. - + CSync failed to authenticate at the %1 server. CSync non puido autenticarse no servidor %1. - + CSync failed to connect to the network. CSYNC no puido conectarse á rede. - + A network connection timeout happened. Excedeuse do tempo de espera para a conexión á rede. - + A HTTP transmission error happened. Produciuse un erro na transmisión HTTP. - + CSync failed due to not handled permission deniend. Produciuse un fallo en CSync por mor dun permiso denegado. - + CSync failed to access Produciuse un fallo ao acceder a CSync - + CSync tried to create a directory that already exists. CSYNC tenta crear un directorio que xa existe. - - + + CSync: No space on %1 server available. CSync: Non hai espazo dispoñíbel no servidor %1. - + CSync unspecified error. Produciuse un erro non especificado de CSync - + Aborted by the user Interrompido polo usuario - + An internal error number %1 happened. Produciuse un erro interno número %1 - + The item is not synced because of previous errors: %1 Este elemento non foi sincronizado por mor de erros anteriores: %1 - + Symbolic links are not supported in syncing. As ligazóns simbolicas non son admitidas nas sincronizacións - + File is listed on the ignore list. O ficheiro está na lista de ignorados. - + File contains invalid characters that can not be synced cross platform. O ficheiro conten caracteres incorrectos que non poden sincronizarse entre distintas plataformas. - + Unable to initialize a sync journal. Non é posíbel iniciar un rexistro de sincronización. - + Cannot open the sync journal Non foi posíbel abrir o rexistro de sincronización - + Not allowed because you don't have permission to add sub-directories in that directory Non está permitido xa que non ten permiso para engadir subdirectorios nese directorio - + Not allowed because you don't have permission to add parent directory Non está permitido xa que non ten permiso para engadir un directorio pai - + Not allowed because you don't have permission to add files in that directory Non está permitido xa que non ten permiso para engadir ficheiros nese directorio - + Not allowed to upload this file because it is read-only on the server, restoring Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando - - + + Not allowed to remove, restoring Non está permitido retiralo, restaurando - + Move not allowed, item restored Nos está permitido movelo, elemento restaurado - + Move not allowed because %1 is read-only Bon está permitido movelo xa que %1 é só de lectura - + the destination o destino - + the source a orixe @@ -2027,7 +2027,7 @@ Tente sincronizalos de novo. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2140,22 +2140,27 @@ Tente sincronizalos de novo. Non hai elementos sincronizados recentemente - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) Sincronizando %1 of %2 (restan %3) - + Syncing %1 (%2 left) Sincronizando %1 (restan %2) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Actualizado @@ -2400,7 +2405,7 @@ Tente sincronizalos de novo. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Se aínda non ten un servidor ownCloud, vexa <a href="https://owncloud.com">owncloud.com</a> para obter máis información. @@ -2539,21 +2544,16 @@ Tente sincronizalos de novo. - The server is currently unavailable - O servidor non está dispoñíbel actualmente - - - Preparing to sync Preparando para sincronizar - + Aborting... Interrompendo - + Sync is paused Sincronización en pausa diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts index 380bf30d00..3cc66f38dc 100644 --- a/translations/mirall_hu.ts +++ b/translations/mirall_hu.ts @@ -89,7 +89,7 @@ - + Pause Szünet @@ -119,53 +119,58 @@ - + Resume Folytatás - + Confirm Folder Remove Könyvtár törlésének megerősítése - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> - + Confirm Folder Reset - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. - + Sync Running Szinkronizálás fut @@ -175,34 +180,34 @@ Nincs beállított kapcsolat. - + The syncing operation is running.<br/>Do you want to terminate it? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. @@ -281,90 +286,90 @@ Total time left %5 %1 nem olvasható. - + %1: %2 - + %1 and %2 other files have been removed. %1 names a file. - + %1 has been removed. %1 names a file. - + %1 and %2 other files have been downloaded. %1 names a file. - + %1 has been downloaded. %1 names a file. - + %1 and %2 other files have been updated. - + %1 has been updated. %1 names a file. - + %1 has been renamed to %2 and %3 other files have been renamed. - + %1 has been renamed to %2. %1 and %2 name files. - + %1 has been moved to %2 and %3 other files have been moved. - + %1 has been moved to %2. - + Sync Activity - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? - + Remove All Files? El legyen távolítva az összes fájl? - + Remove all files Összes fájl eltávolítása - + Keep files Fájlok megtartása @@ -382,57 +387,52 @@ Are you sure you want to perform this operation? - + Undefined State. Ismeretlen állapot. - + Waits to start syncing. Várakozás a szinkronizálás elindítására. - + Preparing for sync. Előkészítés szinkronizációhoz. - + Sync is running. Szinkronizálás fut. - - Server is currently not available. - A kiszolgáló jelenleg nem érhető el. - - - + Last Sync was successful. Legutolsó szinkronizálás sikeres volt. - + Last Sync was successful, but with warnings on individual files. - + Setup Error. Beállítás hiba. - + User Abort. - + Sync is paused. Szinkronizálás megállítva. - + %1 (Sync is paused) @@ -1493,27 +1493,27 @@ It is not advisable to use it. Beállítások - + %1 %1 - + Activity Tevékenységek - + General Általános - + Network Hálózat - + Account Fiók @@ -1779,229 +1779,229 @@ It is not advisable to use it. Mirall::SyncEngine - + Success. Sikerült. - + CSync failed to create a lock file. A CSync nem tudott létrehozni lock fájlt. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. - + CSync failed to write the journal file. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Az %1 beépülőmodul a csync-hez nem tölthető be.<br/>Ellenőrizze a telepítést!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. A helyi rendszeridő különbözik a kiszolgáló rendszeridejétől. Használjon időszinkronizációs szolgáltatást (NTP) a rendszerén és a szerveren is, hogy az idő mindig megeggyezzen. - + CSync could not detect the filesystem type. A CSync nem tudta megállapítani a fájlrendszer típusát. - + CSync got an error while processing internal trees. A CSync hibába ütközött a belső adatok feldolgozása közben. - + CSync failed to reserve memory. Hiba a CSync memórifoglalásakor. - + CSync fatal parameter error. CSync hibás paraméterhiba. - + CSync processing step update failed. CSync frissítés feldolgozása meghíusult. - + CSync processing step reconcile failed. CSync egyeztetési lépés meghíusult. - + CSync processing step propagate failed. CSync propagálási lépés meghíusult. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>A célmappa nem létezik.</p><p>Ellenőrizze a sync beállításait.</p> - + A remote file can not be written. Please check the remote access. Egy távoli fájl nem írható. Kérlek, ellenőrizd a távoli elérést. - + The local filesystem can not be written. Please check permissions. A helyi fájlrendszer nem írható. Kérlek, ellenőrizd az engedélyeket. - + CSync failed to connect through a proxy. CSync proxy kapcsolódási hiba. - + CSync could not authenticate at the proxy. - + CSync failed to lookup proxy or server. A CSync nem találja a proxy kiszolgálót. - + CSync failed to authenticate at the %1 server. A CSync nem tuja azonosítani magát a %1 kiszolgálón. - + CSync failed to connect to the network. CSync hálózati kapcsolódási hiba. - + A network connection timeout happened. - + A HTTP transmission error happened. HTTP átviteli hiba történt. - + CSync failed due to not handled permission deniend. CSync hiba, nincs kezelési jogosultság. - + CSync failed to access - + CSync tried to create a directory that already exists. A CSync megpróbált létrehozni egy már létező mappát. - - + + CSync: No space on %1 server available. CSync: Nincs szabad tárhely az %1 kiszolgálón. - + CSync unspecified error. CSync ismeretlen hiba. - + Aborted by the user - + An internal error number %1 happened. - + The item is not synced because of previous errors: %1 - + Symbolic links are not supported in syncing. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2017,7 +2017,7 @@ It is not advisable to use it. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2130,22 +2130,27 @@ It is not advisable to use it. - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date Frissítve @@ -2390,7 +2395,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! @@ -2529,21 +2534,16 @@ It is not advisable to use it. - The server is currently unavailable - - - - Preparing to sync - + Aborting... - + Sync is paused diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts index 376348c28a..9cc69e7e3c 100644 --- a/translations/mirall_it.ts +++ b/translations/mirall_it.ts @@ -89,7 +89,7 @@ - + Pause Pausa @@ -119,53 +119,58 @@ <b>Nota:</b> alcune cartelle, incluse le cartelle montate o condivise in rete, potrebbero avere limiti diversi. - + Resume Riprendi - + Confirm Folder Remove Conferma la rimozione della cartella - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Vuoi davvero fermare la sincronizzazione della cartella <i>%1</i>?</p><p><b>Nota:</b> ciò non rimuoverà i file dal tuo client.</p> - + Confirm Folder Reset Conferma il ripristino della cartella - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Vuoi davvero ripristinare la cartella <i>%1</i> e ricostruire il database del client?</p><p><b>Nota:</b> questa funzione è destinata solo a scopi di manutenzione. Nessun file sarà rimosso, ma può causare un significativo traffico di dati e richiedere diversi minuti oppure ore, in base alla dimensione della cartella. Utilizza questa funzione solo se consigliata dal tuo amministratore.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) di %2 spazio in uso sul server. - + No connection to %1 at <a href="%2">%3</a>. Nessuna connessione a %1 su <a href="%2">%3</a>. - + No %1 connection configured. Nessuna connessione di %1 configurata. - + Sync Running La sincronizzazione è in corso @@ -175,35 +180,35 @@ Nessun account configurato. - + The syncing operation is running.<br/>Do you want to terminate it? L'operazione di sincronizzazione è in corso.<br/>Vuoi terminarla? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 di %4). %5 rimanenti a una velocità di %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 di %2, file %3 di %4 Totale tempo rimanente %5 - + Connected to <a href="%1">%2</a>. Connesso a <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Connesso a <a href="%1">%2</a> come <i>%3</i>. - + Currently there is no storage usage information available. Non ci sono informazioni disponibili sull'utilizzo dello spazio di archiviazione. @@ -282,73 +287,73 @@ Totale tempo rimanente %5 %1 non è leggibile. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 e %2 altri file sono stati rimossi. - + %1 has been removed. %1 names a file. %1 è stato rimosso. - + %1 and %2 other files have been downloaded. %1 names a file. %1 e %2 altri file sono stati scaricati. - + %1 has been downloaded. %1 names a file. %1 è stato scaricato. - + %1 and %2 other files have been updated. %1 e %2 altri file sono stati aggiornati. - + %1 has been updated. %1 names a file. %1 è stato aggiornato. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 è stato rinominato in %2 e %3 altri file sono stati rinominati. - + %1 has been renamed to %2. %1 and %2 name files. %1 è stato rinominato in %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 è stato spostato in %2 e %3 altri file sono stati spostati. - + %1 has been moved to %2. %1 è stato spostato in %2. - + Sync Activity Sincronizza attività - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -357,17 +362,17 @@ Ciò potrebbe accadere in caso di riconfigurazione della cartella o di rimozione Sei sicuro di voler eseguire questa operazione? - + Remove All Files? Vuoi rimuovere tutti i file? - + Remove all files Rimuovi tutti i file - + Keep files Mantieni i file @@ -385,57 +390,52 @@ Sei sicuro di voler eseguire questa operazione? È stato trovato un vecchio registro di sincronizzazione '%1', ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando. - + Undefined State. Stato non definito. - + Waits to start syncing. Attende l'inizio della sincronizzazione. - + Preparing for sync. Preparazione della sincronizzazione. - + Sync is running. La sincronizzazione è in corso. - - Server is currently not available. - Il server è attualmente non disponibile. - - - + Last Sync was successful. L'ultima sincronizzazione è stato completata correttamente. - + Last Sync was successful, but with warnings on individual files. Ultima sincronizzazione avvenuta, ma con avvisi relativi a singoli file. - + Setup Error. Errore di configurazione. - + User Abort. Interrotto dall'utente. - + Sync is paused. La sincronizzazione è sospesa. - + %1 (Sync is paused) %1 (La sincronizzazione è sospesa) @@ -1217,7 +1217,7 @@ Non è consigliabile utilizzarlo. Skip folders configuration - + Salta la configurazione delle cartelle @@ -1500,27 +1500,27 @@ Prova a sincronizzare nuovamente. Impostazioni - + %1 %1 - + Activity Attività - + General Generale - + Network Rete - + Account Account @@ -1788,229 +1788,229 @@ Prova a sincronizzare nuovamente. Mirall::SyncEngine - + Success. Successo. - + CSync failed to create a lock file. CSync non è riuscito a creare il file di lock. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync non è riuscito a caricare o a creare il file di registro. Assicurati di avere i permessi di lettura e scrittura nella cartella di sincronizzazione locale. - + CSync failed to write the journal file. CSync non è riuscito a scrivere il file di registro. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Il plugin %1 per csync non può essere caricato.<br/>Verifica l'installazione!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. L'ora di sistema su questo client è diversa dall'ora di sistema del server. Usa un servizio di sincronizzazione dell'orario (NTP) sul server e sulle macchine client in modo che l'ora sia la stessa. - + CSync could not detect the filesystem type. CSync non è riuscito a individuare il tipo di filesystem. - + CSync got an error while processing internal trees. Errore di CSync durante l'elaborazione degli alberi interni. - + CSync failed to reserve memory. CSync non è riuscito a riservare la memoria. - + CSync fatal parameter error. Errore grave di parametro di CSync. - + CSync processing step update failed. La fase di aggiornamento di CSync non è riuscita. - + CSync processing step reconcile failed. La fase di riconciliazione di CSync non è riuscita. - + CSync processing step propagate failed. La fase di propagazione di CSync non è riuscita. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>La cartella di destinazione non esiste.</p><p>Controlla la configurazione della sincronizzazione.</p> - + A remote file can not be written. Please check the remote access. Un file remoto non può essere scritto. Controlla l'accesso remoto. - + The local filesystem can not be written. Please check permissions. Il filesystem locale non può essere scritto. Controlla i permessi. - + CSync failed to connect through a proxy. CSync non è riuscito a connettersi tramite un proxy. - + CSync could not authenticate at the proxy. CSync non è in grado di autenticarsi al proxy. - + CSync failed to lookup proxy or server. CSync non è riuscito a trovare un proxy o server. - + CSync failed to authenticate at the %1 server. CSync non è riuscito ad autenticarsi al server %1. - + CSync failed to connect to the network. CSync non è riuscito a connettersi alla rete. - + A network connection timeout happened. Si è verificato un timeout della connessione di rete. - + A HTTP transmission error happened. Si è verificato un errore di trasmissione HTTP. - + CSync failed due to not handled permission deniend. Problema di CSync dovuto alla mancata gestione dei permessi. - + CSync failed to access CSync non è riuscito ad accedere - + CSync tried to create a directory that already exists. CSync ha cercato di creare una cartella già esistente. - - + + CSync: No space on %1 server available. CSync: spazio insufficiente sul server %1. - + CSync unspecified error. Errore non specificato di CSync. - + Aborted by the user Interrotto dall'utente - + An internal error number %1 happened. SI è verificato un errore interno numero %1. - + The item is not synced because of previous errors: %1 L'elemento non è sincronizzato a causa dell'errore precedente: %1 - + Symbolic links are not supported in syncing. I collegamenti simbolici non sono supportati dalla sincronizzazione. - + File is listed on the ignore list. Il file è stato aggiunto alla lista ignorati. - + File contains invalid characters that can not be synced cross platform. Il file contiene caratteri non validi che non possono essere sincronizzati su diverse piattaforme. - + Unable to initialize a sync journal. Impossibile inizializzare il registro di sincronizzazione. - + Cannot open the sync journal Impossibile aprire il registro di sincronizzazione - + Not allowed because you don't have permission to add sub-directories in that directory Non consentito poiché non disponi dei permessi per aggiungere sottocartelle in quella cartella - + Not allowed because you don't have permission to add parent directory Non consentito poiché non disponi dei permessi per aggiungere la cartella superiore - + Not allowed because you don't have permission to add files in that directory Non consentito poiché non disponi dei permessi per aggiungere file in quella cartella - + Not allowed to upload this file because it is read-only on the server, restoring Il caricamento di questo file non è consentito poiché è in sola lettura sul server, ripristino - - + + Not allowed to remove, restoring Rimozione non consentita, ripristino - + Move not allowed, item restored Spostamento non consentito, elemento ripristinato - + Move not allowed because %1 is read-only Spostamento non consentito poiché %1 è in sola lettura - + the destination la destinazione - + the source l'origine @@ -2026,9 +2026,9 @@ Prova a sincronizzare nuovamente. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - + <p>Versione %1 Per ulteriori informazioni, visita <a href='%2'>%3</a>. </p><p>Copyright ownCloud, Inc.<p><p>Distribuito da %4 e sotto licenza GNU General Public License (GPL) versione 2.0.<br>%5 e il logo di %5 sono marchi registrati di %4 negli Stati Uniti, in altri paesi, o entrambi.</p> @@ -2139,22 +2139,27 @@ Prova a sincronizzare nuovamente. Nessun elemento sincronizzato di recente - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) Sincronizzazione di %1 di %2 (%3 rimanenti) - + Syncing %1 (%2 left) Sincronizzazione di %1 (%2 rimanenti) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Aggiornato @@ -2399,7 +2404,7 @@ Prova a sincronizzare nuovamente. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Se non hai ancora un server ownCloud, visita <a href="https://owncloud.com">owncloud.com</a> per ulteriori informazioni. @@ -2415,7 +2420,7 @@ Prova a sincronizzare nuovamente. <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 - + <p>Versione %2. Per ulteriori informazioni, visita <a href='%3'>%4</a></p><p><small>Di Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz e altri.<br>Basato su Mirall di Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.<p><p>Sotto licenza GNU General Public License (GPL) versione 2.0<br>ownCloud e il logo di ownCloud sono marchi registrati di ownCloud, Inc. negli Stati Uniti, in altri paesi, o entrambi</p>%7 @@ -2538,21 +2543,16 @@ Prova a sincronizzare nuovamente. - The server is currently unavailable - Il server è attualmente non disponibile. - - - Preparing to sync Preparazione della sincronizzazione - + Aborting... Interruzione in corso... - + Sync is paused La sincronizzazione è sospesa diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts index f33e7c504d..d545e031c5 100644 --- a/translations/mirall_ja.ts +++ b/translations/mirall_ja.ts @@ -89,7 +89,7 @@ - + Pause 一時停止 @@ -119,53 +119,58 @@ <b>注:</b> 外部ネットワークストレージや共有フォルダーを含むフォルダーの場合は、容量の上限値が異なる可能性があります。 - + Resume 再開 - + Confirm Folder Remove フォルダーの削除を確認 - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>フォルダー<i>%1</i>の同期を本当に止めますか？</p><p><b>注:</b> これによりクライアントからファイルが削除されることはありません。</p> - + Confirm Folder Reset フォルダーのリセットを確認 - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>本当にフォルダー <i>%1</i> をリセットしてクライアントのデータベースを再構築しますか?</p><p><b>注意:</b>この機能は保守目的のためだけにデザインされています。ファイルは削除されませんが、完了するまでにデータ通信が明らかに増大し、数分、あるいはフォルダーのサイズによっては数時間かかります。このオプションは管理者に指示された場合にのみ使用してください。 - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) / %2 使用中のサーバー領域 - + No connection to %1 at <a href="%2">%3</a>. <a href="%2">%3</a> に %1 への接続がありません。 - + No %1 connection configured. %1 の接続は設定されていません。 - + Sync Running 同期を実行中 @@ -175,35 +180,35 @@ アカウントが未設定です。 - + The syncing operation is running.<br/>Do you want to terminate it? 同期作業を実行中です。<br/>終了しますか？ - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%4 中 %3) 残り時間 %5 利用帯域 %6/s - + %1 of %2, file %3 of %4 Total time left %5 %2 のうち %1 , ファイル %4 のうち %3 残り時間 %5 - + Connected to <a href="%1">%2</a>. <a href="%1">%2</a> へ接続しました。 - + Connected to <a href="%1">%2</a> as <i>%3</i>. <a href="%1">%2</a> に <i>%3</i> として接続 - + Currently there is no storage usage information available. 現在、利用できるストレージ利用状況はありません。 @@ -282,73 +287,73 @@ Total time left %5 %1 は読み込み可能ではありません。 - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 と他 %2 個のファイルが削除されました。 - + %1 has been removed. %1 names a file. %1 は削除されました。 - + %1 and %2 other files have been downloaded. %1 names a file. %1 と他 %2 個のファイルがダウンロードされました。 - + %1 has been downloaded. %1 names a file. %1 はダウンロードされました。 - + %1 and %2 other files have been updated. %1 と他 %2 個のファイルが更新されました。 - + %1 has been updated. %1 names a file. %1 が更新されました。 - + %1 has been renamed to %2 and %3 other files have been renamed. %1 の名前が %2 に変更され、他 %3 個のファイルの名前が変更されました。 - + %1 has been renamed to %2. %1 and %2 name files. %1 の名前が %2 に変更されました。 - + %1 has been moved to %2 and %3 other files have been moved. %1 が %2 に移され、他 %3 個のファイルが移されました。 - + %1 has been moved to %2. %1 は %2 に移されました。 - + Sync Activity 同期アクティビティ - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -357,17 +362,17 @@ Are you sure you want to perform this operation? 本当にこの操作を実行しますか？ - + Remove All Files? すべてのファイルを削除しますか？ - + Remove all files すべてのファイルを削除 - + Keep files ファイルを残す @@ -385,57 +390,52 @@ Are you sure you want to perform this operation? 古い同期ジャーナル '%1' が見つかりましたが、削除できませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。 - + Undefined State. 未定義の状態。 - + Waits to start syncing. 同期開始を待機中 - + Preparing for sync. 同期の準備中。 - + Sync is running. 同期を実行中です。 - - Server is currently not available. - サーバーは現在利用できません。 - - - + Last Sync was successful. 最後の同期は成功しました。 - + Last Sync was successful, but with warnings on individual files. 最新の同期は成功しました。しかし、いくつかのファイルで問題がありました。 - + Setup Error. 設定エラー。 - + User Abort. ユーザーによる中止。 - + Sync is paused. 同期を一時停止しました。 - + %1 (Sync is paused) %1 (同期を一時停止) @@ -1499,27 +1499,27 @@ It is not advisable to use it. 設定 - + %1 %1 - + Activity アクティビティ - + General 一般 - + Network ネットワーク - + Account アカウント @@ -1787,229 +1787,229 @@ It is not advisable to use it. Mirall::SyncEngine - + Success. 成功。 - + CSync failed to create a lock file. CSyncがロックファイルの作成に失敗しました。 - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSyncはジャーナルファイルの読み込みや作成に失敗しました。ローカルの同期ディレクトリに読み書きの権限があるか確認してください。 - + CSync failed to write the journal file. CSyncはジャーナルファイルの書き込みに失敗しました。 - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>csync 用の %1 プラグインをロードできませんでした。<br/>インストール状態を確認してください！</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. このクライアントのシステム時刻はサーバーのシステム時刻と異なります。時刻が同じになるように、クライアントとサーバーの両方で時刻同期サービス(NTP)を実行してください。 - + CSync could not detect the filesystem type. CSyncはファイルシステムタイプを検出できませんでした。 - + CSync got an error while processing internal trees. CSyncは内部ツリーの処理中にエラーに遭遇しました。 - + CSync failed to reserve memory. CSyncで使用するメモリの確保に失敗しました。 - + CSync fatal parameter error. CSyncの致命的なパラメータエラーです。 - + CSync processing step update failed. CSyncの処理ステップの更新に失敗しました。 - + CSync processing step reconcile failed. CSyncの処理ステップの調停に失敗しました。 - + CSync processing step propagate failed. CSyncの処理ステップの伝播に失敗しました。 - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>ターゲットディレクトリは存在しません。</p><p>同期設定を確認してください。</p> - + A remote file can not be written. Please check the remote access. リモートファイルは書き込みできません。リモートアクセスをチェックしてください。 - + The local filesystem can not be written. Please check permissions. ローカルファイルシステムは書き込みができません。パーミッションをチェックしてください。 - + CSync failed to connect through a proxy. CSyncがプロキシ経由での接続に失敗しました。 - + CSync could not authenticate at the proxy. CSyncはそのプロキシで認証できませんでした。 - + CSync failed to lookup proxy or server. CSyncはプロキシもしくはサーバーの参照に失敗しました。 - + CSync failed to authenticate at the %1 server. CSyncは %1 サーバーでの認証に失敗しました。 - + CSync failed to connect to the network. CSyncはネットワークへの接続に失敗しました。 - + A network connection timeout happened. ネットワーク接続のタイムアウトが発生しました。 - + A HTTP transmission error happened. HTTPの伝送エラーが発生しました。 - + CSync failed due to not handled permission deniend. CSyncは対応できないパーミッション拒否が原因で失敗しました。 - + CSync failed to access CSync はアクセスに失敗しました - + CSync tried to create a directory that already exists. CSyncはすでに存在するディレクトリを作成しようとしました。 - - + + CSync: No space on %1 server available. CSync: %1 サーバーには利用可能な空き領域がありません。 - + CSync unspecified error. CSyncの未指定のエラーです。 - + Aborted by the user ユーザーによって中止されました - + An internal error number %1 happened. 内部エラー番号 %1 が発生しました。 - + The item is not synced because of previous errors: %1 このアイテムは、以前にエラーが発生していたため同期させません: %1 - + Symbolic links are not supported in syncing. 同期の際にシンボリックリンクはサポートしていません - + File is listed on the ignore list. ファイルは除外リストに登録されています。 - + File contains invalid characters that can not be synced cross platform. ファイルに無効な文字が含まれているため、クロスプラットフォーム環境での同期ができません。 - + Unable to initialize a sync journal. 同期ジャーナルの初期化ができません。 - + Cannot open the sync journal 同期ジャーナルを開くことができません - + Not allowed because you don't have permission to add sub-directories in that directory そのディレクトリにサブディレクトリを追加する権限がありません - + Not allowed because you don't have permission to add parent directory 親ディレクトリを追加する権限がありません - + Not allowed because you don't have permission to add files in that directory そのディレクトリにファイルを追加する権限がありません - + Not allowed to upload this file because it is read-only on the server, restoring サーバーでは読み取り専用となっているため、このファイルをアップロードすることはできません、復元しています - - + + Not allowed to remove, restoring 削除できません、復元しています - + Move not allowed, item restored 移動できません、項目を復元しました - + Move not allowed because %1 is read-only %1 は読み取り専用のため移動できません - + the destination 移動先 - + the source 移動元 @@ -2025,7 +2025,7 @@ It is not advisable to use it. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2138,22 +2138,27 @@ It is not advisable to use it. 最近同期されたアイテムはありません。 - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) 同期中 %2 中 %1 (残り %3) - + Syncing %1 (%2 left) 同期中 %1 (残り %2) - + %1 (%2, %3) %1 (%2, %3) - + Up to date 最新です @@ -2398,7 +2403,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! ownCloudサーバーをまだ所有していない場合は、<a href="https://owncloud.com">owncloud.com</a>で詳細を参照してください。 @@ -2537,21 +2542,16 @@ It is not advisable to use it. - The server is currently unavailable - サーバーは現在利用できません - - - Preparing to sync 同期の準備中 - + Aborting... 中止しています... - + Sync is paused 同期を一時停止 diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts index 5dd11203c8..ac13b3b2a7 100644 --- a/translations/mirall_nl.ts +++ b/translations/mirall_nl.ts @@ -89,7 +89,7 @@ - + Pause Pauze @@ -119,53 +119,58 @@ <b>Opmerking:</b> Sommige mappen, waaronder netwerkmappen en gedeelde mappen, kunnen andere limieten hebben. - + Resume Hervatten - + Confirm Folder Remove Bevestig het verwijderen van de map - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Weet u zeker dat u de synchronisatie van de map <i>%1</i> wilt stoppen?</p><p><b>Opmerking:</b> Dit zal de bestanden niet van uw computer verwijderen.</p> - + Confirm Folder Reset Bevestig map reset - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Wilt u de map <i>%1</i> echt resetten en de database opnieuw opbouwen?</p><p><b>Let op:</b> Deze functie is alleen ontworpen voor onderhoudsdoeleinden. Hoewel er geen bestanden worden verwijderd, kan dit een aanzienlijke hoeveelheid dataverkeer tot gevolg hebben en minuten tot zelfs uren duren, afhankelijk van de omvang van de map. Gebruik deze functie alleen als dit wordt geadviseerd door uw applicatiebeheerder.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) van %2 serverruimte in gebruik. - + No connection to %1 at <a href="%2">%3</a>. Geen verbinding naar %1 op <a href="%2">%3</a>. - + No %1 connection configured. Geen %1 connectie geconfigureerd. - + Sync Running Bezig met synchroniseren @@ -175,35 +180,35 @@ Geen account ingesteld. - + The syncing operation is running.<br/>Do you want to terminate it? Bezig met synchroniseren.<br/>Wil je stoppen met synchroniseren? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 of %4) %5 over bij een snelheid van %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 van %2, file %3 van %4 Totaal resterende tijd %5 - + Connected to <a href="%1">%2</a>. Verbonden met <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Verbonden met <a href="%1">%2</a> als <i>%3</i>. - + Currently there is no storage usage information available. Er is nu geen informatie over het gebruik van de opslagruimte beschikbaar. @@ -282,73 +287,73 @@ Totaal resterende tijd %5 %1 is niet leesbaar. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 en %2 andere bestanden zijn verwijderd. - + %1 has been removed. %1 names a file. %1 is verwijderd. - + %1 and %2 other files have been downloaded. %1 names a file. %1 en %2 andere bestanden zijn gedownloaded. - + %1 has been downloaded. %1 names a file. %1 is gedownloaded. - + %1 and %2 other files have been updated. %1 en %2 andere bestanden zijn bijgewerkt. - + %1 has been updated. %1 names a file. %1 is bijgewerkt. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 is hernoemd naar %2 en %3 andere bestanden zijn ook hernoemd. - + %1 has been renamed to %2. %1 and %2 name files. %1 is hernoemd naar %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 is verplaatst naar %2 en %3 andere bestanden zijn ook verplaatst. - + %1 has been moved to %2. %1 is verplaatst naar %2. - + Sync Activity Synchronisatie-activiteit - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -357,17 +362,17 @@ Dit kan komen doordat de map ongemerkt gereconfigureerd is of doordat alle besta Weet u zeker dat u deze bewerking wilt uitvoeren? - + Remove All Files? Verwijder alle bestanden? - + Remove all files Verwijder alle bestanden - + Keep files Bewaar bestanden @@ -385,57 +390,52 @@ Weet u zeker dat u deze bewerking wilt uitvoeren? Een oud synchronisatieverslag '%1' is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt. - + Undefined State. Ongedefiniëerde staat - + Waits to start syncing. In afwachting van synchronisatie. - + Preparing for sync. Synchronisatie wordt voorbereid - + Sync is running. Bezig met synchroniseren. - - Server is currently not available. - De server is nu niet beschikbaar. - - - + Last Sync was successful. Laatste synchronisatie was succesvol. - + Last Sync was successful, but with warnings on individual files. Laatste synchronisatie geslaagd, maar met waarschuwingen over individuele bestanden. - + Setup Error. Installatiefout. - + User Abort. Afgebroken door gebruiker. - + Sync is paused. Synchronisatie gepauzeerd. - + %1 (Sync is paused) %1 (Synchronisatie onderbroken) @@ -1501,27 +1501,27 @@ Probeer opnieuw te synchroniseren. Instellingen - + %1 %1 - + Activity Activiteit - + General Algemeen - + Network Netwerk - + Account Account @@ -1789,229 +1789,229 @@ Probeer opnieuw te synchroniseren. Mirall::SyncEngine - + Success. Succes. - + CSync failed to create a lock file. CSync kon geen lock file maken. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync kon het journal bestand niet maken of lezen. Controleer of u de juiste lees- en schrijfrechten in de lokale syncmap hebt. - + CSync failed to write the journal file. CSync kon het journal bestand niet wegschrijven. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>De %1 plugin voor csync kon niet worden geladen.<br/>Verifieer de installatie!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. De systeemtijd van deze client wijkt af van de systeemtijd op de server. Gebruik een tijdsynchronisatieservice (NTP) op zowel de server als de client, zodat de machines dezelfde systeemtijd hebben. - + CSync could not detect the filesystem type. CSync kon het soort bestandssysteem niet bepalen. - + CSync got an error while processing internal trees. CSync kreeg een fout tijdens het verwerken van de interne mappenstructuur. - + CSync failed to reserve memory. CSync kon geen geheugen reserveren. - + CSync fatal parameter error. CSync fatale parameter fout. - + CSync processing step update failed. CSync verwerkingsstap bijwerken mislukt. - + CSync processing step reconcile failed. CSync verwerkingsstap verzamelen mislukt. - + CSync processing step propagate failed. CSync verwerkingsstap doorzetten mislukt. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>De doelmap bestaat niet.</p><p>Controleer de synchinstellingen.</p> - + A remote file can not be written. Please check the remote access. Een extern bestand kon niet worden weggeschreven. Controleer de externe rechten. - + The local filesystem can not be written. Please check permissions. Er kan niet worden geschreven naar het lokale bestandssysteem. Controleer de schrijfrechten. - + CSync failed to connect through a proxy. CSync kon niet verbinden via een proxy. - + CSync could not authenticate at the proxy. CSync kon niet authenticeren bij de proxy. - + CSync failed to lookup proxy or server. CSync kon geen proxy of server vinden. - + CSync failed to authenticate at the %1 server. CSync kon niet authenticeren bij de %1 server. - + CSync failed to connect to the network. CSync kon niet verbinden met het netwerk. - + A network connection timeout happened. Er trad een netwerk time-out op. - + A HTTP transmission error happened. Er trad een HTTP transmissiefout plaats. - + CSync failed due to not handled permission deniend. CSync mislukt omdat de benodigde toegang werd geweigerd. - + CSync failed to access CSync kreeg geen toegang - + CSync tried to create a directory that already exists. CSync probeerde een al bestaande directory aan te maken. - - + + CSync: No space on %1 server available. CSync: Geen ruimte op %1 server beschikbaar. - + CSync unspecified error. CSync ongedefinieerde fout. - + Aborted by the user Afgebroken door de gebruiker - + An internal error number %1 happened. Interne fout nummer %1 opgetreden. - + The item is not synced because of previous errors: %1 Dit onderwerp is niet gesynchroniseerd door eerdere fouten: %1 - + Symbolic links are not supported in syncing. Symbolic links worden niet ondersteund bij het synchroniseren. - + File is listed on the ignore list. De file is opgenomen op de negeerlijst. - + File contains invalid characters that can not be synced cross platform. Bestand bevat ongeldige karakters die niet tussen platformen gesynchroniseerd kunnen worden. - + Unable to initialize a sync journal. Niet in staat om een synchornisatie journaal te starten. - + Cannot open the sync journal Kan het sync journal niet openen - + Not allowed because you don't have permission to add sub-directories in that directory Niet toegestaan, omdat u geen rechten hebt om sub-directories aan te maken in die directory - + Not allowed because you don't have permission to add parent directory Niet toegestaan, omdat u geen rechten hebt om een bovenliggende directories toe te voegen - + Not allowed because you don't have permission to add files in that directory Niet toegestaan, omdat u geen rechten hebt om bestanden in die directory toe te voegen - + Not allowed to upload this file because it is read-only on the server, restoring Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen - - + + Not allowed to remove, restoring Niet toegestaan te verwijderen, herstellen - + Move not allowed, item restored Verplaatsen niet toegestaan, object hersteld - + Move not allowed because %1 is read-only Verplaatsen niet toegestaan omdat %1 alleen-lezen is - + the destination bestemming - + the source bron @@ -2027,9 +2027,9 @@ Probeer opnieuw te synchroniseren. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - + <p>Versie %1 Voor meer informatie bezoekt u <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Gedistribueerd door %4 en verstrekt onder de GNU General Public License (GPL) Versie 2.0.<br>%5 en het %5 logo zijn geregistreerde handelsmerken van %4 in de Verenigde Staten, andere landen, of beide.</p> @@ -2140,22 +2140,27 @@ Probeer opnieuw te synchroniseren. Recent niets gesynchroniseerd - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) Sync %1 van %2 (%3 over) - + Syncing %1 (%2 left) Sync %1 (%2 over) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Bijgewerkt @@ -2400,7 +2405,7 @@ Probeer opnieuw te synchroniseren. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Bezoek <a href="https://owncloud.com">owncloud.com</a> als u nog geen ownCloud-server heeft. @@ -2539,21 +2544,16 @@ Probeer opnieuw te synchroniseren. - The server is currently unavailable - Server is op dit moment niet beschikbaar. - - - Preparing to sync Voorbereiden synchronisatie - + Aborting... Aan het afbreken... - + Sync is paused Synchronisatie is gepauzeerd diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts index a22e324542..0a81e93b5a 100644 --- a/translations/mirall_pl.ts +++ b/translations/mirall_pl.ts @@ -89,7 +89,7 @@ - + Pause Wstrzymaj @@ -119,53 +119,58 @@ <b>Uwaga:</b> Niektóre foldery, włączając podłączone w sieci lub współdzielone mogą mieć różne limity. - + Resume Wznów - + Confirm Folder Remove Potwierdź usunięcie katalogu - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Czy naprawdę chcesz przerwać synchronizację folderu <i>%1</i>?</p><p><b>Uwaga:</b> Ta czynność nie usunie plików z klienta.</p> - + Confirm Folder Reset Potwierdź reset folderu - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Czy rzeczywiście chcesz zresetować folder <i>%1</i> i przebudować bazę klientów?</p><p><b>Uwaga:</b> Ta funkcja została przewidziana wyłącznie do czynności technicznych. Nie zostaną usunięte żadne pliki, ale może to spowodować znaczący wzrost ruchu sieciowego i potrwać kilka minut lub godzin, w zależności od rozmiaru folderu. Używaj tej opcji wyłącznie, jeśli Twój administrator doradził Ci takie działanie.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) z %2 przestrzeni na serwerze w użyciu. - + No connection to %1 at <a href="%2">%3</a>. Brak połączenia do %1 na <a href="%2">%3</a>. - + No %1 connection configured. Połączenie %1 nie skonfigurowane. - + Sync Running Synchronizacja uruchomiona @@ -175,35 +180,35 @@ Brak skonfigurowanych kont. - + The syncing operation is running.<br/>Do you want to terminate it? Operacja synchronizacji jest uruchomiona.<br>Czy chcesz ją zakończyć? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 z %4) %5 pozostało z %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 z %2, plik %3 z %4 Pozostało czasu %5 - + Connected to <a href="%1">%2</a>. Podłączony do <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Podłączony do <a href="%1">%2</a> jako <i>%3</i>. - + Currently there is no storage usage information available. Obecnie nie ma dostępnych informacji o wykorzystaniu pamięci masowej. @@ -282,73 +287,73 @@ Pozostało czasu %5 %1 jest nie do odczytu. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 i %2 inne pliki zostały usunięte. - + %1 has been removed. %1 names a file. %1 został usunięty. - + %1 and %2 other files have been downloaded. %1 names a file. %1 i %2 pozostałe pliki zostały ściągnięte. - + %1 has been downloaded. %1 names a file. %1 został ściągnięty. - + %1 and %2 other files have been updated. %1 i %2 inne pliki zostały zaktualizowane. - + %1 has been updated. %1 names a file. %1 został uaktualniony. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 zmienił nazwę na %2 i %3 inne pliki mają zmienione nazwy. - + %1 has been renamed to %2. %1 and %2 name files. %1 zmienił nazwę na %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 został zmieniony na %2 i %3 inne pliku zostały przeniesione. - + %1 has been moved to %2. %1 został przeniesiony do %2. - + Sync Activity Aktywności synchronizacji - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -357,17 +362,17 @@ Mogło się tak zdarzyć z powodu niezauważonej rekonfiguracji folderu, lub te Czy jesteś pewien/pewna, że chcesz wykonać tę operację? - + Remove All Files? Usunąć wszystkie pliki? - + Remove all files Usuń wszystkie pliki - + Keep files Pozostaw pliki @@ -385,57 +390,52 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację? Stary sync journal '%1' został znaleziony, lecz nie mógł być usunięty. Proszę się upewnić, że żaden program go obecnie nie używa. - + Undefined State. Niezdefiniowany stan - + Waits to start syncing. Czekają na uruchomienie synchronizacji. - + Preparing for sync. Przygotowuję do synchronizacji - + Sync is running. Synchronizacja w toku - - Server is currently not available. - Serwer jest obecnie niedostępny. - - - + Last Sync was successful. Ostatnia synchronizacja zakończona powodzeniem. - + Last Sync was successful, but with warnings on individual files. Ostatnia synchronizacja udana, ale istnieją ostrzeżenia z pojedynczymi plikami. - + Setup Error. Błąd ustawień. - + User Abort. Użytkownik anulował. - + Sync is paused. Synchronizacja wstrzymana - + %1 (Sync is paused) %1 (Synchronizacja jest zatrzymana) @@ -1218,7 +1218,7 @@ Niezalecane jest jego użycie. Skip folders configuration - + Pomiń konfigurację folderów @@ -1501,27 +1501,27 @@ Niezalecane jest jego użycie. Ustawienia - + %1 %1 - + Activity Aktywność - + General Ogólne - + Network Sieć - + Account Konto @@ -1778,7 +1778,7 @@ Niezalecane jest jego użycie. Expiration Date: %1 - + Data wygaśnięcia: %1 @@ -1789,229 +1789,229 @@ Niezalecane jest jego użycie. Mirall::SyncEngine - + Success. Sukces. - + CSync failed to create a lock file. CSync nie mógł utworzyć pliku blokady. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync nie powiodło się załadowanie lub utworzenie pliku dziennika. Upewnij się, że masz prawa do odczytu i zapisu do lokalnego katalogu synchronizacji. - + CSync failed to write the journal file. CSync nie udało się zapisać pliku dziennika. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Wtyczka %1 do csync nie może być załadowana.<br/>Sprawdź poprawność instalacji!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Czas systemowy na tym kliencie różni się od czasu systemowego na serwerze. Użyj usługi synchronizacji czasu (NTP) na serwerze i kliencie, aby czas na obu urządzeniach był taki sam. - + CSync could not detect the filesystem type. CSync nie może wykryć typu systemu plików. - + CSync got an error while processing internal trees. CSync napotkał błąd podczas przetwarzania wewnętrznych drzew. - + CSync failed to reserve memory. CSync nie mógł zarezerwować pamięci. - + CSync fatal parameter error. Krytyczny błąd parametru CSync. - + CSync processing step update failed. Aktualizacja procesu przetwarzania CSync nie powiodła się. - + CSync processing step reconcile failed. Scalenie w procesie przetwarzania CSync nie powiodło się. - + CSync processing step propagate failed. Propagacja w procesie przetwarzania CSync nie powiodła się. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Katalog docelowy nie istnieje.</p><p>Sprawdź ustawienia synchronizacji.</p> - + A remote file can not be written. Please check the remote access. Zdalny plik nie może zostać zapisany. Sprawdź dostęp zdalny. - + The local filesystem can not be written. Please check permissions. Nie można zapisywać na lokalnym systemie plików. Sprawdź uprawnienia. - + CSync failed to connect through a proxy. CSync nie mógł połączyć się przez proxy. - + CSync could not authenticate at the proxy. CSync nie mógł się uwierzytelnić przez proxy. - + CSync failed to lookup proxy or server. CSync nie mógł odnaleźć serwera proxy. - + CSync failed to authenticate at the %1 server. CSync nie mógł uwierzytelnić się na serwerze %1. - + CSync failed to connect to the network. CSync nie mógł połączyć się z siecią. - + A network connection timeout happened. Upłynął limit czasu połączenia. - + A HTTP transmission error happened. Wystąpił błąd transmisji HTTP. - + CSync failed due to not handled permission deniend. CSync nie obsługiwane, odmowa uprawnień. - + CSync failed to access Synchronizacja nieudana z powodu braku dostępu - + CSync tried to create a directory that already exists. CSync próbował utworzyć katalog, który już istnieje. - - + + CSync: No space on %1 server available. CSync: Brak dostępnego miejsca na serwerze %1. - + CSync unspecified error. Nieokreślony błąd CSync. - + Aborted by the user Anulowane przez użytkownika - + An internal error number %1 happened. Wystąpił błąd wewnętrzny numer %1. - + The item is not synced because of previous errors: %1 Ten element nie jest zsynchronizowane z powodu poprzednich błędów: %1 - + Symbolic links are not supported in syncing. Linki symboliczne nie są wspierane przy synchronizacji. - + File is listed on the ignore list. Plik jest na liście plików ignorowanych. - + File contains invalid characters that can not be synced cross platform. Plik zawiera nieprawidłowe znaki, które nie mogą być synchronizowane wieloplatformowo. - + Unable to initialize a sync journal. Nie można zainicjować synchronizacji dziennika. - + Cannot open the sync journal Nie można otworzyć dziennika synchronizacji - + Not allowed because you don't have permission to add sub-directories in that directory Nie masz uprawnień do dodawania podkatalogów w tym katalogu. - + Not allowed because you don't have permission to add parent directory Nie masz uprawnień by dodać katalog nadrzędny - + Not allowed because you don't have permission to add files in that directory Nie masz uprawnień by dodać pliki w tym katalogu - + Not allowed to upload this file because it is read-only on the server, restoring Wgrywanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie - - + + Not allowed to remove, restoring Brak uprawnień by usunąć, przywracanie - + Move not allowed, item restored Przenoszenie niedozwolone, obiekt przywrócony - + Move not allowed because %1 is read-only Przenoszenie niedozwolone, ponieważ %1 jest tylko do odczytu - + the destination docelowy - + the source źródło @@ -2027,7 +2027,7 @@ Niezalecane jest jego użycie. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2140,22 +2140,27 @@ Niezalecane jest jego użycie. Brak ostatnich synchronizacji - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) Synchronizacja %1 z %2 (%3 pozostało) - + Syncing %1 (%2 left) Synchronizuję %1 (%2 pozostało) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Aktualne @@ -2401,7 +2406,7 @@ Kliknij ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Jeśli nie masz jeszcze serwera ownCloud, wejdź na <a href="https://owncloud.com">owncloud.com</a> aby dowiedzieć się jak go zainstalować. @@ -2540,21 +2545,16 @@ Kliknij - The server is currently unavailable - Serwer jest obecnie niedostępny. - - - Preparing to sync Przygotowuję do synchronizacji - + Aborting... Anuluję... - + Sync is paused Synchronizacja wstrzymana diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts index 36119b2fc0..21c06c1a02 100644 --- a/translations/mirall_pt.ts +++ b/translations/mirall_pt.ts @@ -89,7 +89,7 @@ - + Pause Pausa @@ -119,53 +119,58 @@ <b>Nota:</b> Algumas pastas, incluindo pastas partilhadas ou montadas na rede, podem ter limites diferentes. - + Resume Resumir - + Confirm Folder Remove Confirme a remoção da pasta - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Quer mesmo parar a sincronização da pasta <i>%1</i>?</p><b>Nota:</b> Isto não irá remover os ficheiros no seu cliente.</p> - + Confirm Folder Reset Confirmar reposição da pasta - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Deseja mesmo repor a pasta <i>%1</i> e reconstruir a base de dados do seu cliente?</p><p><b>Nota:</b> Esta função é desenhada apenas para efeitos de manutenção. Os ficheiros não irão ser removidos, mas este processo pode aumentar o tráfego de dados e demorar alguns minutos ou horas a completar, dependendo do tamanho da pasta. Utilize esta funcionalidade apenas se aconselhado pelo seu administrador.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) de %2 de espaço utilizado. - + No connection to %1 at <a href="%2">%3</a>. Sem ligação a %1 em <a href="%2">%3</a>. - + No %1 connection configured. %1 sem ligação configurada. - + Sync Running A sincronização está a decorrer @@ -175,35 +180,35 @@ Nenhuma conta configurada. - + The syncing operation is running.<br/>Do you want to terminate it? A operação de sincronização está a ser executada.<br/>Deseja terminar? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 de %4) %5 faltando a uma taxa de %6/s - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. Conectado a <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Conectado a <a href="%1">%2</a> como <i>%3</i>. - + Currently there is no storage usage information available. Histórico de utilização de armazenamento não disponível. @@ -282,73 +287,73 @@ Total time left %5 Não é possível ler %1 - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 e %2 outros ficheiros foram removidos. - + %1 has been removed. %1 names a file. %1 foi removido. - + %1 and %2 other files have been downloaded. %1 names a file. Foi feito o download de outros ficheiros %1 e %2. - + %1 has been downloaded. %1 names a file. Fez o download de %1 - + %1 and %2 other files have been updated. Os ficheiros %1 e %2 foram actualizados. - + %1 has been updated. %1 names a file. %1 foi actualizado. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 foi renomeado para %2 e %3 outros ficheiros foram renomeados. - + %1 has been renamed to %2. %1 and %2 name files. %1 foi renomeado para %2 - + %1 has been moved to %2 and %3 other files have been moved. %1 foi movido para %2 e %3 outros ficheiros foram movidos. - + %1 has been moved to %2. %1 foi movido para %2 - + Sync Activity Actividade de sincronicação - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -356,17 +361,17 @@ Are you sure you want to perform this operation? Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha "Manter os ficheiros". Se quer apagar os seus dados, escolha "Remover todos os ficheiros". - + Remove All Files? Remover todos os ficheiros? - + Remove all files Remover todos os ficheiros - + Keep files Manter os ficheiros @@ -384,57 +389,52 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q Não foi possível remover o antigo 'journal sync' '%1'. Por favor certifique-se que nenhuma aplicação o está a utilizar. - + Undefined State. Estado indefinido. - + Waits to start syncing. A aguardar o inicio da sincronização. - + Preparing for sync. A preparar para sincronização. - + Sync is running. A sincronização está a correr. - - Server is currently not available. - O servidor não está disponível de momento. - - - + Last Sync was successful. A última sincronização foi efectuada com sucesso. - + Last Sync was successful, but with warnings on individual files. A última sincronização foi efectuada com sucesso, mas existem avisos sobre alguns ficheiros. - + Setup Error. Erro na instalação. - + User Abort. Cancelado pelo utilizador. - + Sync is paused. A sincronização está em pausa. - + %1 (Sync is paused) %1 (Sincronização em pausa) @@ -1498,27 +1498,27 @@ Por favor tente sincronizar novamente. Configurações - + %1 %1 - + Activity Atividade - + General Geral - + Network Rede - + Account Conta @@ -1786,230 +1786,230 @@ Por favor tente sincronizar novamente. Mirall::SyncEngine - + Success. Sucesso - + CSync failed to create a lock file. CSync falhou a criação do ficheiro de lock. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync falhou no carregamento ou criação do ficheiro jornal. Confirme que tem permissões de escrita e leitura no directório de sincronismo local. - + CSync failed to write the journal file. CSync falhou a escrever o ficheiro do jornal. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>O plugin %1 para o CSync não foi carregado.<br/>Por favor verifique a instalação!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. A data/hora neste cliente é difere da data/hora do servidor. Por favor utilize um servidor de sincronização horária (NTP), no servidor e nos clientes para garantir que a data/hora são iguais. - + CSync could not detect the filesystem type. Csync não conseguiu detectar o tipo de sistema de ficheiros. - + CSync got an error while processing internal trees. Csync obteve um erro enquanto processava as árvores internas. - + CSync failed to reserve memory. O CSync falhou a reservar memória - + CSync fatal parameter error. Parametro errado, CSync falhou - + CSync processing step update failed. O passo de processamento do CSyn falhou - + CSync processing step reconcile failed. CSync: Processo de reconciliação falhou. - + CSync processing step propagate failed. CSync: O processo de propagação falhou. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>A pasta de destino não existe.</p><p>Por favor verifique a configuração da sincronização.</p> - + A remote file can not be written. Please check the remote access. Não é possivel escrever num ficheiro remoto. Por favor verifique o acesso remoto. - + The local filesystem can not be written. Please check permissions. Não é possivel escrever no sistema de ficheiros local. Por favor verifique as permissões. - + CSync failed to connect through a proxy. CSync: Erro a ligar através do proxy - + CSync could not authenticate at the proxy. CSync: erro ao autenticar-se no servidor proxy. - + CSync failed to lookup proxy or server. CSync: Erro a contactar o proxy ou o servidor. - + CSync failed to authenticate at the %1 server. CSync: Erro a autenticar no servidor %1 - + CSync failed to connect to the network. CSync: Erro na conecção à rede - + A network connection timeout happened. Houve um erro de timeout de rede. - + A HTTP transmission error happened. Ocorreu um erro de transmissão HTTP - + CSync failed due to not handled permission deniend. CSync: Erro devido a permissões de negação não tratadas. - + CSync failed to access CSync: falha no acesso - + CSync tried to create a directory that already exists. O CSync tentou criar uma pasta que já existe. - - + + CSync: No space on %1 server available. CSync: Não ha espaço disponível no servidor %1 - + CSync unspecified error. CSync: erro não especificado - + Aborted by the user Cancelado pelo utilizador - + An internal error number %1 happened. Ocorreu um erro interno número %1. - + The item is not synced because of previous errors: %1 O item não está sincronizado devido a erros anteriores: %1 - + Symbolic links are not supported in syncing. Hiperligações simbólicas não são suportadas em sincronização. - + File is listed on the ignore list. O ficheiro está na lista de ficheiros a ignorar. - + File contains invalid characters that can not be synced cross platform. O ficheiro contém caracteres inválidos que não podem ser sincronizados pelas várias plataformas. - + Unable to initialize a sync journal. Impossível inicializar sincronização 'journal'. - + Cannot open the sync journal Impossível abrir o jornal de sincronismo - + Not allowed because you don't have permission to add sub-directories in that directory Não permitido, porque não tem permissão para adicionar sub-directórios ao directório - + Not allowed because you don't have permission to add parent directory Não permitido, porque não tem permissão para adicionar o directório principal - + Not allowed because you don't have permission to add files in that directory Não permitido, porque não tem permissão para adicionar ficheiros no directório - + Not allowed to upload this file because it is read-only on the server, restoring Não é permitido fazer o envio deste ficheiro porque é só de leitura no servidor, restaurando - - + + Not allowed to remove, restoring Não autorizado para remoção, restaurando - + Move not allowed, item restored Mover não foi permitido, item restaurado - + Move not allowed because %1 is read-only Mover não foi autorizado porque %1 é só de leitura - + the destination o destino - + the source a origem @@ -2025,7 +2025,7 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2138,22 +2138,27 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n Sem itens sincronizados recentemente - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) Sincronizar %1 de %2 (%3 faltando) - + Syncing %1 (%2 left) Sincronizando %1 (%2 faltando) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Actualizado @@ -2398,7 +2403,7 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Se ainda não tem um servidor ownCloud, visite <a href="https://owncloud.com">owncloud.com</a> para mais informações. @@ -2537,21 +2542,16 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n - The server is currently unavailable - O servidor está indisponível - - - Preparing to sync A preparar para sincronizar - + Aborting... A cancelar... - + Sync is paused Sincronização em pausa diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts index 86a011ed3a..8417c99eed 100644 --- a/translations/mirall_pt_BR.ts +++ b/translations/mirall_pt_BR.ts @@ -89,7 +89,7 @@ - + Pause Pausa @@ -119,53 +119,58 @@ <b>Nota:</b> Algumas pastas, incluindo as montadas na rede ou pastas compartilhadas, podem ter limites diferentes. - + Resume Resumir - + Confirm Folder Remove Confirma Remoção da Pasta - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Você realmente deseja parar de sincronizar a pasta <i>%1</i>?</p><p><b>Nota:</b> Isso não vai remover os arquivos de seu cliente.</p> - + Confirm Folder Reset Confirme Reiniciar Pasta - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Você realmente deseja redefinir a pasta <i>%1</i> e reconstruir seu banco de dados de clientes?</p><p><b>Nota:</b> Esta função é usada somente para manutenção. Nenhum arquivo será removido, mas isso pode causar significativo tráfego de dados e levar vários minutos ou horas, dependendo do tamanho da pasta. Somente use esta opção se adivertido por seu administrador.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) de %2 do espaço em uso no servidor. - + No connection to %1 at <a href="%2">%3</a>. Nenhuma conexão para %1 em <a href="%2">%3</a>. - + No %1 connection configured. Nenhuma %1 conexão configurada. - + Sync Running Sincronização Acontecendo @@ -175,35 +180,35 @@ Nenhuma conta configurada. - + The syncing operation is running.<br/>Do you want to terminate it? A operação de sincronização está acontecendo.<br/>Você deseja finaliza-la? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 de %4) %5 faltando a uma taxa de %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 de %2, arquivo %3 de %4 Total de tempo que falta 5% - + Connected to <a href="%1">%2</a>. Conectado à <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Conectado a <a href="%1">%2</a> como <i>%3</i>. - + Currently there is no storage usage information available. Atualmente, não há informações de uso de armazenamento disponível. @@ -282,73 +287,73 @@ Total de tempo que falta 5% %1 não pode ser lido. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 e %2 outros arquivos foram removidos. - + %1 has been removed. %1 names a file. %1 foi removido. - + %1 and %2 other files have been downloaded. %1 names a file. %1 e %2 outros arquivos foram baixados. - + %1 has been downloaded. %1 names a file. %1 foi baixado. - + %1 and %2 other files have been updated. %1 e %2 outros arquivos foram atualizados. - + %1 has been updated. %1 names a file. %1 foi atualizado. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 foi renomeado para %2 e %3 outros três arquivos foram renomeados. - + %1 has been renamed to %2. %1 and %2 name files. %1 foi renomeado para %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 foi movido para %2 e %3 outros arquivos foram movidos. - + %1 has been moved to %2. %1 foi movido para %2. - + Sync Activity Atividade de Sincronização - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -357,17 +362,17 @@ Isso pode ser porque a pasta foi silenciosamente reconfigurada, ou todos os arqu Você tem certeza que quer executar esta operação? - + Remove All Files? Deseja Remover Todos os Arquivos? - + Remove all files Remover todos os arquivos - + Keep files Manter arquivos @@ -385,57 +390,52 @@ Você tem certeza que quer executar esta operação? Uma velha revista de sincronização '%1' foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está a usá-la. - + Undefined State. Estado indefinido. - + Waits to start syncing. Aguardando o inicio da sincronização. - + Preparing for sync. Preparando para sincronização. - + Sync is running. A sincronização está ocorrendo. - - Server is currently not available. - Servidor indisponível no momento. - - - + Last Sync was successful. A última sincronização foi feita com sucesso. - + Last Sync was successful, but with warnings on individual files. A última sincronização foi executada com sucesso, mas com advertências em arquivos individuais. - + Setup Error. Erro de Configuração. - + User Abort. Usuário Abortou - + Sync is paused. Sincronização pausada. - + %1 (Sync is paused) %1 (Pausa na Sincronização) @@ -1499,27 +1499,27 @@ Tente sincronizar novamente. Configurações - + %1 %1 - + Activity Atividade - + General Geral - + Network Rede - + Account Conta @@ -1787,229 +1787,229 @@ Tente sincronizar novamente. Mirall::SyncEngine - + Success. Sucesso. - + CSync failed to create a lock file. Falha ao criar o arquivo de trava pelo CSync. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. Csync falhou ao carregar ou criar o arquivo jornal. Certifique-se de ter permissão de escrita no diretório de sincronização local. - + CSync failed to write the journal file. Csync falhou ao tentar gravar o arquivo jornal. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>O plugin %1 para csync não foi carregado.<br/>Por favor verifique a instalação!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. A hora do sistema neste cliente é diferente da hora de sistema no servidor. Por favor, use um serviço de sincronização de tempo (NTP) no servidor e máquinas clientes para que as datas continuam as mesmas. - + CSync could not detect the filesystem type. Tipo de sistema de arquivo não detectado pelo CSync. - + CSync got an error while processing internal trees. Erro do CSync enquanto processava árvores internas. - + CSync failed to reserve memory. CSync falhou ao reservar memória. - + CSync fatal parameter error. Erro fatal de parametro do CSync. - + CSync processing step update failed. Processamento da atualização do CSync falhou. - + CSync processing step reconcile failed. Processamento da conciliação do CSync falhou. - + CSync processing step propagate failed. Processamento da propagação do CSync falhou. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>O diretório de destino não existe.</p> <p>Por favor, verifique a configuração de sincronização. </p> - + A remote file can not be written. Please check the remote access. O arquivo remoto não pode ser escrito. Por Favor, verifique o acesso remoto. - + The local filesystem can not be written. Please check permissions. O sistema de arquivos local não pode ser escrito. Por favor, verifique as permissões. - + CSync failed to connect through a proxy. CSync falhou ao conectar por um proxy. - + CSync could not authenticate at the proxy. Csync não conseguiu autenticação no proxy. - + CSync failed to lookup proxy or server. CSync falhou ao localizar o proxy ou servidor. - + CSync failed to authenticate at the %1 server. CSync falhou ao autenticar no servidor %1. - + CSync failed to connect to the network. CSync falhou ao conectar à rede. - + A network connection timeout happened. Ocorreu uma desconexão de rede. - + A HTTP transmission error happened. Houve um erro na transmissão HTTP. - + CSync failed due to not handled permission deniend. CSync falhou devido a uma negativa de permissão não resolvida. - + CSync failed to access Falha no acesso CSync - + CSync tried to create a directory that already exists. CSync tentou criar um diretório que já existe. - - + + CSync: No space on %1 server available. CSync: Sem espaço disponível no servidor %1. - + CSync unspecified error. Erro não especificado no CSync. - + Aborted by the user Abortado pelo usuário - + An internal error number %1 happened. Ocorreu um erro interno de número %1. - + The item is not synced because of previous errors: %1 O item não está sincronizado devido a erros anteriores: %1 - + Symbolic links are not supported in syncing. Linques simbólicos não são suportados em sincronização. - + File is listed on the ignore list. O arquivo está listado na lista de ignorados. - + File contains invalid characters that can not be synced cross platform. Arquivos que contém caracteres inválidos não podem ser sincronizados através de plataformas. - + Unable to initialize a sync journal. Impossibilitado de iniciar a sincronização. - + Cannot open the sync journal Não é possível abrir o arquivo de sincronização - + Not allowed because you don't have permission to add sub-directories in that directory Não permitido porque você não tem permissão de criar sub-pastas nesta pasta - + Not allowed because you don't have permission to add parent directory Não permitido porque você não tem permissão de criar pastas mãe - + Not allowed because you don't have permission to add files in that directory Não permitido porque você não tem permissão de adicionar arquivos a esta pasta - + Not allowed to upload this file because it is read-only on the server, restoring Não é permitido fazer o upload deste arquivo porque ele é somente leitura no servidor, restaurando - - + + Not allowed to remove, restoring Não é permitido remover, restaurando - + Move not allowed, item restored Não é permitido mover, item restaurado - + Move not allowed because %1 is read-only Não é permitido mover porque %1 é somente para leitura - + the destination o destino - + the source a fonte @@ -2025,9 +2025,9 @@ Tente sincronizar novamente. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - + <p>Versão %1 Para mais informações por favor visite <a href='%2'>%3</a>.</p><p>Direitos Autorais ownCloud Inc.</p><p>Distribuido por %4 e licenciado sob a GNU General Public License (GPL) Versão 2.0.<br>%5 e %5 logomarca são marcas registradas de %4 nos Estados Unidos, e outros países ou ambos.<p> @@ -2138,22 +2138,27 @@ Tente sincronizar novamente. Não há itens sincronizados recentemente - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) Sincronizar %1 de %2 (%3 faltando) - + Syncing %1 (%2 left) Sincronizando %1 (%2 faltando) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Até a data @@ -2398,7 +2403,7 @@ Tente sincronizar novamente. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Se você ainda não tem um servidor ownCloud, acesse <a href="https://owncloud.com">owncloud.com</a> para obter mais informações. @@ -2414,7 +2419,7 @@ Tente sincronizar novamente. <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 - + <p>Versão %2. Para mais informações visite <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Com base em Mirall por Duncan Mac-Vicar P.</small>Licenciado sob a GNU Public License (GPL) Version 2.0<br/>ownCloud e ownCloud logomarca são marcas registradas de ownCloud Inc. nos Estados Unidos, e outros países, ou ambos</p>%7 @@ -2537,21 +2542,16 @@ Tente sincronizar novamente. - The server is currently unavailable - Servidor indisponível no momento. - - - Preparing to sync Preparando para sincronização - + Aborting... Abortando... - + Sync is paused Sincronização em pausa diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts index 8947c4ace4..9b966e8ee9 100644 --- a/translations/mirall_ru.ts +++ b/translations/mirall_ru.ts @@ -89,7 +89,7 @@ - + Pause Пауза @@ -119,53 +119,58 @@ <b>Заметьте:</b> Некоторые папки, включая сетевые или общие, могут иметь разные ограничения. - + Resume Продолжить - + Confirm Folder Remove Подтвердите удаление папки - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Вы действительно хотите прекратить синхронизацию папки <i>%1</i>?</p><p><b>Примечание:</b> Это действие не удалит файлы с клиента.</p> - + Confirm Folder Reset Подтвердить сброс папки - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Вы действительно хотите сбросить папку <i>%1</i> и перестроить клиентскую базу данных?</p><p><b>Важно:</b> Данный функционал предназначен только для технического обслуживания. Файлы не будут удалены, но, в зависимости от размера папки, операция может занять от нескольких минут до нескольких часов и может быть передан большой объем данных. Используйте данную операцию только по рекомендации администратора.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. Используется %1 (%3%) из %2 места на сервере. - + No connection to %1 at <a href="%2">%3</a>. Нет связи с %1 по адресу <a href="%2">%3</a>. - + No %1 connection configured. Нет настроенного подключения %1. - + Sync Running Синхронизация запущена @@ -175,35 +180,35 @@ Учётная запись не настроена. - + The syncing operation is running.<br/>Do you want to terminate it? Синхронизация запущена.<br/>Вы хотите, остановить ее? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 / %4) Осталось %5 на скорости %6/сек. - + %1 of %2, file %3 of %4 Total time left %5 %1 / %2, файл %3 / %4 Оставшееся время: %5 - + Connected to <a href="%1">%2</a>. Соединились с <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Подключён к <a href="%1">%2</a> как <i>%3</i>. - + Currently there is no storage usage information available. В данный момент информация о заполненности хранилища недоступна. @@ -282,73 +287,73 @@ Total time left %5 %1 не читается. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. '%1' и ещё %2 других файлов были удалены. - + %1 has been removed. %1 names a file. '%1' был удалён - + %1 and %2 other files have been downloaded. %1 names a file. '%1' и ещё %2 других файлов были загружены. - + %1 has been downloaded. %1 names a file. %1 был загружен. - + %1 and %2 other files have been updated. %1 и ещё %2 других файла были обновлены. - + %1 has been updated. %1 names a file. %1 был обновлён. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 был переименован в %2 и ещё %3 других файлов были переименованы. - + %1 has been renamed to %2. %1 and %2 name files. %1 был переименован в %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 был перемещён в %2 и ещё %3 других файлов были перемещены. - + %1 has been moved to %2. %1 был перемещён в %2. - + Sync Activity Журнал синхронизации - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -357,17 +362,17 @@ Are you sure you want to perform this operation? Вы уверены, что хотите выполнить операцию? - + Remove All Files? Удалить все файлы? - + Remove all files Удалить все файлы - + Keep files Сохранить файлы @@ -385,57 +390,52 @@ Are you sure you want to perform this operation? Найден старый журнал синхронизации '%1', и он не может быть удалён. Пожалуйста убедитесь что он не открыт в каком-либо приложении. - + Undefined State. Неопределенное состояние. - + Waits to start syncing. Ожидает, чтобы начать синхронизацию. - + Preparing for sync. Подготовка к синхронизации. - + Sync is running. Идет синхронизация. - - Server is currently not available. - Сервер недоступен. - - - + Last Sync was successful. Последняя синхронизация прошла успешно. - + Last Sync was successful, but with warnings on individual files. Последняя синхронизация прошла успешно, но были предупреждения о нескольких файлах. - + Setup Error. Ошибка установки. - + User Abort. Отмена пользователем. - + Sync is paused. Синхронизация приостановлена. - + %1 (Sync is paused) %! (синхронизация приостановлена) @@ -1501,27 +1501,27 @@ It is not advisable to use it. Конфигурация - + %1 %1 - + Activity Действия - + General Главные - + Network Сеть - + Account Учётная запись @@ -1789,229 +1789,229 @@ It is not advisable to use it. Mirall::SyncEngine - + Success. Успешно. - + CSync failed to create a lock file. CSync не удалось создать файл блокировки. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync не смог загрузить или создать файл журнала. Убедитесь что вы имеете права чтения и записи в локальной директории. - + CSync failed to write the journal file. CSync не смог записать файл журнала. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>%1 плагин для синхронизации не удается загрузить.<br/>Пожалуйста, убедитесь, что он установлен!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Системное время на этом клиенте отличается от времени на сервере. Воспользуйтесь сервисом синхронизации времени (NTP) на серверной и клиентской машинах для установки точного времени. - + CSync could not detect the filesystem type. CSync не удалось обнаружить тип файловой системы. - + CSync got an error while processing internal trees. CSync получил сообщение об ошибке при обработке внутренних деревьев. - + CSync failed to reserve memory. CSync не удалось зарезервировать память. - + CSync fatal parameter error. Фатальная ошибка параметра CSync. - + CSync processing step update failed. Процесс обновления CSync не удался. - + CSync processing step reconcile failed. Процесс согласования CSync не удался. - + CSync processing step propagate failed. Процесс передачи CSync не удался. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Целевая папка не существует.</p><p>Проверьте настройки синхронизации.</p> - + A remote file can not be written. Please check the remote access. Удаленный файл не может быть записан. Пожалуйста, проверьте удаленный доступ. - + The local filesystem can not be written. Please check permissions. Локальная файловая система не доступна для записи. Пожалуйста, проверьте права пользователя. - + CSync failed to connect through a proxy. CSync не удалось подключиться через прокси. - + CSync could not authenticate at the proxy. CSync не удалось авторизоваться на прокси сервере. - + CSync failed to lookup proxy or server. CSync не удалось найти прокси сервер. - + CSync failed to authenticate at the %1 server. CSync не удалось аутентифицироваться на сервере %1. - + CSync failed to connect to the network. CSync не удалось подключиться к сети. - + A network connection timeout happened. Произошёл таймаут соединения сети. - + A HTTP transmission error happened. Произошла ошибка передачи http. - + CSync failed due to not handled permission deniend. CSync упал в связи с отутствием обработки из-за отказа в доступе. - + CSync failed to access CSync не имеет доступа - + CSync tried to create a directory that already exists. CSync пытался создать директорию, которая уже существует. - - + + CSync: No space on %1 server available. CSync: Нет доступного пространства на сервере %1 server. - + CSync unspecified error. Неизвестная ошибка CSync. - + Aborted by the user Прервано пользователем - + An internal error number %1 happened. Произошла внутренняя ошибка номер %1. - + The item is not synced because of previous errors: %1 Путь не синхронизируется из-за произошедших ошибок: %1 - + Symbolic links are not supported in syncing. Синхронизация символических ссылок не поддерживается. - + File is listed on the ignore list. Файл присутствует в списке игнорируемых. - + File contains invalid characters that can not be synced cross platform. Файл содержит недопустимые символы, которые невозможно синхронизировать между платформами. - + Unable to initialize a sync journal. Не удалось инициализировать журнал синхронизации. - + Cannot open the sync journal Не удаётся открыть журнал синхронизации - + Not allowed because you don't have permission to add sub-directories in that directory Недопустимо из-за отсутствия у вас разрешений на добавление подпапок в этой папке - + Not allowed because you don't have permission to add parent directory Недопустимо из-за отсутствия у вас разрешений на добавление родительской папки - + Not allowed because you don't have permission to add files in that directory Недопустимо из-за отсутствия у вас разрешений на добавление файлов в эту папку - + Not allowed to upload this file because it is read-only on the server, restoring Недопустимо отправить этот файл поскольку на севрере он помечен только для чтения, восстанавливаем - - + + Not allowed to remove, restoring Недопустимо удалить, восстанавливаем - + Move not allowed, item restored Перемещение недопустимо, элемент восстановлен - + Move not allowed because %1 is read-only Перемещение недопустимо, поскольку %1 помечен только для чтения - + the destination Назначение - + the source Источник @@ -2027,7 +2027,7 @@ It is not advisable to use it. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2140,22 +2140,27 @@ It is not advisable to use it. Недавно ничего не синхронизировалсь - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) Синхронизация %1 из %2 (%3 осталось) - + Syncing %1 (%2 left) Синхронизация %1 (%2 осталось) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Актуальная версия @@ -2400,7 +2405,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Если у Вас ещё нет сервера ownCloud, обратитесь за дополнительной информацией на <a href="https://owncloud.com">owncloud.com</a> @@ -2539,21 +2544,16 @@ It is not advisable to use it. - The server is currently unavailable - Сервер временно недоступен - - - Preparing to sync Подготовка к синхронизации - + Aborting... Прерывание... - + Sync is paused Синхронизация приостановлена diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts index 4e87a32d3c..d9dd4e21f1 100644 --- a/translations/mirall_sk.ts +++ b/translations/mirall_sk.ts @@ -89,7 +89,7 @@ - + Pause Pauza @@ -119,53 +119,58 @@ <b>Poznámka:<b> Niektoré priečinky, vrátane sieťových alebo zdieľaných, môžu mať odlišné limity. - + Resume Obnovenie - + Confirm Folder Remove Potvrdiť odstránenie priečinka - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Určite chcete zastaviť synchronizáciu priečinka <i>%1</i>?</p><p><b>Poznámka:</b> Toto neodstráni súbory z vášho klienta.</p> - + Confirm Folder Reset Potvrdiť zresetovanie priečinka - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Skutočne chcete zresetovať priečinok <i>%1</i> a opätovne zostaviť klientskú databázu?</p><p><b>Poznámka:</b> Táto funkcia je navrhnutá len pre účely údržby. Žiadne súbory nebudú odstránené, ale môže to spôsobiť značnú dátovú prevádzku a vyžiadať si niekoľko minút alebo hodín pre dokončenie, v závislosti od veľkosti priečinka. Použite túto možnosť pokiaľ máte doporučenie od správcu.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) z %2 miesta na disku je použité. - + No connection to %1 at <a href="%2">%3</a>. Žiadne spojenie s %1 na <a href="%2">%3</a>. - + No %1 connection configured. Žiadne nakonfigurované %1 spojenie - + Sync Running Prebiehajúca synchronizácia @@ -175,34 +180,34 @@ Žiadny účet nie je nastavený. - + The syncing operation is running.<br/>Do you want to terminate it? Proces synchronizácie práve prebieha.<br/>Chcete ho ukončiť? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. Pripojené k <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Pripojené k <a href="%1">%2</a> ako <i>%3</i>. - + Currently there is no storage usage information available. Teraz nie sú k dispozícii žiadne informácie o využití úložiska. @@ -281,73 +286,73 @@ Total time left %5 %1 nie je čitateľný. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 a %2 ďalších súborov bolo zmazaných. - + %1 has been removed. %1 names a file. %1 bol zmazaný. - + %1 and %2 other files have been downloaded. %1 names a file. %1 a %2 ďalších súborov bolo stiahnutých. - + %1 has been downloaded. %1 names a file. %1 bol stiahnutý. - + %1 and %2 other files have been updated. %1 a %2 ďalších súborov bolo aktualizovaných. - + %1 has been updated. %1 names a file. %1 bol aktualizovaný. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 bol premenovaný na %2 a %3 ďalších súborov bolo premenovaných. - + %1 has been renamed to %2. %1 and %2 name files. %1 bol premenovaný na %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 bol presunutý do %2 a %3 ďalších súborov bolo presunutých. - + %1 has been moved to %2. %1 bol presunutý do %2. - + Sync Activity Aktivita synchronizácie - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -356,17 +361,17 @@ Toto môže byť kvôli tichej rekonfigurácii priečinka, prípadne boli všetk Ste si istý, že chcete uskutočniť danú operáciu? - + Remove All Files? Odstrániť všetky súbory? - + Remove all files Odstrániť všetky súbory - + Keep files Ponechať súbory @@ -384,57 +389,52 @@ Ste si istý, že chcete uskutočniť danú operáciu? Starý synchronizačný žurnál '%1' nájdený, avšak neodstrániteľný. Prosím uistite sa, že žiadna aplikácia ho práve nevyužíva. - + Undefined State. Nedefinovaný stav. - + Waits to start syncing. Čakanie na štart synchronizácie. - + Preparing for sync. Príprava na synchronizáciu. - + Sync is running. Synchronizácia prebieha. - - Server is currently not available. - Sever momentálne nie je prístupný. - - - + Last Sync was successful. Posledná synchronizácia sa úspešne skončila. - + Last Sync was successful, but with warnings on individual files. Posledná synchronizácia bola úspešná, ale z varovaniami pre individuálne súbory. - + Setup Error. Chyba pri inštalácii. - + User Abort. Zrušené používateľom. - + Sync is paused. Synchronizácia je pozastavená. - + %1 (Sync is paused) %1 (Synchronizácia je pozastavená) @@ -1499,27 +1499,27 @@ Nie je vhodné ju používať. Nastavenia - + %1 %1 - + Activity Aktivita - + General Všeobecné - + Network Sieť - + Account Účet @@ -1787,229 +1787,229 @@ Nie je vhodné ju používať. Mirall::SyncEngine - + Success. Úspech. - + CSync failed to create a lock file. Vytvorenie "zamykacieho" súboru cez "CSync" zlyhalo. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync sa nepodarilo načítať alebo vytvoriť súbor žurnálu. Uistite sa, že máte oprávnenia na čítanie a zápis v lokálnom synchronizovanom priečinku. - + CSync failed to write the journal file. CSync sa nepodarilo zapísať do súboru žurnálu. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>%1 zásuvný modul pre "CSync" nebolo možné načítať.<br/>Prosím skontrolujte inštaláciu!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Systémový čas tohoto klienta je odlišný od systémového času na serveri. Prosím zvážte použitie sieťovej časovej synchronizačnej služby (NTP) na serveri a klientských strojoch, aby bol na nich rovnaký čas. - + CSync could not detect the filesystem type. Detekcia súborového systému vrámci "CSync" zlyhala. - + CSync got an error while processing internal trees. Spracovanie "vnútorných stromov" vrámci "CSync" zlyhalo. - + CSync failed to reserve memory. CSync sa nepodarilo zarezervovať pamäť. - + CSync fatal parameter error. CSync kritická chyba parametrov. - + CSync processing step update failed. CSync sa nepodarilo spracovať krok aktualizácie. - + CSync processing step reconcile failed. CSync sa nepodarilo spracovať krok zladenia. - + CSync processing step propagate failed. CSync sa nepodarilo spracovať krok propagácie. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Cieľový priečinok neexistuje.</p><p>Skontrolujte, prosím, nastavenia synchronizácie.</p> - + A remote file can not be written. Please check the remote access. Vzdialený súbor nie je možné zapísať. Prosím skontrolujte vzdialený prístup. - + The local filesystem can not be written. Please check permissions. Do lokálneho súborového systému nie je možné zapisovať. Prosím skontrolujte povolenia. - + CSync failed to connect through a proxy. CSync sa nepodarilo prihlásiť cez proxy. - + CSync could not authenticate at the proxy. CSync sa nemohol prihlásiť k proxy. - + CSync failed to lookup proxy or server. CSync sa nepodarilo nájsť proxy alebo server. - + CSync failed to authenticate at the %1 server. CSync sa nepodarilo prihlásiť na server %1. - + CSync failed to connect to the network. CSync sa nepodarilo pripojiť k sieti. - + A network connection timeout happened. - + A HTTP transmission error happened. Chyba HTTP prenosu. - + CSync failed due to not handled permission deniend. CSync zlyhalo. Nedostatočné oprávnenie. - + CSync failed to access CSync nepodaril prístup - + CSync tried to create a directory that already exists. CSync sa pokúsil vytvoriť priečinok, ktorý už existuje. - - + + CSync: No space on %1 server available. CSync: Na serveri %1 nie je žiadne voľné miesto. - + CSync unspecified error. CSync nešpecifikovaná chyba. - + Aborted by the user Zrušené používateľom - + An internal error number %1 happened. Vyskytla sa vnútorná chyba číslo %1. - + The item is not synced because of previous errors: %1 Položka nebola synchronizovaná kvôli predchádzajúcej chybe: %1 - + Symbolic links are not supported in syncing. Symbolické odkazy nie sú podporované pri synchronizácii. - + File is listed on the ignore list. Súbor je zapísaný na zozname ignorovaných. - + File contains invalid characters that can not be synced cross platform. Súbor obsahuje neplatné znaky, ktoré nemôžu byť zosynchronizované medzi platformami. - + Unable to initialize a sync journal. Nemôžem inicializovať synchronizačný žurnál. - + Cannot open the sync journal Nemožno otvoriť sync žurnál - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2025,7 +2025,7 @@ Nie je vhodné ju používať. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2138,22 +2138,27 @@ Nie je vhodné ju používať. Žiadne nedávno synchronizované položky - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Až do dnešného dňa @@ -2398,7 +2403,7 @@ Nie je vhodné ju používať. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Ak ešte nemáte vlastný ownCloud server, na stránke <a href="https://owncloud.com">owncloud.com</a> nájdete viac informácií. @@ -2537,21 +2542,16 @@ Nie je vhodné ju používať. - The server is currently unavailable - Server nie je práve dostupný - - - Preparing to sync Príprava na synchronizáciu - + Aborting... Ruším... - + Sync is paused Synchronizácia je pozastavená diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts index 3f88880bd6..eb2b2e3e7f 100644 --- a/translations/mirall_sl.ts +++ b/translations/mirall_sl.ts @@ -89,7 +89,7 @@ - + Pause Premor @@ -119,53 +119,58 @@ <b>Opomba:</b> nekatere mape, vključno s priklopljenimi mapami in mapami v souporabi, imajo morda različne omejitve. - + Resume Nadaljuj - + Confirm Folder Remove Potrdi odstranitev mape - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Ali res želite zaustaviti usklajevanje mape <i>%1</i>?</p><p><b>Opomba:</b> s tem mape iz odjemalca ne bodo odstranjene.</p> - + Confirm Folder Reset Potrdi ponastavitev mape - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Ali ste prepričani, da želite mapo <i>%1</i> ponastaviti in ponovno izgraditi podatkovno zbirko?</p><p><b>Opozorilo:</b> Možnost je zasnovana za vzdrževanje. Datoteke sicer ne bodo spremenjene, vendar pa je opravilo lahko zelo dolgotrajno in lahko traja tudi več ur. Trajanje je odvisno od velikosti mape. Možnost uporabite le, če vam to svetuje skrbnik sistema.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) od %2 prostora strežnika je v uporabi. - + No connection to %1 at <a href="%2">%3</a>. Ni povezave z %1 pri <a href="%2">%3</a>. - + No %1 connection configured. Ni nastavljenih %1 povezav. - + Sync Running Usklajevanje je v teku @@ -175,34 +180,34 @@ Ni nastavljenega računa. - + The syncing operation is running.<br/>Do you want to terminate it? Izvaja se usklajevanje.<br/>Ali želite opravilo prekiniti? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. Vzpostavljena je povezava s strežnikom <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Vzpostavljena je povezava z <a href="%1">%2</a> kot <i>%3</i>. - + Currently there is no storage usage information available. Trenutno ni na voljo nobenih podatkov o porabi prostora. @@ -281,73 +286,73 @@ Total time left %5 %1 ni mogoče brati. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. Datoteka %1 in %2 drugih datotek je odstranjenih. - + %1 has been removed. %1 names a file. Datoteka %1 je odstranjena. - + %1 and %2 other files have been downloaded. %1 names a file. Datoteka %1 in %2 drugih datotek je prejetih. - + %1 has been downloaded. %1 names a file. Datoteka %1 je prejeta. - + %1 and %2 other files have been updated. %1 in %2 drugih datotek je posodobljenih. - + %1 has been updated. %1 names a file. Datoteka %1 je posodobljena. - + %1 has been renamed to %2 and %3 other files have been renamed. Datoteka %1 je preimenovana v %2. Preimenovanih je bilo še %3 datotek. - + %1 has been renamed to %2. %1 and %2 name files. Datoteka %1 je preimenovana v %2. - + %1 has been moved to %2 and %3 other files have been moved. Datoteka %1 je premaknjena v %2. Premaknjenih je bilo še %3 datotek. - + %1 has been moved to %2. Datoteka %1 je premaknjena v %2. - + Sync Activity Dejavnost usklajevanja - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -356,17 +361,17 @@ Mapa je bila morda odstranjena ali pa so bile nastavitve spremenjene. Ali sta prepričani, da želite izvesti to opravilo? - + Remove All Files? Ali naj bodo odstranjene vse datoteke? - + Remove all files Odstrani vse datoteke - + Keep files Ohrani datoteke @@ -384,57 +389,52 @@ Ali sta prepričani, da želite izvesti to opravilo? Obstaja starejši dnevnik usklajevanja '%1', vendar ga ni mogoče odstraniti. Preverite, da datoteka ni v uporabi. - + Undefined State. Nedoločeno stanje. - + Waits to start syncing. V čakanju na začetek usklajevanja. - + Preparing for sync. Poteka priprava za usklajevanje. - + Sync is running. Usklajevanje je v teku. - - Server is currently not available. - Strežnik trenutno ni na voljo. - - - + Last Sync was successful. Zadnje usklajevanje je bilo uspešno končano. - + Last Sync was successful, but with warnings on individual files. Zadnje usklajevanje je bilo sicer uspešno, vendar z opozorili za posamezne datoteke. - + Setup Error. Napaka nastavitve. - + User Abort. Uporabniška prekinitev. - + Sync is paused. Usklajevanje je začasno v premoru. - + %1 (Sync is paused) %1 (usklajevanje je v premoru) @@ -1500,27 +1500,27 @@ Te je treba uskladiti znova. Nastavitve - + %1 %1 - + Activity Dejavnost - + General Splošno - + Network Omrežje - + Account Račun @@ -1788,229 +1788,229 @@ Te je treba uskladiti znova. Mirall::SyncEngine - + Success. Uspešno končano. - + CSync failed to create a lock file. Ustvarjanje datoteke zaklepa s CSync je spodletelo. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. Nalaganje ali ustvarjanje dnevniške datoteke s CSync je spodletelo. Za to opravilo so zahtevana posebna dovoljenja krajevne mape za usklajevanje. - + CSync failed to write the journal file. Zapisovanje dnevniške datoteke s CSync je spodletelo. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Vstavka %1 za CSync ni mogoče naložiti.<br/>Preverite namestitev!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Sistemski čas na odjemalcu ni skladen s sistemskim časom na strežniku. Priporočljivo je uporabiti storitev usklajevanja časa (NTP) na strežniku in odjemalcu. S tem omogočimo ujemanje podatkov o času krajevnih in oddaljenih datotek. - + CSync could not detect the filesystem type. Zaznavanje vrste datotečnega sistema s CSync je spodletelo. - + CSync got an error while processing internal trees. Pri obdelavi notranje drevesne strukture s CSync je prišlo do napake. - + CSync failed to reserve memory. Vpisovanje prostora v pomnilniku za CSync je spodletelo. - + CSync fatal parameter error. Usodna napaka parametra CSync. - + CSync processing step update failed. Korak opravila posodobitve CSync je spodletel. - + CSync processing step reconcile failed. Korak opravila poravnave CSync je spodletel. - + CSync processing step propagate failed. Korak opravila razširjanja CSync je spodletel. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Ciljna mapa ne obstaja.</p><p>Preveriti je treba nastavitve usklajevanja.</p> - + A remote file can not be written. Please check the remote access. Oddaljene datoteke ni mogoče zapisati. Najverjetneje je vzrok v oddaljenem dostopu. - + The local filesystem can not be written. Please check permissions. V krajevni datotečni sistem ni mogoče pisati. Najverjetneje je vzrok v neustreznih dovoljenjih. - + CSync failed to connect through a proxy. Povezava CSync preko posredniškega strežnika je spodletel. - + CSync could not authenticate at the proxy. Overitev CSync na posredniškem strežniku je spodletela. - + CSync failed to lookup proxy or server. Poizvedba posredniškega strežnika s CSync je spodletela. - + CSync failed to authenticate at the %1 server. Overitev CSync pri strežniku %1 je spodletela. - + CSync failed to connect to the network. Povezava CSync v omrežje je spodletela. - + A network connection timeout happened. - + A HTTP transmission error happened. Prišlo je do napake med prenosom HTTP. - + CSync failed due to not handled permission deniend. Delovanje CSync je zaradi neustreznih dovoljenj spodletelo. - + CSync failed to access Dostop s CSync je spodletel - + CSync tried to create a directory that already exists. Prišlo je do napake programa CSync zaradi poskusa ustvarjanja mape z že obstoječim imenom. - - + + CSync: No space on %1 server available. Odziv CSync: na strežniku %1 ni razpoložljivega prostora. - + CSync unspecified error. Nedoločena napaka CSync. - + Aborted by the user Opravilo je bilo prekinjeno s strani uporabnika - + An internal error number %1 happened. Prišlo je do notranje napake številka %1. - + The item is not synced because of previous errors: %1 Predmet ni usklajen zaradi predhodne napake: %1 - + Symbolic links are not supported in syncing. Usklajevanje simbolnih povezav ni podprto. - + File is listed on the ignore list. Datoteka je na seznamu prezrtih datotek. - + File contains invalid characters that can not be synced cross platform. Ime datoteke vsebuje neveljavne znake, ki niso podprti na vseh okoljih. - + Unable to initialize a sync journal. Dnevnika usklajevanja ni mogoče začeti. - + Cannot open the sync journal Ni mogoče odpreti dnevnika usklajevanja - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination cilj - + the source vir @@ -2026,7 +2026,7 @@ Te je treba uskladiti znova. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2139,22 +2139,27 @@ Te je treba uskladiti znova. Ni nedavno usklajenih predmetov - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) Poteka usklajevanje %1 od %2 (preostaja %3) - + Syncing %1 (%2 left) Usklajevanje %1 (%2 do konca) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Ni posodobitev @@ -2399,7 +2404,7 @@ Te je treba uskladiti znova. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! V primeru, da lastnega strežnika ownCloud še nimate, za več podrobnosti o možnostih obiščite spletišče <a href="https://owncloud.com">owncloud.com</a>. @@ -2538,21 +2543,16 @@ Te je treba uskladiti znova. - The server is currently unavailable - Strežnik trenutno ni na voljo - - - Preparing to sync Priprava na usklajevanje - + Aborting... Poteka prekinjanje ... - + Sync is paused Usklajevanje je ustavljeno diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts index e8b0b817dc..6dde23ca6d 100644 --- a/translations/mirall_sv.ts +++ b/translations/mirall_sv.ts @@ -89,7 +89,7 @@ - + Pause Paus @@ -119,53 +119,58 @@ <b>Notera:</b> Vissa mappar, inklusive nätverksmonterade eller delade mappar, kan ha olika begränsningar - + Resume Återuppta - + Confirm Folder Remove Bekräfta radering av mapp - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Vill du verkligen stoppa synkroniseringen av mappen <i>%1</i>?</p><p><b>Notera:</b> Detta kommer inte att radera filerna från din klient.</p> - + Confirm Folder Reset Bekräfta återställning av mapp - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Vill du verkligen nollställa mappen <i>%1</i> och återställa din databas?</p><p><b>Notera:</b> Denna funktion är endast designad för underhållsuppgifter. Inga filer raderas, men kan skapa mycket datatrafik och ta allt från några minuter till flera timmar att slutföra, beroende på storleken på mappen. Använd endast detta alternativ om du har blivit uppmanad av din systemadministratör.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) av %2 server utrymme används. - + No connection to %1 at <a href="%2">%3</a>. Ingen anslutning till %1 vid <a href="%2">%3</a> - + No %1 connection configured. Ingen %1 anslutning konfigurerad. - + Sync Running Synkronisering pågår @@ -175,35 +180,35 @@ Inget konto är konfigurerat. - + The syncing operation is running.<br/>Do you want to terminate it? En synkronisering pågår.<br/>Vill du avbryta den? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 of %4) %5 återstående. Hastighet %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 av %2, fil %3 av %4 Tid kvar %5 - + Connected to <a href="%1">%2</a>. Ansluten till <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Ansluten till <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. Just nu finns ingen utrymmes information tillgänglig @@ -282,73 +287,73 @@ Tid kvar %5 %1 är inte läsbar. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 och %2 andra filer har tagits bort. - + %1 has been removed. %1 names a file. %1 har tagits bort. - + %1 and %2 other files have been downloaded. %1 names a file. %1 och %2 andra filer har laddats ner. - + %1 has been downloaded. %1 names a file. %1 har laddats ner. - + %1 and %2 other files have been updated. %1 och %2 andra filer har uppdaterats. - + %1 has been updated. %1 names a file. %1 har uppdaterats. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 har döpts om till %2 och %3 andra filer har bytt namn. - + %1 has been renamed to %2. %1 and %2 name files. %1 har döpts om till %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 har flyttats till %2 och %3 andra filer har tagits bort. - + %1 has been moved to %2. %1 har flyttats till %2. - + Sync Activity Synk aktivitet - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -357,17 +362,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file Är du säker på att du vill fortsätta? - + Remove All Files? Ta bort alla filer? - + Remove all files Ta bort alla filer - + Keep files Behåll filer @@ -385,57 +390,52 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file En gammal synkroniseringsjournal '%1' hittades, men kunde inte raderas. Vänligen se till att inga program för tillfället använder den. - + Undefined State. Okänt tillstånd. - + Waits to start syncing. Väntar på att starta synkronisering. - + Preparing for sync. Förbereder synkronisering - + Sync is running. Synkronisering pågår. - - Server is currently not available. - Servern är för tillfället inte tillgänglig. - - - + Last Sync was successful. Senaste synkronisering lyckades. - + Last Sync was successful, but with warnings on individual files. Senaste synkning lyckades, men det finns varningar för vissa filer! - + Setup Error. Inställningsfel. - + User Abort. Användare Avbryt - + Sync is paused. Synkronisering är pausad. - + %1 (Sync is paused) %1 (Synk är stoppad) @@ -1501,27 +1501,27 @@ Försök att synka dessa igen. Inställningar - + %1 %1 - + Activity Aktivitet - + General Allmänt - + Network Nätverk - + Account Konto @@ -1789,229 +1789,229 @@ Försök att synka dessa igen. Mirall::SyncEngine - + Success. Lyckades. - + CSync failed to create a lock file. CSync misslyckades med att skapa en låsfil. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync misslyckades att skapa en journal fil. Se till att du har läs och skriv rättigheter i den lokala synk katalogen. - + CSync failed to write the journal file. CSynk misslyckades att skriva till journal filen. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Plugin %1 för csync kunde inte laddas.<br/>Var god verifiera installationen!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Systemtiden på denna klientdator är annorlunda än systemtiden på servern. Använd en tjänst för tidssynkronisering (NTP) på servern och alla klientdatorer så att tiden är lika. - + CSync could not detect the filesystem type. CSync kunde inte upptäcka filsystemtyp. - + CSync got an error while processing internal trees. CSYNC fel vid intern bearbetning. - + CSync failed to reserve memory. CSync misslyckades att reservera minne. - + CSync fatal parameter error. CSync fatal parameter fel. - + CSync processing step update failed. CSync processteg update misslyckades. - + CSync processing step reconcile failed. CSync processteg reconcile misslyckades. - + CSync processing step propagate failed. CSync processteg propagate misslyckades. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Målmappen finns inte</p><p>Vänligen, kontroller inställningen för sync.</p> - + A remote file can not be written. Please check the remote access. En fil på servern kan inte skapas. Kontrollera åtkomst till fjärranslutningen. - + The local filesystem can not be written. Please check permissions. Kan inte skriva till det lokala filsystemet. Var god kontrollera rättigheterna. - + CSync failed to connect through a proxy. CSync misslyckades att ansluta genom en proxy. - + CSync could not authenticate at the proxy. CSync kunde inte autentisera mot proxy. - + CSync failed to lookup proxy or server. CSync misslyckades att hitta proxy eller server. - + CSync failed to authenticate at the %1 server. CSync misslyckades att autentisera mot %1 servern. - + CSync failed to connect to the network. CSync misslyckades att ansluta mot nätverket. - + A network connection timeout happened. En timeout på nätverksanslutningen har inträffat. - + A HTTP transmission error happened. Ett HTTP överföringsfel inträffade. - + CSync failed due to not handled permission deniend. CSYNC misslyckades på grund av att nekad åtkomst inte hanterades. - + CSync failed to access CSynk misslyckades att tillträda - + CSync tried to create a directory that already exists. CSync försökte skapa en mapp som redan finns. - - + + CSync: No space on %1 server available. CSync: Ingen plats på %1 server tillgänglig. - + CSync unspecified error. CSync ospecificerat fel. - + Aborted by the user Avbruten av användare - + An internal error number %1 happened. Ett internt fel hände. nummer %1 - + The item is not synced because of previous errors: %1 Objektet kunde inte synkas på grund av tidigare fel: %1 - + Symbolic links are not supported in syncing. Symboliska länkar stöds ej i synkningen. - + File is listed on the ignore list. Filen är listad i ignorerings listan. - + File contains invalid characters that can not be synced cross platform. Filen innehåller ogiltiga tecken som inte kan synkas oberoende av plattform. - + Unable to initialize a sync journal. Kan inte initialisera en synk journal. - + Cannot open the sync journal Kunde inte öppna synk journalen - + Not allowed because you don't have permission to add sub-directories in that directory Går ej att genomföra då du saknar rättigheter att lägga till underkataloger i den katalogen - + Not allowed because you don't have permission to add parent directory Går ej att genomföra då du saknar rättigheter att lägga till någon moderkatalog - + Not allowed because you don't have permission to add files in that directory Går ej att genomföra då du saknar rättigheter att lägga till filer i den katalogen - + Not allowed to upload this file because it is read-only on the server, restoring Inte behörig att ladda upp denna fil då den är skrivskyddad på servern, återställer - - + + Not allowed to remove, restoring Inte behörig att radera, återställer - + Move not allowed, item restored Det gick inte att genomföra flytten, objektet återställs - + Move not allowed because %1 is read-only Det gick inte att genomföra flytten då %1 är skrivskyddad - + the destination destinationen - + the source källan @@ -2027,7 +2027,7 @@ Försök att synka dessa igen. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2140,22 +2140,27 @@ Försök att synka dessa igen. Inga filer har synkroniseras nyligen - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) Synkroniserar %1 av %2 (%3 kvar) - + Syncing %1 (%2 left) Synkroniserar %1 (%2 kvar) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Aktuell version @@ -2400,7 +2405,7 @@ Försök att synka dessa igen. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Om du inte har en ownCloud-server ännu, besök <a href="https://owncloud.com">owncloud.com</a> för mer info. @@ -2539,21 +2544,16 @@ Försök att synka dessa igen. - The server is currently unavailable - Servern är för närvarande inte tillgänglig - - - Preparing to sync Förbereder synkronisering - + Aborting... Avbryter - + Sync is paused Synk är pausad diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts index a430466df0..c44d831fda 100644 --- a/translations/mirall_th.ts +++ b/translations/mirall_th.ts @@ -89,7 +89,7 @@ - + Pause หยุดชั่วคราว @@ -119,53 +119,58 @@ - + Resume ดำเนินการต่อ - + Confirm Folder Remove ยืนยันการลบโฟลเดอร์ - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> - + Confirm Folder Reset - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. ยังไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า - + Sync Running การซิงค์ข้อมูลกำลังทำงาน @@ -175,34 +180,34 @@ - + The syncing operation is running.<br/>Do you want to terminate it? การดำเนินการเพื่อถ่ายโอนข้อมูลกำลังทำงานอยู่ <br/>คุณต้องการสิ้นสุดการทำงานหรือไม่? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. @@ -281,90 +286,90 @@ Total time left %5 ไม่สามารถอ่านข้อมูล %1 ได้ - + %1: %2 - + %1 and %2 other files have been removed. %1 names a file. - + %1 has been removed. %1 names a file. - + %1 and %2 other files have been downloaded. %1 names a file. - + %1 has been downloaded. %1 names a file. - + %1 and %2 other files have been updated. - + %1 has been updated. %1 names a file. - + %1 has been renamed to %2 and %3 other files have been renamed. - + %1 has been renamed to %2. %1 and %2 name files. - + %1 has been moved to %2 and %3 other files have been moved. - + %1 has been moved to %2. - + Sync Activity - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? - + Remove All Files? - + Remove all files - + Keep files @@ -382,57 +387,52 @@ Are you sure you want to perform this operation? - + Undefined State. สถานะที่ยังไม่ได้ถูกกำหนด - + Waits to start syncing. รอการเริ่มต้นซิงค์ข้อมูล - + Preparing for sync. - + Sync is running. การซิงค์ข้อมูลกำลังทำงาน - - Server is currently not available. - - - - + Last Sync was successful. การซิงค์ข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว - + Last Sync was successful, but with warnings on individual files. - + Setup Error. เกิดข้อผิดพลาดในการติดตั้ง - + User Abort. - + Sync is paused. การซิงค์ข้อมูลถูกหยุดไว้ชั่วคราว - + %1 (Sync is paused) @@ -1493,27 +1493,27 @@ It is not advisable to use it. ตั้งค่า - + %1 - + Activity - + General ทั่วไป - + Network - + Account @@ -1779,229 +1779,229 @@ It is not advisable to use it. Mirall::SyncEngine - + Success. เสร็จสิ้น - + CSync failed to create a lock file. CSync ล้มเหลวในการสร้างไฟล์ล็อคข้อมูล - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. - + CSync failed to write the journal file. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>ปลั๊กอิน %1 สำหรับ csync could not be loadeไม่สามารถโหลดได้.<br/>กรุณาตรวจสอบความถูกต้องในการติดตั้ง!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. เวลาในระบบของโปรแกรมไคลเอนต์นี้แตกต่างจากเวลาในระบบของเซิร์ฟเวอร์ กรุณาใช้บริการผสานข้อมูลของเวลา (NTP) บนเซิร์ฟเวอร์และเครื่องไคลเอนต์เพื่อปรับเวลาให้ตรงกัน - + CSync could not detect the filesystem type. CSync ไม่สามารถตรวจพบประเภทของไฟล์ในระบบได้ - + CSync got an error while processing internal trees. CSync เกิดข้อผิดพลาดบางประการในระหว่างประมวลผล internal trees - + CSync failed to reserve memory. การจัดสรรหน่วยความจำ CSync ล้มเหลว - + CSync fatal parameter error. พบข้อผิดพลาดเกี่ยวกับ CSync fatal parameter - + CSync processing step update failed. การอัพเดทขั้นตอนการประมวลผล CSync ล้มเหลว - + CSync processing step reconcile failed. การปรับปรุงขั้นตอนการประมวลผล CSync ล้มเหลว - + CSync processing step propagate failed. การถ่ายทอดขั้นตอนการประมวลผล CSync ล้มเหลว - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> - + A remote file can not be written. Please check the remote access. ไม่สามารถเขียนข้อมูลไปยังไฟล์ระยะไกลได้ กรุณาตรวจสอบการเข้าถึงข้อมูลระยะไกล - + The local filesystem can not be written. Please check permissions. ระบบไฟล์ในพื้นที่ไม่สามารถเขียนข้อมูลได้ กรุณาตรวจสอบสิทธิ์การเข้าใช้งาน - + CSync failed to connect through a proxy. CSync ล้มเหลวในการเชื่อมต่อผ่านทางพร็อกซี่ - + CSync could not authenticate at the proxy. - + CSync failed to lookup proxy or server. CSync ไม่สามารถค้นหาพร็อกซี่บนเซิร์ฟเวอร์ได้ - + CSync failed to authenticate at the %1 server. CSync ล้มเหลวในการยืนยันสิทธิ์การเข้าใช้งานที่เซิร์ฟเวอร์ %1 - + CSync failed to connect to the network. CSync ล้มเหลวในการเชื่อมต่อกับเครือข่าย - + A network connection timeout happened. - + A HTTP transmission error happened. เกิดข้อผิดพลาดเกี่ยวกับ HTTP transmission - + CSync failed due to not handled permission deniend. CSync ล้มเหลว เนื่องจากไม่สามารถจัดการกับการปฏิเสธให้เข้าใช้งานได้ - + CSync failed to access - + CSync tried to create a directory that already exists. CSync ได้พยายามที่จะสร้างไดเร็กทอรี่ที่มีอยู่แล้ว - - + + CSync: No space on %1 server available. CSync: ไม่มีพื้นที่เหลือเพียงพอบนเซิร์ฟเวอร์ %1 - + CSync unspecified error. CSync ไม่สามารถระบุข้อผิดพลาดได้ - + Aborted by the user - + An internal error number %1 happened. - + The item is not synced because of previous errors: %1 - + Symbolic links are not supported in syncing. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2017,7 +2017,7 @@ It is not advisable to use it. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2130,22 +2130,27 @@ It is not advisable to use it. - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date @@ -2390,7 +2395,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! @@ -2529,21 +2534,16 @@ It is not advisable to use it. - The server is currently unavailable - - - - Preparing to sync - + Aborting... - + Sync is paused diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts index 35ca36617e..6fc6ec291a 100644 --- a/translations/mirall_tr.ts +++ b/translations/mirall_tr.ts @@ -89,7 +89,7 @@ - + Pause Duraklat @@ -119,53 +119,58 @@ <b>Not:</b> Ağa bağlanmış veya paylaşılan klasörler de dahil olmak üzere bazı klasörler, farklı sınırlara sahip olabilirler. - + Resume Devam et - + Confirm Folder Remove Klasör Kaldırma İşlemini Onayla - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Gerçekten <i>%1</i> klasörünü eşitlemeyi durdurmak istiyor musunuz?</p><p><b>Not:</b> Bu işlem dosyaları istemcinizden kaldırmayacaktır.</p> - + Confirm Folder Reset Klasör Sıfırlamayı Onayla - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Gerçekten <i>%1</i> klasörünü sıfırlamak ve istemci veritabanını yeniden inşa etmek istiyor musunuz?</p><p><b>Not:</b> Bu işlev sadece bakım amaçlı tasarlandı. Hiçbir dosya kaldırılmayacak, fakat bu işlem büyük veri trafiğine sebep olabilir ve klasör boyutuna bağlı olarak tamamlanması birkaç dakikadan birkaç saate kadar sürebilir. Bu seçeneği sadece yöneticiniz tarafından istenmişse kullanın.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. Sunucudaki %2'lık kotanın %1'ı (%%3) kullanılıyor. - + No connection to %1 at <a href="%2">%3</a>. <a href="%2">%3</a> üzerinde %1 bağlantısı yok. - + No %1 connection configured. Hiç %1 bağlantısı yapılandırılmamış. - + Sync Running Eşitleme Çalışıyor @@ -175,35 +180,35 @@ Hiçbir hesap yapılandırılmamış. - + The syncing operation is running.<br/>Do you want to terminate it? Eşitleme işlemi devam ediyor.<br/>Durdurmak istiyor musunuz? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3/%4) %6/s aktarım hızında kalan %5 - + %1 of %2, file %3 of %4 Total time left %5 %1/%2, dosya %3/%4 Toplam kalan süre %5 - + Connected to <a href="%1">%2</a>. <a href="%1">%2</a> ile bağlı. - + Connected to <a href="%1">%2</a> as <i>%3</i>. <a href="%1">%2</a> bağlantısı <i>%3</i> olarak yapıldı. - + Currently there is no storage usage information available. Şu anda depolama kullanım bilgisi mevcut değil. @@ -282,73 +287,73 @@ Toplam kalan süre %5 %1 okunabilir değil. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 ve diğer %2 dosya kaldırıldı. - + %1 has been removed. %1 names a file. %1 kaldırıldı. - + %1 and %2 other files have been downloaded. %1 names a file. %1 ve diğer %2 dosya indirildi. - + %1 has been downloaded. %1 names a file. %1 indirildi. - + %1 and %2 other files have been updated. %1 ve diğer %2 dosya güncellendi. - + %1 has been updated. %1 names a file. %1 güncellendi. - + %1 has been renamed to %2 and %3 other files have been renamed. %1, %2 olarak ve diğer %3 dosya adlandırıldı. - + %1 has been renamed to %2. %1 and %2 name files. %1, %2 olarak adlandırıldı. - + %1 has been moved to %2 and %3 other files have been moved. %1, %2 konumuna ve diğer %3 dosya taşındı. - + %1 has been moved to %2. %1, %2 konumuna taşındı. - + Sync Activity Eşitleme Etkinliği - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -357,17 +362,17 @@ Bu, klasörün sessizce yeniden yapılandırılması veya tüm dosyaların el il Bu işlemi gerçekleştirmek istediğinize emin misiniz? - + Remove All Files? Tüm Dosyalar Kaldırılsın mı? - + Remove all files Tüm dosyaları kaldır - + Keep files Dosyaları koru @@ -385,57 +390,52 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz? Eski eşitleme günlüğü '%1' bulundu ancak kaldırılamadı. Başka bir uygulama tarafından kullanılmadığından emin olun. - + Undefined State. Tanımlanmamış Durum. - + Waits to start syncing. Eşitleme başlatmak için bekleniyor. - + Preparing for sync. Eşitleme için hazırlanıyor. - + Sync is running. Eşitleme çalışıyor. - - Server is currently not available. - Sunucu şu an kullanılabilir değil. - - - + Last Sync was successful. Son Eşitleme başarılı oldu. - + Last Sync was successful, but with warnings on individual files. Son eşitleme başarılıydı, ancak tekil dosyalarda uyarılar vardı. - + Setup Error. Kurulum Hatası. - + User Abort. Kullanıcı İptal Etti. - + Sync is paused. Eşitleme duraklatıldı. - + %1 (Sync is paused) %1 (Eşitleme duraklatıldı) @@ -1501,27 +1501,27 @@ Bu dosyaları tekrar eşitlemeyi deneyin. Ayarlar - + %1 %1 - + Activity Etkinlik - + General Genel - + Network Ağ - + Account Hesap @@ -1789,229 +1789,229 @@ Bu dosyaları tekrar eşitlemeyi deneyin. Mirall::SyncEngine - + Success. Başarılı. - + CSync failed to create a lock file. CSync bir kilit dosyası oluşturamadı. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync, günlük dosyası yükleyemedi veya oluşturamadı. Lütfen yerel eşitleme dizininde okuma ve yazma izinleriniz olduğundan emin olun. - + CSync failed to write the journal file. CSync günlük dosyasına yazamadı. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Csync için %1 eklentisi yüklenemedi.<br/>Lütfen kurulumu doğrulayın!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Bu istemci üzerinde sistem saati sunucudaki sistem saati ile farklı. Sunucu ve istemci makinelerde bir zaman eşitleme hizmeti (NTP) kullanırsanız zaman aynı kalır. - + CSync could not detect the filesystem type. CSync dosya sistemi türünü tespit edemedi. - + CSync got an error while processing internal trees. CSync dahili ağaçları işlerken bir hata ile karşılaştı. - + CSync failed to reserve memory. CSync bellek ayıramadı. - + CSync fatal parameter error. CSync ciddi parametre hatası. - + CSync processing step update failed. CSync güncelleme süreç adımı başarısız. - + CSync processing step reconcile failed. CSync uzlaştırma süreç adımı başarısız. - + CSync processing step propagate failed. CSync yayma süreç adımı başarısız. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Hedef dizin mevcut değil.</p><p>Lütfen eşitleme ayarını denetleyin.</p> - + A remote file can not be written. Please check the remote access. Bir uzak dosya yazılamıyor. Lütfen uzak erişimi denetleyin. - + The local filesystem can not be written. Please check permissions. Yerel dosya sistemine yazılamıyor. Lütfen izinleri kontrol edin. - + CSync failed to connect through a proxy. CSync bir vekil sunucu aracılığıyla bağlanırken hata oluştu. - + CSync could not authenticate at the proxy. CSync vekil sunucuda kimlik doğrulayamadı. - + CSync failed to lookup proxy or server. CSync bir vekil veya sunucu ararken başarısız oldu. - + CSync failed to authenticate at the %1 server. CSync %1 sunucusunda kimlik doğrularken başarısız oldu. - + CSync failed to connect to the network. CSync ağa bağlanamadı. - + A network connection timeout happened. Bir ağ zaman aşımı meydana geldi. - + A HTTP transmission error happened. Bir HTTP aktarım hatası oluştu. - + CSync failed due to not handled permission deniend. CSync ele alınmayan izin reddinden dolayı başarısız. - + CSync failed to access CSync erişemedi: - + CSync tried to create a directory that already exists. CSync, zaten mevcut olan bir dizin oluşturmaya çalıştı. - - + + CSync: No space on %1 server available. CSync: %1 sunucusunda kullanılabilir alan yok. - + CSync unspecified error. CSync belirtilmemiş hata. - + Aborted by the user Kullanıcı tarafından iptal edildi - + An internal error number %1 happened. %1 numaralı bir hata oluştu. - + The item is not synced because of previous errors: %1 Bu öge önceki hatalar koşullarından dolayı eşitlenemiyor: %1 - + Symbolic links are not supported in syncing. Sembolik bağlantılar eşitlemede desteklenmiyor. - + File is listed on the ignore list. Dosya yoksayma listesinde. - + File contains invalid characters that can not be synced cross platform. Dosya, çapraz platform arasında eşitlenemeyecek karakterler içeriyor. - + Unable to initialize a sync journal. Bir eşitleme günlüğü başlatılamadı. - + Cannot open the sync journal Eşitleme günlüğü açılamıyor - + Not allowed because you don't have permission to add sub-directories in that directory Bu dizine alt dizin ekleme yetkiniz olmadığından izin verilmedi - + Not allowed because you don't have permission to add parent directory Üst dizin ekleme yetkiniz olmadığından izin verilmedi - + Not allowed because you don't have permission to add files in that directory Bu dizine dosya ekleme yetkiniz olmadığından izin verilmedi - + Not allowed to upload this file because it is read-only on the server, restoring Sunucuda salt okunur olduğundan, bu dosya yüklenemedi, geri alınıyor - - + + Not allowed to remove, restoring Kaldırmaya izin verilmedi, geri alınıyor - + Move not allowed, item restored Taşımaya izin verilmedi, öge geri alındı - + Move not allowed because %1 is read-only %1 salt okunur olduğundan taşımaya izin verilmedi - + the destination hedef - + the source kaynak @@ -2027,9 +2027,9 @@ Bu dosyaları tekrar eşitlemeyi deneyin. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - + <p>Sürüm %1 Daha fazla bilgi için lütfen <a href='%2'>%3</a> adresini ziyaret edin.</p><p>Telif hakkı ownCloud, Inc.</p><p>Dağıtım %4 ve GNU Genel Kamu Lisansı (GPL) Sürüm 2.0 ile lisanslanmıştır olup <br>%5 ve %5 logoları ABD ve/veya diğer ülkelerde %4 tescili markalarıdır.</p> @@ -2140,22 +2140,27 @@ Bu dosyaları tekrar eşitlemeyi deneyin. Yakın zamanda eşitlenen öge yok - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) Eşitlenen %1/%2 (%3 kaldı) - + Syncing %1 (%2 left) Eşitlenen %1 (%2 kaldı) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Güncel @@ -2400,7 +2405,7 @@ Bu dosyaları tekrar eşitlemeyi deneyin. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Eğer hala bir ownCloud sunucunuz yoksa, daha fazla bilgi için <a href="https://owncloud.com">owncloud.com</a> adresine bakın. @@ -2416,7 +2421,7 @@ Bu dosyaları tekrar eşitlemeyi deneyin. <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 - + <p>Sürüm %2. Daha fazla bilgi için lütfen <a href="%3">%4</a> adresini ziyaret edin.</p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz ve diğerleri.<br>Duncan Mac-Vicar P. tarafından yazılmış Mirall tabanlıdır.</small></p><p>Telif hakkı ownCloud, Inc.</p><p>GNU Genel Kamu Lisansı (GPL) Sürüm 2.0 ile lisanslanmıştır.<br>ownCloud ve ownCloud logoları <br>ABD ve/veya diğer ülkelerde %4 tescili markalarıdır.</p>%7 @@ -2539,21 +2544,16 @@ Bu dosyaları tekrar eşitlemeyi deneyin. - The server is currently unavailable - Sunucu şu anda kullanılamıyor - - - Preparing to sync Eşitleme için hazırlanıyor - + Aborting... İptal ediliyor... - + Sync is paused Eşitleme duraklatıldı diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts index 755bc5afa7..3c54f29c3f 100644 --- a/translations/mirall_uk.ts +++ b/translations/mirall_uk.ts @@ -89,7 +89,7 @@ - + Pause Пауза @@ -119,53 +119,58 @@ - + Resume Відновлення - + Confirm Folder Remove Підтвердіть видалення каталогу - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Дійсно бажаєте зупинити синхронізацію теки <i>%1</i>?</p><p><b>Примітка:</b> Файли у вашому клієнті не будуть видалені.</p> - + Confirm Folder Reset - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. Жодного %1 підключення не налаштовано. - + Sync Running Виконується синхронізація @@ -175,34 +180,34 @@ - + The syncing operation is running.<br/>Do you want to terminate it? Виконується процедура синхронізації.<br/>Бажаєте відмінити? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. @@ -281,73 +286,73 @@ Total time left %5 %1 не читається. - + %1: %2 - + %1 and %2 other files have been removed. %1 names a file. - + %1 has been removed. %1 names a file. - + %1 and %2 other files have been downloaded. %1 names a file. - + %1 has been downloaded. %1 names a file. - + %1 and %2 other files have been updated. - + %1 has been updated. %1 names a file. - + %1 has been renamed to %2 and %3 other files have been renamed. - + %1 has been renamed to %2. %1 and %2 name files. - + %1 has been moved to %2 and %3 other files have been moved. - + %1 has been moved to %2. - + Sync Activity - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -356,17 +361,17 @@ Are you sure you want to perform this operation? Ви дійсно бажаєте продовжити цю операцію? - + Remove All Files? Видалити усі файли? - + Remove all files Видалити усі файли - + Keep files Зберегти файли @@ -384,57 +389,52 @@ Are you sure you want to perform this operation? - + Undefined State. Невизначений стан. - + Waits to start syncing. Очікування початку синхронізації. - + Preparing for sync. Підготовка до синхронізації - + Sync is running. Синхронізація запущена. - - Server is currently not available. - Сервер наразі недоступний. - - - + Last Sync was successful. Остання синхронізація була успішною. - + Last Sync was successful, but with warnings on individual files. - + Setup Error. Помилка установки. - + User Abort. - + Sync is paused. - + %1 (Sync is paused) @@ -1495,27 +1495,27 @@ It is not advisable to use it. Налаштування - + %1 - + Activity Активність - + General Загалом - + Network Мережа - + Account Обліковий запис @@ -1781,229 +1781,229 @@ It is not advisable to use it. Mirall::SyncEngine - + Success. Успішно. - + CSync failed to create a lock file. CSync не вдалося створити файл блокування. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. - + CSync failed to write the journal file. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p> %1 плагін для синхронізації не вдалося завантажити.<br/>Будь ласка, перевірте його інсталяцію!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Системний час цього клієнта відрізняється від системного часу на сервері. Будь ласка, використовуйте сервіс синхронізації часу (NTP) на сервері та клієнті, аби час був однаковий. - + CSync could not detect the filesystem type. CSync не вдалося визначити тип файлової системи. - + CSync got an error while processing internal trees. У CSync виникла помилка під час сканування внутрішньої структури каталогів. - + CSync failed to reserve memory. CSync не вдалося зарезервувати пам'ять. - + CSync fatal parameter error. У CSync сталася фатальна помилка параметра. - + CSync processing step update failed. CSync не вдалася зробити оновлення . - + CSync processing step reconcile failed. CSync не вдалася зробити врегулювання. - + CSync processing step propagate failed. CSync не вдалася зробити розповсюдження. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> - + A remote file can not be written. Please check the remote access. Не можливо проводити запис у віддалену файлову систему. Будь ласка, перевірте повноваження доступу. - + The local filesystem can not be written. Please check permissions. Не можливо проводити запис у локальну файлову систему. Будь ласка, перевірте повноваження. - + CSync failed to connect through a proxy. CSync не вдалося приєднатися через Проксі. - + CSync could not authenticate at the proxy. - + CSync failed to lookup proxy or server. CSync не вдалося знайти Проксі або Сервер. - + CSync failed to authenticate at the %1 server. CSync не вдалося аутентифікуватися на %1 сервері. - + CSync failed to connect to the network. CSync не вдалося приєднатися до мережі. - + A network connection timeout happened. - + A HTTP transmission error happened. Сталася помилка передачі даних по HTTP. - + CSync failed due to not handled permission deniend. CSync завершився неуспішно через порушення прав доступу. - + CSync failed to access - + CSync tried to create a directory that already exists. CSync намагалася створити каталог, який вже існує. - - + + CSync: No space on %1 server available. CSync: на сервері %1 скінчилося місце. - + CSync unspecified error. Невизначена помилка CSync. - + Aborted by the user - + An internal error number %1 happened. - + The item is not synced because of previous errors: %1 - + Symbolic links are not supported in syncing. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2019,7 +2019,7 @@ It is not advisable to use it. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2132,22 +2132,27 @@ It is not advisable to use it. - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date @@ -2392,7 +2397,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Якщо ви ще не маєте власного сервера ownCloud, подивіться <a href="https://owncloud.com">owncloud.com</a> з цього приводу. @@ -2531,21 +2536,16 @@ It is not advisable to use it. - The server is currently unavailable - - - - Preparing to sync - + Aborting... - + Sync is paused diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts index 38f583bb47..162e8d2d9e 100644 --- a/translations/mirall_zh_CN.ts +++ b/translations/mirall_zh_CN.ts @@ -89,7 +89,7 @@ - + Pause 暂停 @@ -119,53 +119,58 @@ <b>注释：</b> 一些文件夹，例如网络挂载的和共享的文件夹，可能有不同的限制。 - + Resume 继续 - + Confirm Folder Remove 确认移除文件夹 - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>你真的要停止 <i>%1%</i> 文件夹的同步吗？</p><p><b>注释：</b>这不会删除你客户端中的文件。</p> - + Confirm Folder Reset 确认文件夹重置 - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>您真希望重置文件夹 <i>%1</i> 并重新构建您的客户端数据库吗？</p><p><b>注意：</b>此功能设计仅用作维护操作。没有文件将被移除，但这将导致大量的数据传输。根据文件夹的大小，这一过程将持续几分钟到几小时。请仅在管理员指导的情况下使用此功能。</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. 没有 %1 连接配置。 - + Sync Running 同步正在运行 @@ -175,34 +180,34 @@ 没有配置的帐号。 - + The syncing operation is running.<br/>Do you want to terminate it? 正在执行同步。<br />您确定要关闭它吗？ - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. 已连接到<a href="%1">%2</a>。 - + Connected to <a href="%1">%2</a> as <i>%3</i>. 已作为 <i>%3</i> 连接到 <a href="%1">%2</a>。 - + Currently there is no storage usage information available. 目前没有储存使用量信息可用。 @@ -281,73 +286,73 @@ Total time left %5 %1 不可读。 - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. - + %1 has been removed. %1 names a file. %1 已移除。 - + %1 and %2 other files have been downloaded. %1 names a file. - + %1 has been downloaded. %1 names a file. %1 已下载。 - + %1 and %2 other files have been updated. %1 和 %2 个其它文件已更新。 - + %1 has been updated. %1 names a file. %1 已更新。 - + %1 has been renamed to %2 and %3 other files have been renamed. - + %1 has been renamed to %2. %1 and %2 name files. - + %1 has been moved to %2 and %3 other files have been moved. - + %1 has been moved to %2. %1 已移动至 %2。 - + Sync Activity 同步活动 - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -356,17 +361,17 @@ Are you sure you want to perform this operation? 你确定执行该操作吗？ - + Remove All Files? 删除所有文件？ - + Remove all files 删除所有文件 - + Keep files 保持所有文件 @@ -384,57 +389,52 @@ Are you sure you want to perform this operation? 一个旧的同步日志 '%1' 被找到，但是不能被移除。请确定没有应用程序正在使用它。 - + Undefined State. 未知状态。 - + Waits to start syncing. 等待启动同步。 - + Preparing for sync. 准备同步。 - + Sync is running. 同步正在运行。 - - Server is currently not available. - 服务器当前是不可用的。 - - - + Last Sync was successful. 最后一次同步成功。 - + Last Sync was successful, but with warnings on individual files. 上次同步已成功，不过一些文件出现了警告。 - + Setup Error. 安装失败 - + User Abort. 用户撤销。 - + Sync is paused. 同步已暂停。 - + %1 (Sync is paused) %1 (同步已暂停) @@ -1497,27 +1497,27 @@ It is not advisable to use it. 设置 - + %1 %1 - + Activity 动态 - + General 常规 - + Network 网络 - + Account 账户 @@ -1785,229 +1785,229 @@ It is not advisable to use it. Mirall::SyncEngine - + Success. 成功。 - + CSync failed to create a lock file. CSync 无法创建文件锁。 - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. Csync同步失败，请确定是否有本地同步目录的读写权 - + CSync failed to write the journal file. CSync写日志文件失败 - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>csync 的 %1 插件不能加载。<br/>请校验安装！</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. 本客户端的系统时间和服务器的系统时间不一致。请在服务器和客户机上使用时间同步服务 (NTP)以让时间一致。 - + CSync could not detect the filesystem type. CSync 无法检测文件系统类型。 - + CSync got an error while processing internal trees. CSync 在处理内部文件树时出错。 - + CSync failed to reserve memory. CSync 失败，内存不足。 - + CSync fatal parameter error. CSync 致命参数错误。 - + CSync processing step update failed. CSync 处理步骤更新失败。 - + CSync processing step reconcile failed. CSync 处理步骤调和失败。 - + CSync processing step propagate failed. CSync 处理步骤传播失败。 - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>目标目录不存在。</p><p>请检查同步设置。</p> - + A remote file can not be written. Please check the remote access. 远程文件不可写，请检查远程权限。 - + The local filesystem can not be written. Please check permissions. 本地文件系统不可写。请检查权限。 - + CSync failed to connect through a proxy. CSync 未能通过代理连接。 - + CSync could not authenticate at the proxy. - + CSync failed to lookup proxy or server. CSync 无法查询代理或服务器。 - + CSync failed to authenticate at the %1 server. CSync 于 %1 服务器认证失败。 - + CSync failed to connect to the network. CSync 联网失败。 - + A network connection timeout happened. 网络连接超时。 - + A HTTP transmission error happened. HTTP 传输错误。 - + CSync failed due to not handled permission deniend. 出于未处理的权限拒绝，CSync 失败。 - + CSync failed to access 访问 CSync 失败 - + CSync tried to create a directory that already exists. CSync 尝试创建了已有的文件夹。 - - + + CSync: No space on %1 server available. CSync：%1 服务器空间已满。 - + CSync unspecified error. CSync 未定义错误。 - + Aborted by the user 用户撤销 - + An internal error number %1 happened. - + The item is not synced because of previous errors: %1 - + Symbolic links are not supported in syncing. 符号链接不被同步支持。 - + File is listed on the ignore list. 文件在忽略列表中。 - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. 无法初始化同步日志 - + Cannot open the sync journal 无法打开同步日志 - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2023,7 +2023,7 @@ It is not advisable to use it. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2136,22 +2136,27 @@ It is not advisable to use it. - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) %1 (%2, %3) - + Up to date 更新 @@ -2396,7 +2401,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! 如果您还没有一个 ownCloud 服务器，请到 <a href="https://owncloud.com"> 获取更多信息。 @@ -2535,21 +2540,16 @@ It is not advisable to use it. - The server is currently unavailable - 服务器当前不可用 - - - Preparing to sync 正在准备同步 - + Aborting... 正在撤销... - + Sync is paused 同步被暂停 diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts index c6f9a256e6..db74b33480 100644 --- a/translations/mirall_zh_TW.ts +++ b/translations/mirall_zh_TW.ts @@ -89,7 +89,7 @@ - + Pause 暫停 @@ -119,53 +119,58 @@ <b>注意:</b> 有些資料夾，包括網路掛載或分享資料夾，可能有不同的限制。 - + Resume 繼續 - + Confirm Folder Remove 確認移除資料夾 - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>您確定要停止同步資料夾<i>%1</i>?</p><p><b>注意:</b> 這不會從您的裝置移除檔案。</p> - + Confirm Folder Reset 資料夾重設確認 - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + + Discovering %1 + + + + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. 無%1連線設定 - + Sync Running 同步中 @@ -175,34 +180,34 @@ - + The syncing operation is running.<br/>Do you want to terminate it? 正在同步中<br/>你真的想要中斷？ - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. @@ -281,90 +286,90 @@ Total time left %5 %1 是不可讀的 - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. - + %1 has been removed. %1 names a file. - + %1 and %2 other files have been downloaded. %1 names a file. - + %1 has been downloaded. %1 names a file. - + %1 and %2 other files have been updated. - + %1 has been updated. %1 names a file. - + %1 has been renamed to %2 and %3 other files have been renamed. - + %1 has been renamed to %2. %1 and %2 name files. - + %1 has been moved to %2 and %3 other files have been moved. - + %1 has been moved to %2. - + Sync Activity 同步啟用 - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? - + Remove All Files? 移除所有檔案? - + Remove all files 移除所有檔案 - + Keep files 保留檔案 @@ -382,57 +387,52 @@ Are you sure you want to perform this operation? 發現較舊的同步處理日誌'%1'，但無法移除。請確認沒有應用程式正在使用它。 - + Undefined State. 未知狀態 - + Waits to start syncing. 等待啟動同步 - + Preparing for sync. 正在準備同步。 - + Sync is running. 同步執行中 - - Server is currently not available. - - - - + Last Sync was successful. 最後一次同步成功 - + Last Sync was successful, but with warnings on individual files. - + Setup Error. 安裝失敗 - + User Abort. 使用者中斷。 - + Sync is paused. 同步已暫停 - + %1 (Sync is paused) %1 (同步暫停) @@ -1493,27 +1493,27 @@ It is not advisable to use it. 設定 - + %1 %1 - + Activity 活動 - + General 一般 - + Network 網路 - + Account 帳號 @@ -1779,229 +1779,229 @@ It is not advisable to use it. Mirall::SyncEngine - + Success. 成功。 - + CSync failed to create a lock file. CSync 無法建立文件鎖 - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. - + CSync failed to write the journal file. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>用於csync的套件%1</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. 本客戶端的系統時間和伺服器系統時間不一致,請在伺服器與客戶端上使用時間同步服務(NTP)讓時間保持一致 - + CSync could not detect the filesystem type. CSync 無法偵測檔案系統的類型 - + CSync got an error while processing internal trees. CSync 處理內部資料樹時發生錯誤 - + CSync failed to reserve memory. CSync 無法取得記憶體空間。 - + CSync fatal parameter error. CSync 參數錯誤。 - + CSync processing step update failed. CSync 處理步驟 "update" 失敗。 - + CSync processing step reconcile failed. CSync 處理步驟 "reconcile" 失敗。 - + CSync processing step propagate failed. CSync 處理步驟 "propagate" 失敗。 - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>目標資料夾不存在</p><p>請檢查同步設定</p> - + A remote file can not be written. Please check the remote access. 遠端檔案無法寫入，請確認遠端存取權限。 - + The local filesystem can not be written. Please check permissions. 本地檔案系統無法寫入，請確認權限。 - + CSync failed to connect through a proxy. CSync 透過代理伺服器連線失敗。 - + CSync could not authenticate at the proxy. - + CSync failed to lookup proxy or server. CSync 查詢代理伺服器或伺服器失敗。 - + CSync failed to authenticate at the %1 server. CSync 於伺服器 %1 認證失敗。 - + CSync failed to connect to the network. CSync 無法連接到網路。 - + A network connection timeout happened. - + A HTTP transmission error happened. HTTP 傳輸錯誤。 - + CSync failed due to not handled permission deniend. CSync 失敗，由於未處理的存取被拒。 - + CSync failed to access - + CSync tried to create a directory that already exists. CSync 試圖建立一個已經存在的目錄。 - - + + CSync: No space on %1 server available. CSync：伺服器 %1 沒有可用空間。 - + CSync unspecified error. CSync 未知的錯誤。 - + Aborted by the user - + An internal error number %1 happened. - + The item is not synced because of previous errors: %1 - + Symbolic links are not supported in syncing. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2017,7 +2017,7 @@ It is not advisable to use it. Mirall::Theme - + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2130,22 +2130,27 @@ It is not advisable to use it. - + + Discovering %1 + + + + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date 最新的 @@ -2390,7 +2395,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! 若您尚未擁有ownCloud伺服器，可參閱<a href="https://owncloud.com">owncloud.com</a> 來獲得更多資訊。 @@ -2529,21 +2534,16 @@ It is not advisable to use it. - The server is currently unavailable - 伺服器目前無法使用。 - - - Preparing to sync 正在準備同步。 - + Aborting... 中斷中… - + Sync is paused 同步已暫停 From 5c5d57a996b3f98226e4d130cb2bc26ee03fe748 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 16 Aug 2014 02:06:14 -0400 Subject: [PATCH 38/94] [tx-robot] updated from transifex --- admin/win/nsi/l10n/Polish.nsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/win/nsi/l10n/Polish.nsh b/admin/win/nsi/l10n/Polish.nsh index 3cd5b2fed6..36af55fe99 100644 --- a/admin/win/nsi/l10n/Polish.nsh +++ b/admin/win/nsi/l10n/Polish.nsh @@ -15,6 +15,8 @@ StrCpy $PageReinstall_SAME_Field_3 "Odinstaluj ${APPLICATION_NAME}" StrCpy $UNINSTALLER_APPDATA_TITLE "Odinstaluj ${APPLICATION_NAME}" StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Wybierz sposób utrzymywania." StrCpy $SEC_APPLICATION_DETAILS "Instaluje niezbędne pliki ${APPLICATION_NAME}." +StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Ikona statusu dla Windows Explorer" +StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instaluj ikonę statusu dla Windows Explorer" StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Skrót w Menu Start" StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Dodaję skrót ${APPLICATION_NAME} w Menu Start." StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Skrót na Pulpicie" @@ -42,5 +44,3 @@ StrCpy $INIT_INSTALLER_RUNNING "Instalator już jest uruchomiony." StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Ten dezinstalator potrzebuje uprawnień administratora, spróbuj ponownie" StrCpy $INIT_UNINSTALLER_RUNNING "Dezinstalator już jest uruchomiony." StrCpy $SectionGroup_Shortcuts "Skróty" -StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer" -StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons for Windows Explorer" From ee7fe4a38ac4ad0afede2b80689a18eb79be0708 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 17 Aug 2014 01:25:21 -0400 Subject: [PATCH 39/94] [tx-robot] updated from transifex --- translations/mirall_ca.ts | 2 +- translations/mirall_cs.ts | 2 +- translations/mirall_de.ts | 8 ++++---- translations/mirall_el.ts | 2 +- translations/mirall_en.ts | 2 +- translations/mirall_es.ts | 8 ++++---- translations/mirall_es_AR.ts | 2 +- translations/mirall_et.ts | 2 +- translations/mirall_eu.ts | 2 +- translations/mirall_fa.ts | 2 +- translations/mirall_fi.ts | 2 +- translations/mirall_fr.ts | 2 +- translations/mirall_gl.ts | 2 +- translations/mirall_hu.ts | 2 +- translations/mirall_it.ts | 4 ++-- translations/mirall_ja.ts | 2 +- translations/mirall_nl.ts | 6 +++--- translations/mirall_pl.ts | 2 +- translations/mirall_pt.ts | 2 +- translations/mirall_pt_BR.ts | 4 ++-- translations/mirall_ru.ts | 2 +- translations/mirall_sk.ts | 2 +- translations/mirall_sl.ts | 2 +- translations/mirall_sv.ts | 2 +- translations/mirall_th.ts | 2 +- translations/mirall_tr.ts | 8 ++++---- translations/mirall_uk.ts | 2 +- translations/mirall_zh_CN.ts | 2 +- translations/mirall_zh_TW.ts | 2 +- 29 files changed, 42 insertions(+), 42 deletions(-) diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts index d7fda1e175..aaf898a636 100644 --- a/translations/mirall_ca.ts +++ b/translations/mirall_ca.ts @@ -2420,7 +2420,7 @@ Proveu de sincronitzar-los de nou. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts index 8aec186859..5321b8beed 100644 --- a/translations/mirall_cs.ts +++ b/translations/mirall_cs.ts @@ -2421,7 +2421,7 @@ Zkuste provést novou synchronizaci. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts index cd8583bb4b..3d8d260cce 100644 --- a/translations/mirall_de.ts +++ b/translations/mirall_de.ts @@ -147,7 +147,7 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf Discovering %1 - + Entdecke %1 @@ -2143,7 +2143,7 @@ Versuchen Sie diese nochmals zu synchronisieren. Discovering %1 - + Entdecke %1 @@ -2421,8 +2421,8 @@ Versuchen Sie diese nochmals zu synchronisieren. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 - <p>Version %2 Für weitere Informationen besuchen Sie <a href='%3'>%4</a>.</p><p><small>Entwickelt durch Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz und andere.<br>Basiert auf Mirall von Duncan Mac-Vicar P.</small></p><p>Urheberrecht von ownCloud, Inc.</p><p>Lizenziert unter der GNU General Public License (GPL) Version 2.0.<br>ownCloud und das ownCloud-Logo sind eingetragene Warenzeichen von ownCloud in den Vereinigten Staaten, anderen Ländern oder beides.</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts index 261ad67f85..433f10e2cc 100644 --- a/translations/mirall_el.ts +++ b/translations/mirall_el.ts @@ -2421,7 +2421,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts index 9d21b976a1..9e447c4bd1 100644 --- a/translations/mirall_en.ts +++ b/translations/mirall_en.ts @@ -2412,7 +2412,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts index 792417d9bb..9ce50ad330 100644 --- a/translations/mirall_es.ts +++ b/translations/mirall_es.ts @@ -146,7 +146,7 @@ Discovering %1 - + Descubriendo %1 @@ -2142,7 +2142,7 @@ Intente sincronizar los archivos nuevamente. Discovering %1 - + Descubriendo %1 @@ -2420,8 +2420,8 @@ Intente sincronizar los archivos nuevamente. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 - <p>Versión %2. Para mayor información, visite <a href="%3">%4</a></p><p><small>Por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz y otros.<br>Basado en Mirall por Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Distribuido bajo la licencia GNU Public License (GPL) Versión 2.0<br/>ownCloud y el logo de ownCloud son marcas registradas de ownCloud,Inc. en los Estados Unidos de América, otros países, o en ambos</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts index 5a25af9012..6263addd25 100644 --- a/translations/mirall_es_AR.ts +++ b/translations/mirall_es_AR.ts @@ -2416,7 +2416,7 @@ Intente sincronizar estos nuevamente. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts index a196496626..0542ca2994 100644 --- a/translations/mirall_et.ts +++ b/translations/mirall_et.ts @@ -2420,7 +2420,7 @@ Proovi neid uuesti sünkroniseerida. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts index 70820f7684..28d68d80df 100644 --- a/translations/mirall_eu.ts +++ b/translations/mirall_eu.ts @@ -2417,7 +2417,7 @@ Saiatu horiek berriz sinkronizatzen. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts index 9dafcba2aa..e57d69df36 100644 --- a/translations/mirall_fa.ts +++ b/translations/mirall_fa.ts @@ -2410,7 +2410,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts index b950af9df2..21f9c44adc 100644 --- a/translations/mirall_fi.ts +++ b/translations/mirall_fi.ts @@ -2415,7 +2415,7 @@ Osoitteen käyttäminen ei ole suositeltavaa. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts index a43edf43ae..072ef18982 100644 --- a/translations/mirall_fr.ts +++ b/translations/mirall_fr.ts @@ -2420,7 +2420,7 @@ Il est déconseillé de l'utiliser. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts index 543bd643a8..9320a803dc 100644 --- a/translations/mirall_gl.ts +++ b/translations/mirall_gl.ts @@ -2420,7 +2420,7 @@ Tente sincronizalos de novo. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts index 3cc66f38dc..161bec67af 100644 --- a/translations/mirall_hu.ts +++ b/translations/mirall_hu.ts @@ -2410,7 +2410,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts index 9cc69e7e3c..8102062170 100644 --- a/translations/mirall_it.ts +++ b/translations/mirall_it.ts @@ -2419,8 +2419,8 @@ Prova a sincronizzare nuovamente. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 - <p>Versione %2. Per ulteriori informazioni, visita <a href='%3'>%4</a></p><p><small>Di Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz e altri.<br>Basato su Mirall di Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.<p><p>Sotto licenza GNU General Public License (GPL) versione 2.0<br>ownCloud e il logo di ownCloud sono marchi registrati di ownCloud, Inc. negli Stati Uniti, in altri paesi, o entrambi</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts index d545e031c5..79d282cfa7 100644 --- a/translations/mirall_ja.ts +++ b/translations/mirall_ja.ts @@ -2418,7 +2418,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts index ac13b3b2a7..bb44495cbd 100644 --- a/translations/mirall_nl.ts +++ b/translations/mirall_nl.ts @@ -146,7 +146,7 @@ Discovering %1 - + %1 onderzoeken @@ -2142,7 +2142,7 @@ Probeer opnieuw te synchroniseren. Discovering %1 - + %1 onderzoeken @@ -2420,7 +2420,7 @@ Probeer opnieuw te synchroniseren. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts index 0a81e93b5a..243c10766d 100644 --- a/translations/mirall_pl.ts +++ b/translations/mirall_pl.ts @@ -2421,7 +2421,7 @@ Kliknij - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts index 21c06c1a02..1863c8c823 100644 --- a/translations/mirall_pt.ts +++ b/translations/mirall_pt.ts @@ -2418,7 +2418,7 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts index 8417c99eed..7fd6d964a6 100644 --- a/translations/mirall_pt_BR.ts +++ b/translations/mirall_pt_BR.ts @@ -2418,8 +2418,8 @@ Tente sincronizar novamente. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 - <p>Versão %2. Para mais informações visite <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Com base em Mirall por Duncan Mac-Vicar P.</small>Licenciado sob a GNU Public License (GPL) Version 2.0<br/>ownCloud e ownCloud logomarca são marcas registradas de ownCloud Inc. nos Estados Unidos, e outros países, ou ambos</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts index 9b966e8ee9..3a3aad61bf 100644 --- a/translations/mirall_ru.ts +++ b/translations/mirall_ru.ts @@ -2420,7 +2420,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts index d9dd4e21f1..682d3d2e03 100644 --- a/translations/mirall_sk.ts +++ b/translations/mirall_sk.ts @@ -2418,7 +2418,7 @@ Nie je vhodné ju používať. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts index eb2b2e3e7f..9903ff93af 100644 --- a/translations/mirall_sl.ts +++ b/translations/mirall_sl.ts @@ -2419,7 +2419,7 @@ Te je treba uskladiti znova. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts index 6dde23ca6d..2935a844d5 100644 --- a/translations/mirall_sv.ts +++ b/translations/mirall_sv.ts @@ -2420,7 +2420,7 @@ Försök att synka dessa igen. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts index c44d831fda..1178407de7 100644 --- a/translations/mirall_th.ts +++ b/translations/mirall_th.ts @@ -2410,7 +2410,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts index 6fc6ec291a..373f944d37 100644 --- a/translations/mirall_tr.ts +++ b/translations/mirall_tr.ts @@ -146,7 +146,7 @@ Discovering %1 - + Ortaya çıkarılıyor %1 @@ -2142,7 +2142,7 @@ Bu dosyaları tekrar eşitlemeyi deneyin. Discovering %1 - + Ortaya çıkarılıyor %1 @@ -2420,8 +2420,8 @@ Bu dosyaları tekrar eşitlemeyi deneyin. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 - <p>Sürüm %2. Daha fazla bilgi için lütfen <a href="%3">%4</a> adresini ziyaret edin.</p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz ve diğerleri.<br>Duncan Mac-Vicar P. tarafından yazılmış Mirall tabanlıdır.</small></p><p>Telif hakkı ownCloud, Inc.</p><p>GNU Genel Kamu Lisansı (GPL) Sürüm 2.0 ile lisanslanmıştır.<br>ownCloud ve ownCloud logoları <br>ABD ve/veya diğer ülkelerde %4 tescili markalarıdır.</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts index 3c54f29c3f..ea4702cd3e 100644 --- a/translations/mirall_uk.ts +++ b/translations/mirall_uk.ts @@ -2412,7 +2412,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts index 162e8d2d9e..19ac2cc4e2 100644 --- a/translations/mirall_zh_CN.ts +++ b/translations/mirall_zh_CN.ts @@ -2416,7 +2416,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts index db74b33480..d13592ac76 100644 --- a/translations/mirall_zh_TW.ts +++ b/translations/mirall_zh_TW.ts @@ -2410,7 +2410,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo is a registered trademark of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 From 463a9a5485b18359883e1844dffed6329c196cac Mon Sep 17 00:00:00 2001 From: Volkan Gezer Date: Sun, 17 Aug 2014 17:38:33 +0200 Subject: [PATCH 40/94] space --- src/mirall/owncloudtheme.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mirall/owncloudtheme.cpp b/src/mirall/owncloudtheme.cpp index 4ce2cf3058..be31ff3d18 100644 --- a/src/mirall/owncloudtheme.cpp +++ b/src/mirall/owncloudtheme.cpp @@ -63,7 +63,7 @@ QString ownCloudTheme::about() const "Based on Mirall by Duncan Mac-Vicar P.

" "

Copyright ownCloud, Inc.

" "

Licensed under the GNU Public License (GPL) Version 2.0
" - "ownCloud and the ownCloud Logo are registered trademarks of ownCloud," + "ownCloud and the ownCloud Logo are registered trademarks of ownCloud, " "Inc. in the United States, other countries, or both

" "%7" ) From 8a7cfbd8de05066f4a3b90839f2028125757407d Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Mon, 18 Aug 2014 01:25:25 -0400 Subject: [PATCH 41/94] [tx-robot] updated from transifex --- translations/mirall_ca.ts | 2 +- translations/mirall_cs.ts | 2 +- translations/mirall_de.ts | 2 +- translations/mirall_el.ts | 2 +- translations/mirall_en.ts | 2 +- translations/mirall_es.ts | 2 +- translations/mirall_es_AR.ts | 2 +- translations/mirall_et.ts | 2 +- translations/mirall_eu.ts | 8 ++++---- translations/mirall_fa.ts | 2 +- translations/mirall_fi.ts | 2 +- translations/mirall_fr.ts | 2 +- translations/mirall_gl.ts | 8 ++++---- translations/mirall_hu.ts | 2 +- translations/mirall_it.ts | 6 +++--- translations/mirall_ja.ts | 2 +- translations/mirall_nl.ts | 28 ++++++++++++++-------------- translations/mirall_pl.ts | 2 +- translations/mirall_pt.ts | 2 +- translations/mirall_pt_BR.ts | 6 +++--- translations/mirall_ru.ts | 2 +- translations/mirall_sk.ts | 2 +- translations/mirall_sl.ts | 2 +- translations/mirall_sv.ts | 2 +- translations/mirall_th.ts | 2 +- translations/mirall_tr.ts | 6 +++--- translations/mirall_uk.ts | 2 +- translations/mirall_zh_CN.ts | 2 +- translations/mirall_zh_TW.ts | 2 +- 29 files changed, 54 insertions(+), 54 deletions(-) diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts index aaf898a636..e176c48352 100644 --- a/translations/mirall_ca.ts +++ b/translations/mirall_ca.ts @@ -2420,7 +2420,7 @@ Proveu de sincronitzar-los de nou. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts index 5321b8beed..89d880a3a9 100644 --- a/translations/mirall_cs.ts +++ b/translations/mirall_cs.ts @@ -2421,7 +2421,7 @@ Zkuste provést novou synchronizaci. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts index 3d8d260cce..d14b1e2845 100644 --- a/translations/mirall_de.ts +++ b/translations/mirall_de.ts @@ -2421,7 +2421,7 @@ Versuchen Sie diese nochmals zu synchronisieren. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts index 433f10e2cc..e8db5b3f81 100644 --- a/translations/mirall_el.ts +++ b/translations/mirall_el.ts @@ -2421,7 +2421,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts index 9e447c4bd1..8be9fd82df 100644 --- a/translations/mirall_en.ts +++ b/translations/mirall_en.ts @@ -2412,7 +2412,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts index 9ce50ad330..b5fe839f1d 100644 --- a/translations/mirall_es.ts +++ b/translations/mirall_es.ts @@ -2420,7 +2420,7 @@ Intente sincronizar los archivos nuevamente. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts index 6263addd25..747a00a1db 100644 --- a/translations/mirall_es_AR.ts +++ b/translations/mirall_es_AR.ts @@ -2416,7 +2416,7 @@ Intente sincronizar estos nuevamente. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts index 0542ca2994..6453d5b586 100644 --- a/translations/mirall_et.ts +++ b/translations/mirall_et.ts @@ -2420,7 +2420,7 @@ Proovi neid uuesti sünkroniseerida. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts index 28d68d80df..0e50c7e494 100644 --- a/translations/mirall_eu.ts +++ b/translations/mirall_eu.ts @@ -146,7 +146,7 @@ Discovering %1 - + Aurkitzen %1 @@ -1558,7 +1558,7 @@ Saiatu horiek berriz sinkronizatzen. Login Error - + Errorea sartzean @@ -2139,7 +2139,7 @@ Saiatu horiek berriz sinkronizatzen. Discovering %1 - + Aurkitzen %1 @@ -2417,7 +2417,7 @@ Saiatu horiek berriz sinkronizatzen. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts index e57d69df36..5f0239e731 100644 --- a/translations/mirall_fa.ts +++ b/translations/mirall_fa.ts @@ -2410,7 +2410,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts index 21f9c44adc..e9f709f98a 100644 --- a/translations/mirall_fi.ts +++ b/translations/mirall_fi.ts @@ -2415,7 +2415,7 @@ Osoitteen käyttäminen ei ole suositeltavaa. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts index 072ef18982..311cad54f6 100644 --- a/translations/mirall_fr.ts +++ b/translations/mirall_fr.ts @@ -2420,7 +2420,7 @@ Il est déconseillé de l'utiliser. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts index 9320a803dc..95a0630674 100644 --- a/translations/mirall_gl.ts +++ b/translations/mirall_gl.ts @@ -146,7 +146,7 @@ Discovering %1 - + Atopando %1 @@ -2029,7 +2029,7 @@ Tente sincronizalos de novo. <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - + <p>Versión %1 Para obter máis información vexa <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distribuído por %4 e licenciado baixo a Licenza Pública Xeral (GPL) Versión 2.0.<br>Os logotipos %5 e %5 son marcas rexistradas de %4 nos<br>Estados Unidos de Norte América e/ou outros países.</p> @@ -2142,7 +2142,7 @@ Tente sincronizalos de novo. Discovering %1 - + Atopando %1 @@ -2420,7 +2420,7 @@ Tente sincronizalos de novo. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts index 161bec67af..e65a6261d0 100644 --- a/translations/mirall_hu.ts +++ b/translations/mirall_hu.ts @@ -2410,7 +2410,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts index 8102062170..4b58ea728d 100644 --- a/translations/mirall_it.ts +++ b/translations/mirall_it.ts @@ -146,7 +146,7 @@ Discovering %1 - + Rilevamento %1 @@ -2141,7 +2141,7 @@ Prova a sincronizzare nuovamente. Discovering %1 - + Rilevamento %1 @@ -2419,7 +2419,7 @@ Prova a sincronizzare nuovamente. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts index 79d282cfa7..b6b607ce82 100644 --- a/translations/mirall_ja.ts +++ b/translations/mirall_ja.ts @@ -2418,7 +2418,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts index bb44495cbd..289bc199ce 100644 --- a/translations/mirall_nl.ts +++ b/translations/mirall_nl.ts @@ -70,7 +70,7 @@ Edit Ignored Files - Wijzig genegeerde bestanden + Bewerk genegeerde bestanden @@ -131,7 +131,7 @@ <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> - <p>Weet u zeker dat u de synchronisatie van de map <i>%1</i> wilt stoppen?</p><p><b>Opmerking:</b> Dit zal de bestanden niet van uw computer verwijderen.</p> + <p>Weet u zeker dat u de synchronisatie van map <i>%1</i> wilt stoppen?</p><p><b>Opmerking:</b> Dit zal de bestanden niet van uw computer verwijderen.</p> @@ -141,7 +141,7 @@ <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - <p>Wilt u de map <i>%1</i> echt resetten en de database opnieuw opbouwen?</p><p><b>Let op:</b> Deze functie is alleen ontworpen voor onderhoudsdoeleinden. Hoewel er geen bestanden worden verwijderd, kan dit een aanzienlijke hoeveelheid dataverkeer tot gevolg hebben en minuten tot zelfs uren duren, afhankelijk van de omvang van de map. Gebruik deze functie alleen als dit wordt geadviseerd door uw applicatiebeheerder.</p> + <p>Wilt u map <i>%1</i> echt resetten en de database opnieuw opbouwen?</p><p><b>Let op:</b> Deze functie is alleen ontworpen voor onderhoudsdoeleinden. Hoewel er geen bestanden worden verwijderd, kan dit een aanzienlijke hoeveelheid dataverkeer tot gevolg hebben en minuten tot zelfs uren duren, afhankelijk van de omvang van de map. Gebruik deze functie alleen als dit wordt geadviseerd door uw applicatiebeheerder.</p> @@ -233,7 +233,7 @@ Totaal resterende tijd %5 &Password: - &Wachtwoord + &Wachtwoord: @@ -251,7 +251,7 @@ Totaal resterende tijd %5 Please update to the latest server and restart the client. - Werk update de server naar de nieuwste versie en herstart het programma. + Werk de server bij naar de nieuwste versie en herstart het programma. @@ -358,7 +358,7 @@ Totaal resterende tijd %5 This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? Deze synchronisatie zal alle bestanden in de synchronisatiemap '%1' verwijderen. -Dit kan komen doordat de map ongemerkt gereconfigureerd is of doordat alle bestanden met de hand zijn verwijderd. +Dit kan komen doordat de map ongemerkt opnieuw geconfigureerd is of doordat alle bestanden met de hand zijn verwijderd. Weet u zeker dat u deze bewerking wilt uitvoeren? @@ -465,7 +465,7 @@ Weet u zeker dat u deze bewerking wilt uitvoeren? Add Folder - Voeg Map Toe + Voeg map toe @@ -483,7 +483,7 @@ Weet u zeker dat u deze bewerking wilt uitvoeren? The directory alias is a descriptive name for this sync connection. - De directory aliasnaam is een beschrijvende naam voor deze synchronisatielijn. + De directory aliasnaam is een beschrijvende naam voor deze synchronisatieverbinding. @@ -503,7 +503,7 @@ Weet u zeker dat u deze bewerking wilt uitvoeren? An already configured folder is contained in the current entry. - Er bestaat een al geconfigureerde map in de huidige opdracht. + Er bestaat een al eerder geconfigureerde map in de huidige opdracht. @@ -556,7 +556,7 @@ Weet u zeker dat u deze bewerking wilt uitvoeren? Failed to create the folder on %1. Please check manually. - Aanmaken van de map op %1 mislukt.<br/>Controleer handmatig. + Aanmaken van de map op %1 mislukt. Controleer handmatig. @@ -585,7 +585,7 @@ Weet u zeker dat u deze bewerking wilt uitvoeren? <b>Warning:</b> - <b>waarschuwing:</b> + <b>Waarschuwing:</b> @@ -755,7 +755,7 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee Clear the log display. - Schoon het log display op. + Schoon de logweergave op. @@ -2029,7 +2029,7 @@ Probeer opnieuw te synchroniseren. <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - <p>Versie %1 Voor meer informatie bezoekt u <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Gedistribueerd door %4 en verstrekt onder de GNU General Public License (GPL) Versie 2.0.<br>%5 en het %5 logo zijn geregistreerde handelsmerken van %4 in de Verenigde Staten, andere landen, of beide.</p> + <p>Versie %1 Voor meer informatie bezoekt u <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Gedistribueerd door %4 en verstrekt onder de GNU General Public License (GPL) Versie 2.0.<br>%5 en het %5 logo zijn geregistreerde handelsmerken van %4 in de Verenigde Staten, andere landen, of beide.</p> @@ -2420,7 +2420,7 @@ Probeer opnieuw te synchroniseren. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts index 243c10766d..84509841dd 100644 --- a/translations/mirall_pl.ts +++ b/translations/mirall_pl.ts @@ -2421,7 +2421,7 @@ Kliknij - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts index 1863c8c823..a01aa355be 100644 --- a/translations/mirall_pt.ts +++ b/translations/mirall_pt.ts @@ -2418,7 +2418,7 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts index 7fd6d964a6..1e82959a27 100644 --- a/translations/mirall_pt_BR.ts +++ b/translations/mirall_pt_BR.ts @@ -146,7 +146,7 @@ Discovering %1 - + Descobrindo %1 @@ -2140,7 +2140,7 @@ Tente sincronizar novamente. Discovering %1 - + Descobrindo %1 @@ -2418,7 +2418,7 @@ Tente sincronizar novamente. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts index 3a3aad61bf..86442aafc6 100644 --- a/translations/mirall_ru.ts +++ b/translations/mirall_ru.ts @@ -2420,7 +2420,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts index 682d3d2e03..f1bb2e85ac 100644 --- a/translations/mirall_sk.ts +++ b/translations/mirall_sk.ts @@ -2418,7 +2418,7 @@ Nie je vhodné ju používať. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts index 9903ff93af..d7c9541e60 100644 --- a/translations/mirall_sl.ts +++ b/translations/mirall_sl.ts @@ -2419,7 +2419,7 @@ Te je treba uskladiti znova. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts index 2935a844d5..abbecea87a 100644 --- a/translations/mirall_sv.ts +++ b/translations/mirall_sv.ts @@ -2420,7 +2420,7 @@ Försök att synka dessa igen. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts index 1178407de7..c73a20967b 100644 --- a/translations/mirall_th.ts +++ b/translations/mirall_th.ts @@ -2410,7 +2410,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts index 373f944d37..c9b64360ff 100644 --- a/translations/mirall_tr.ts +++ b/translations/mirall_tr.ts @@ -146,7 +146,7 @@ Discovering %1 - Ortaya çıkarılıyor %1 + Ortaya çıkarılan: %1 @@ -2142,7 +2142,7 @@ Bu dosyaları tekrar eşitlemeyi deneyin. Discovering %1 - Ortaya çıkarılıyor %1 + Ortaya çıkarılan: %1 @@ -2420,7 +2420,7 @@ Bu dosyaları tekrar eşitlemeyi deneyin. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts index ea4702cd3e..09402da078 100644 --- a/translations/mirall_uk.ts +++ b/translations/mirall_uk.ts @@ -2412,7 +2412,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts index 19ac2cc4e2..76ff576b7e 100644 --- a/translations/mirall_zh_CN.ts +++ b/translations/mirall_zh_CN.ts @@ -2416,7 +2416,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts index d13592ac76..5bf85a2426 100644 --- a/translations/mirall_zh_TW.ts +++ b/translations/mirall_zh_TW.ts @@ -2410,7 +2410,7 @@ It is not advisable to use it. - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud,Inc. in the United States, other countries, or both</p>%7 + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 From 27f9d4523b730cd179b177d4ff831503e35eaa11 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Mon, 18 Aug 2014 11:24:03 +0200 Subject: [PATCH 42/94] Settings: Display the commit SHA both in branded and unbranded. Also, do not put the developer names into the translation string. --- src/mirall/owncloudtheme.cpp | 24 ++++++++---------------- src/mirall/theme.cpp | 22 ++++++++++++++++++++-- src/mirall/theme.h | 5 +++++ 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/src/mirall/owncloudtheme.cpp b/src/mirall/owncloudtheme.cpp index be31ff3d18..8a4da8f4b7 100644 --- a/src/mirall/owncloudtheme.cpp +++ b/src/mirall/owncloudtheme.cpp @@ -45,32 +45,24 @@ QString ownCloudTheme::configFileName() const QString ownCloudTheme::about() const { QString devString; -#ifdef GIT_SHA1 - const QString githubPrefix(QLatin1String( - "https://github.com/owncloud/mirall/commit/")); - const QString gitSha1(QLatin1String(GIT_SHA1)); - devString = QCoreApplication::translate("ownCloudTheme::about()", - "

Built from Git revision %2" - " on %3, %4 using Qt %5.

") - .arg(githubPrefix+gitSha1).arg(gitSha1.left(6)) - .arg(__DATE__).arg(__TIME__) - .arg(QT_VERSION_STR); -#endif - return QCoreApplication::translate("ownCloudTheme::about()", + const QString names("Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz"); + devString = QCoreApplication::translate("ownCloudTheme::about() - please leave _OCDEVS_NAMES_ untouched", "

Version %2. " "For more information visit %4

" - "

By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.
" + "

By _OCDEVS_NAMES_ and others.
" "Based on Mirall by Duncan Mac-Vicar P.

" "

Copyright ownCloud, Inc.

" "

Licensed under the GNU Public License (GPL) Version 2.0
" "ownCloud and the ownCloud Logo are registered trademarks of ownCloud, " "Inc. in the United States, other countries, or both

" - "%7" ) .arg(MIRALL_VERSION_STRING) .arg("http://" MIRALL_STRINGIFY(APPLICATION_DOMAIN)) - .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN)) - .arg(devString); + .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN)); + + devString.replace("_OCDEVS_NAMES_", names); + devString += gitSHA1(); + return devString; } diff --git a/src/mirall/theme.cpp b/src/mirall/theme.cpp index 06bfeb6174..d6f3321322 100644 --- a/src/mirall/theme.cpp +++ b/src/mirall/theme.cpp @@ -211,15 +211,33 @@ QString Theme::updateCheckUrl() const return QLatin1String("https://updates.owncloud.com/client/"); } +QString Theme::gitSHA1() const +{ + QString devString; +#ifdef GIT_SHA1 + const QString githubPrefix(QLatin1String( + "https://github.com/owncloud/mirall/commit/")); + const QString gitSha1(QLatin1String(GIT_SHA1)); + devString = QCoreApplication::translate("ownCloudTheme::about()", + "

Built from Git revision %2" + " on %3, %4 using Qt %5.

") + .arg(githubPrefix+gitSha1).arg(gitSha1.left(6)) + .arg(__DATE__).arg(__TIME__) + .arg(QT_VERSION_STR); +#endif + return devString; +} + QString Theme::about() const { return tr("

Version %1 For more information please visit %3.

" "

Copyright ownCloud, Inc.

" - "

Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.
" + "

Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.
" "%5 and the %5 logo are registered trademarks of %4 in the " "United States, other countries, or both.

") .arg(MIRALL_VERSION_STRING).arg("http://" MIRALL_STRINGIFY(APPLICATION_DOMAIN)) - .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN)).arg(APPLICATION_VENDOR).arg(APPLICATION_NAME); + .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN)).arg(APPLICATION_VENDOR).arg(APPLICATION_NAME) + +gitSHA1(); } #ifndef TOKEN_AUTH_ONLY diff --git a/src/mirall/theme.h b/src/mirall/theme.h index 3c1d69cb4d..e04e25a4a5 100644 --- a/src/mirall/theme.h +++ b/src/mirall/theme.h @@ -160,6 +160,11 @@ public: virtual QPixmap wizardHeaderBanner() const; #endif + /** + * The SHA sum of the released git commit + */ + QString gitSHA1() const; + /** * About dialog contents */ From ddbe181e483df77c9339b49dea93b5d5167618a5 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Mon, 18 Aug 2014 11:51:45 +0200 Subject: [PATCH 43/94] Update phase progress: Check if callback is defined. --- csync/src/csync_owncloud.c | 5 ++++- csync/src/csync_owncloud_recursive_propfind.c | 12 +++++++++--- csync/src/vio/csync_vio.c | 4 +++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/csync/src/csync_owncloud.c b/csync/src/csync_owncloud.c index 860d25eb79..cc009c9bfe 100644 --- a/csync/src/csync_owncloud.c +++ b/csync/src/csync_owncloud.c @@ -541,7 +541,10 @@ static struct listdir_context *fetch_resource_list(csync_owncloud_ctx_t *ctx, co } } - ctx->csync_ctx->callbacks.update_callback(false, curi, ctx->csync_ctx->callbacks.update_callback_userdata); + if( ctx->csync_ctx->callbacks.update_callback ) { + ctx->csync_ctx->callbacks.update_callback(false, curi, + ctx->csync_ctx->callbacks.update_callback_userdata); + } fetchCtx = c_malloc( sizeof( struct listdir_context )); if (!fetchCtx) { diff --git a/csync/src/csync_owncloud_recursive_propfind.c b/csync/src/csync_owncloud_recursive_propfind.c index f3e6699c7b..b84dbdec70 100644 --- a/csync/src/csync_owncloud_recursive_propfind.c +++ b/csync/src/csync_owncloud_recursive_propfind.c @@ -54,7 +54,9 @@ struct listdir_context *get_listdir_context_from_recursive_cache(csync_owncloud_ DEBUG_WEBDAV("get_listdir_context_from_recursive_cache No element %s in cache found", curi); return NULL; } - ctx->csync_ctx->callbacks.update_callback(false, curi, ctx->csync_ctx->callbacks.update_callback_userdata); + if( ctx->csync_ctx->callbacks.update_callback ) { + ctx->csync_ctx->callbacks.update_callback(false, curi, ctx->csync_ctx->callbacks.update_callback_userdata); + } /* Out of the element, create a listdir_context.. if we could be sure that it is immutable, we could ref instead.. need to investigate */ fetchCtx = c_malloc( sizeof( struct listdir_context )); @@ -147,7 +149,9 @@ static void propfind_results_recursive_callback(void *userdata, // a recursive PROPFIND might take some time but we still want to // be informed. Later when get_listdir_context_from_recursive_cache is // called the DB queries might be the problem causing slowness, so do it again there then. - ctx->csync_ctx->callbacks.update_callback(false, path, ctx->csync_ctx->callbacks.update_callback_userdata); + if( ctx->csync_ctx->callbacks.update_callback ) { + ctx->csync_ctx->callbacks.update_callback(false, path, ctx->csync_ctx->callbacks.update_callback_userdata); + } } } @@ -196,7 +200,9 @@ void fetch_resource_list_recursive(csync_owncloud_ctx_t *ctx, const char *uri, c int depth = NE_DEPTH_INFINITE; DEBUG_WEBDAV("fetch_resource_list_recursive Starting recursive propfind %s %s", uri, curi); - ctx->csync_ctx->callbacks.update_callback(false, curi, ctx->csync_ctx->callbacks.update_callback_userdata); + if( ctx->csync_ctx->callbacks.update_callback ) { + ctx->csync_ctx->callbacks.update_callback(false, curi, ctx->csync_ctx->callbacks.update_callback_userdata); + } /* do a propfind request and parse the results in the results function, set as callback */ hdl = ne_propfind_create(ctx->dav_session.ctx, curi, depth); diff --git a/csync/src/vio/csync_vio.c b/csync/src/vio/csync_vio.c index ae658dc591..4eb17bcb5f 100644 --- a/csync/src/vio/csync_vio.c +++ b/csync/src/vio/csync_vio.c @@ -48,7 +48,9 @@ csync_vio_handle_t *csync_vio_opendir(CSYNC *ctx, const char *name) { return owncloud_opendir(ctx, name); break; case LOCAL_REPLICA: - ctx->callbacks.update_callback(ctx->replica, name, ctx->callbacks.update_callback_userdata); + if( ctx->callbacks.update_callback ) { + ctx->callbacks.update_callback(ctx->replica, name, ctx->callbacks.update_callback_userdata); + } return csync_vio_local_opendir(name); break; default: From 4b716f3ea6d076a3ba1c975306b789cfa28bef8c Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Mon, 18 Aug 2014 12:17:13 +0200 Subject: [PATCH 44/94] About page: Fix the translation of developer names. --- src/mirall/owncloudtheme.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/mirall/owncloudtheme.cpp b/src/mirall/owncloudtheme.cpp index 8a4da8f4b7..b084741308 100644 --- a/src/mirall/owncloudtheme.cpp +++ b/src/mirall/owncloudtheme.cpp @@ -45,11 +45,9 @@ QString ownCloudTheme::configFileName() const QString ownCloudTheme::about() const { QString devString; - const QString names("Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz"); - devString = QCoreApplication::translate("ownCloudTheme::about() - please leave _OCDEVS_NAMES_ untouched", - "

Version %2. " - "For more information visit %4

" - "

By _OCDEVS_NAMES_ and others.
" + devString = trUtf8("

Version %2. For more information visit %4

" + "

By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, " + "Olivier Goffart, Markus Götz and others.
" "Based on Mirall by Duncan Mac-Vicar P.

" "

Copyright ownCloud, Inc.

" "

Licensed under the GNU Public License (GPL) Version 2.0
" @@ -60,7 +58,6 @@ QString ownCloudTheme::about() const .arg("http://" MIRALL_STRINGIFY(APPLICATION_DOMAIN)) .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN)); - devString.replace("_OCDEVS_NAMES_", names); devString += gitSHA1(); return devString; From b62b87eed3ba0b7a9940dc862a69f8a7dd15fecd Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Mon, 18 Aug 2014 12:09:24 +0200 Subject: [PATCH 45/94] OS X: Rename LiferayNativity code for shell icons --- .gitignore | 2 +- admin/osx/macosx.pkgproj | 4 +- shell_integration/MacOSX/CMakeLists.txt | 8 +- .../contents.xcworkspacedata | 10 - .../xcdebugger/Breakpoints.xcbkptlist | 20 - .../ContextMenuHandlers.h | 28 - .../English.lproj/.DS_Store | Bin 6148 -> 0 bytes .../LiferayNativityFinder/Finder/.DS_Store | Bin 6148 -> 0 bytes .../MacOSX/LiferayNativityFinder/FinderHook.m | 125 -- .../svp.mode1v3 | 1542 ------------- .../svp.pbxuser | 1899 ----------------- .../LiferayNativityInjector.sdef | 9 - .../contents.xcworkspacedata | 10 + .../xcshareddata/OwnCloud.xccheckout | 41 + .../ContentManager.h | 0 .../ContentManager.m | 2 +- .../OwnCloudFinder/ContextMenuHandlers.h | 28 + .../ContextMenuHandlers.m | 8 +- .../ContextMenuHandlers.m.unc | 0 .../English.lproj/InfoPlist.strings | 0 .../Finder/Finder.h | 0 .../FinderHook.h | 0 .../MacOSX/OwnCloudFinder/FinderHook.m | 125 ++ .../GCDAsyncSocket.h | 0 .../GCDAsyncSocket.m | 0 .../IconCache.h | 0 .../IconCache.m | 0 .../IconOverlayHandlers.h | 6 +- .../IconOverlayHandlers.m | 20 +- .../Info.plist | 6 +- .../JSONKit.h | 0 .../JSONKit.m | 0 .../MenuManager.h | 0 .../MenuManager.m | 0 .../OwnCloudFinder.xcodeproj}/project.pbxproj | 32 +- .../contents.xcworkspacedata | 2 +- .../xcschemes/xcschememanagement.plist | 0 .../RequestManager.h | 0 .../RequestManager.m | 2 +- .../English.lproj/InfoPlist.strings | 0 .../Info.plist | 44 +- .../LNStandardVersionComparator.h | 0 .../LNStandardVersionComparator.m | 0 .../LNVersionComparisonProtocol.h | 0 .../OwnCloudInjector.m} | 24 +- .../OwnCloudInjector/OwnCloudInjector.sdef | 9 + .../project.pbxproj | 48 +- .../contents.xcworkspacedata | 2 +- .../xcschemes/OwnCloudFinder.osax.xcscheme} | 12 +- .../xcschemes/xcschememanagement.plist | 0 .../license.txt | 0 shell_integration/MacOSX/deploy.sh | 10 +- src/mirall/owncloudgui.cpp | 2 +- 53 files changed, 333 insertions(+), 3747 deletions(-) delete mode 100644 shell_integration/MacOSX/LiferayNativity.xcworkspace/contents.xcworkspacedata delete mode 100644 shell_integration/MacOSX/LiferayNativity.xcworkspace/xcuserdata/mackie.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist delete mode 100644 shell_integration/MacOSX/LiferayNativityFinder/ContextMenuHandlers.h delete mode 100644 shell_integration/MacOSX/LiferayNativityFinder/English.lproj/.DS_Store delete mode 100644 shell_integration/MacOSX/LiferayNativityFinder/Finder/.DS_Store delete mode 100644 shell_integration/MacOSX/LiferayNativityFinder/FinderHook.m delete mode 100644 shell_integration/MacOSX/LiferayNativityFinder/LiferayNativityFinder.xcodeproj/svp.mode1v3 delete mode 100644 shell_integration/MacOSX/LiferayNativityFinder/LiferayNativityFinder.xcodeproj/svp.pbxuser delete mode 100644 shell_integration/MacOSX/LiferayNativityInjector/LiferayNativityInjector.sdef create mode 100644 shell_integration/MacOSX/OwnCloud.xcworkspace/contents.xcworkspacedata create mode 100644 shell_integration/MacOSX/OwnCloud.xcworkspace/xcshareddata/OwnCloud.xccheckout rename shell_integration/MacOSX/{LiferayNativityFinder => OwnCloudFinder}/ContentManager.h (100%) rename shell_integration/MacOSX/{LiferayNativityFinder => OwnCloudFinder}/ContentManager.m (99%) create mode 100644 shell_integration/MacOSX/OwnCloudFinder/ContextMenuHandlers.h rename shell_integration/MacOSX/{LiferayNativityFinder => OwnCloudFinder}/ContextMenuHandlers.m (88%) rename shell_integration/MacOSX/{LiferayNativityFinder => OwnCloudFinder}/ContextMenuHandlers.m.unc (100%) rename shell_integration/MacOSX/{LiferayNativityFinder => OwnCloudFinder}/English.lproj/InfoPlist.strings (100%) rename shell_integration/MacOSX/{LiferayNativityFinder => OwnCloudFinder}/Finder/Finder.h (100%) rename shell_integration/MacOSX/{LiferayNativityFinder => OwnCloudFinder}/FinderHook.h (100%) create mode 100644 shell_integration/MacOSX/OwnCloudFinder/FinderHook.m rename shell_integration/MacOSX/{LiferayNativityFinder => OwnCloudFinder}/GCDAsyncSocket.h (100%) rename shell_integration/MacOSX/{LiferayNativityFinder => OwnCloudFinder}/GCDAsyncSocket.m (100%) rename shell_integration/MacOSX/{LiferayNativityFinder => OwnCloudFinder}/IconCache.h (100%) rename shell_integration/MacOSX/{LiferayNativityFinder => OwnCloudFinder}/IconCache.m (100%) rename shell_integration/MacOSX/{LiferayNativityFinder => OwnCloudFinder}/IconOverlayHandlers.h (78%) rename shell_integration/MacOSX/{LiferayNativityFinder => OwnCloudFinder}/IconOverlayHandlers.m (86%) rename shell_integration/MacOSX/{LiferayNativityFinder => OwnCloudFinder}/Info.plist (97%) rename shell_integration/MacOSX/{LiferayNativityFinder => OwnCloudFinder}/JSONKit.h (100%) rename shell_integration/MacOSX/{LiferayNativityFinder => OwnCloudFinder}/JSONKit.m (100%) rename shell_integration/MacOSX/{LiferayNativityFinder => OwnCloudFinder}/MenuManager.h (100%) rename shell_integration/MacOSX/{LiferayNativityFinder => OwnCloudFinder}/MenuManager.m (100%) rename shell_integration/MacOSX/{LiferayNativityFinder/LiferayNativityFinder.xcodeproj => OwnCloudFinder/OwnCloudFinder.xcodeproj}/project.pbxproj (93%) rename shell_integration/MacOSX/{LiferayNativityFinder/LiferayNativityFinder.xcodeproj => OwnCloudFinder/OwnCloudFinder.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (65%) rename shell_integration/MacOSX/{LiferayNativityFinder/LiferayNativityFinder.xcodeproj/xcuserdata/mackie.xcuserdatad => OwnCloudFinder/OwnCloudFinder.xcodeproj/xcuserdata/guruz.xcuserdatad}/xcschemes/xcschememanagement.plist (100%) rename shell_integration/MacOSX/{LiferayNativityFinder => OwnCloudFinder}/RequestManager.h (100%) rename shell_integration/MacOSX/{LiferayNativityFinder => OwnCloudFinder}/RequestManager.m (98%) rename shell_integration/MacOSX/{LiferayNativityInjector => OwnCloudInjector}/English.lproj/InfoPlist.strings (100%) rename shell_integration/MacOSX/{LiferayNativityInjector => OwnCloudInjector}/Info.plist (89%) rename shell_integration/MacOSX/{LiferayNativityInjector => OwnCloudInjector}/LNStandardVersionComparator.h (100%) rename shell_integration/MacOSX/{LiferayNativityInjector => OwnCloudInjector}/LNStandardVersionComparator.m (100%) rename shell_integration/MacOSX/{LiferayNativityInjector => OwnCloudInjector}/LNVersionComparisonProtocol.h (100%) rename shell_integration/MacOSX/{LiferayNativityInjector/LiferayNativityInjector.m => OwnCloudInjector/OwnCloudInjector.m} (93%) create mode 100644 shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.sdef rename shell_integration/MacOSX/{LiferayNativityInjector/LiferayNativityInjector.xcodeproj => OwnCloudInjector/OwnCloudInjector.xcodeproj}/project.pbxproj (78%) rename shell_integration/MacOSX/{LiferayNativityInjector/LiferayNativityInjector.xcodeproj => OwnCloudInjector/OwnCloudInjector.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (64%) rename shell_integration/MacOSX/{LiferayNativityInjector/LiferayNativityInjector.xcodeproj/xcshareddata/xcschemes/LiferayNativity.osax.xcscheme => OwnCloudInjector/OwnCloudInjector.xcodeproj/xcshareddata/xcschemes/OwnCloudFinder.osax.xcscheme} (84%) rename shell_integration/MacOSX/{LiferayNativityInjector/LiferayNativityInjector.xcodeproj/xcuserdata/mackie.xcuserdatad => OwnCloudInjector/OwnCloudInjector.xcodeproj/xcuserdata/guruz.xcuserdatad}/xcschemes/xcschememanagement.plist (100%) rename shell_integration/MacOSX/{LiferayNativityInjector => OwnCloudInjector}/license.txt (100%) diff --git a/.gitignore b/.gitignore index 5378559c66..19fe61e827 100644 --- a/.gitignore +++ b/.gitignore @@ -79,7 +79,7 @@ dlldata.c *.scc # Mac OS X specific -shell_integration/MacOSX/LiferayNativity.xcworkspace/xcuserdata/ +shell_integration/MacOSX/*.xcworkspace/xcuserdata/ **/.DS_Store # Visual C++ cache files diff --git a/admin/osx/macosx.pkgproj b/admin/osx/macosx.pkgproj index d690a81537..2060f979ac 100644 --- a/admin/osx/macosx.pkgproj +++ b/admin/osx/macosx.pkgproj @@ -793,7 +793,7 @@ GID 0 PATH - Library/ScriptingAdditions/LiferayNativity.osax/Contents + Library/ScriptingAdditions/OwnCloudFinder.osax/Contents PATH_TYPE 3 PERMISSIONS @@ -807,7 +807,7 @@ GID 0 PATH - LiferayNativity.osax + OwnCloudFinder.osax PATH_TYPE 0 PERMISSIONS diff --git a/shell_integration/MacOSX/CMakeLists.txt b/shell_integration/MacOSX/CMakeLists.txt index 12fb334606..284691d239 100644 --- a/shell_integration/MacOSX/CMakeLists.txt +++ b/shell_integration/MacOSX/CMakeLists.txt @@ -1,11 +1,11 @@ if(APPLE) add_custom_target( mac_overlayplugin ALL - xcodebuild -workspace ${CMAKE_SOURCE_DIR}/shell_integration/MacOSX/LiferayNativity.xcworkspace - -scheme LiferayNativity.osax SYMROOT=${CMAKE_CURRENT_BINARY_DIR} archive + xcodebuild -workspace ${CMAKE_SOURCE_DIR}/shell_integration/MacOSX/OwnCloud.xcworkspace + -scheme OwnCloudFinder.osax SYMROOT=${CMAKE_CURRENT_BINARY_DIR} archive COMMENT building Mac Overlay iccons) -INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Release/LiferayNativity.osax/Contents - DESTINATION ${CMAKE_INSTALL_PREFIX}/Library/ScriptingAdditions/LiferayNativity.osax/ ) +INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Release/OwnCloudFinder.osax/Contents + DESTINATION ${CMAKE_INSTALL_PREFIX}/Library/ScriptingAdditions/OwnCloudFinder.osax/ ) endif(APPLE) diff --git a/shell_integration/MacOSX/LiferayNativity.xcworkspace/contents.xcworkspacedata b/shell_integration/MacOSX/LiferayNativity.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index e7bb6c85e0..0000000000 --- a/shell_integration/MacOSX/LiferayNativity.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/shell_integration/MacOSX/LiferayNativity.xcworkspace/xcuserdata/mackie.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/shell_integration/MacOSX/LiferayNativity.xcworkspace/xcuserdata/mackie.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist deleted file mode 100644 index c96a683fa4..0000000000 --- a/shell_integration/MacOSX/LiferayNativity.xcworkspace/xcuserdata/mackie.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - diff --git a/shell_integration/MacOSX/LiferayNativityFinder/ContextMenuHandlers.h b/shell_integration/MacOSX/LiferayNativityFinder/ContextMenuHandlers.h deleted file mode 100644 index d57479aa6a..0000000000 --- a/shell_integration/MacOSX/LiferayNativityFinder/ContextMenuHandlers.h +++ /dev/null @@ -1,28 +0,0 @@ -/** - * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved. - * - * This library is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This library is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - */ - -#import - -@interface NSObject (ContextMenuHandlers) - -struct TFENodeVector; - -+ (void)ContextMenuHandlers_handleContextMenuCommon:(unsigned int)arg1 nodes:(const struct TFENodeVector*)arg2 event:(id)arg3 view:(id)arg4 browserController:(id)arg5 addPlugIns:(BOOL)arg6; -+ (void)ContextMenuHandlers_handleContextMenuCommon:(unsigned int)arg1 nodes:(const struct TFENodeVector*)arg2 event:(id)arg3 view:(id)arg4 windowController:(id)arg5 addPlugIns:(BOOL)arg6; -+ (void)ContextMenuHandlers_addViewSpecificStuffToMenu:(id)arg1 browserViewController:(id)arg2 context:(unsigned int)arg3; - -- (void)ContextMenuHandlers_configureWithNodes:(const struct TFENodeVector*)arg1 browserController:(id)arg2 container:(BOOL)arg3; -- (void)ContextMenuHandlers_configureWithNodes:(const struct TFENodeVector*)arg1 windowController:(id)arg2 container:(BOOL)arg3; - -@end \ No newline at end of file diff --git a/shell_integration/MacOSX/LiferayNativityFinder/English.lproj/.DS_Store b/shell_integration/MacOSX/LiferayNativityFinder/English.lproj/.DS_Store deleted file mode 100644 index 170d2482ea9a55024a4062f588de748e0836e338..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~F-rqM5QX1pihxb*EVr~0{0B>jLOQ`eAW;;|3j`vBN7aCfVNyy!I4pZ1ISG zRPVdIaJMaTi{if?T%=VvpO+P<`aV8T15fA|p5CIYRJpu2%wE0P@MiCGJ5%?tF z--kkXtxbp2_;hfHD*$!Ia2V%tm!K98P;1j6l@Xd{DK$&2T`?@n880obHXTy492O^Y zpLVjf8;Zs0jF(7<)l`ilAOd3o$GKd1|G%RDaQ`0{X(a+8@UIBiY<0U@@|9X|oxGg) v+Csmhe;9KkokO%@YP4c5ycM5)$tynR^V)PsjdI4LoT@(p&P65ye?j0KjWivI diff --git a/shell_integration/MacOSX/LiferayNativityFinder/Finder/.DS_Store b/shell_integration/MacOSX/LiferayNativityFinder/Finder/.DS_Store deleted file mode 100644 index 4f38b02f85fe289e9b5c999dbfd1c40519836ef6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJxfDD5S-N%4{TCeUTG!x4~`H6sr>^IBPav|Li$(vyZmQn_5(3It;9xVVR!EK zcHZSp@iq&<7KiN(Fb6Qu9r5O2YJToMv9rn;k4qfdoOLcNK}*pQa}oPD&XITMtAImV`6+d z7-9q<&X^A4I%WxC^8~RMj)~0BEUCn#T8$W%bmm*t^};bR>9Dw& ZOCKQX?nQu`J z>xqg|Knk2HaGu+__y1e^5A**iNjoVZ1^$%+He22;7ks7at&^AYUfbyRbgy}*yKx;9 nhG@scXvf@mJHCvftZTmJc`qCjgU)==iTX3(y2zx!Un_6~ij*4` diff --git a/shell_integration/MacOSX/LiferayNativityFinder/FinderHook.m b/shell_integration/MacOSX/LiferayNativityFinder/FinderHook.m deleted file mode 100644 index f77e6c8904..0000000000 --- a/shell_integration/MacOSX/LiferayNativityFinder/FinderHook.m +++ /dev/null @@ -1,125 +0,0 @@ -/** - * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved. - * - * This library is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This library is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - */ - -#import "ContentManager.h" -#import "FinderHook.h" -#import "IconCache.h" -#import "objc/objc-class.h" -#import "RequestManager.h" - -static BOOL installed = NO; - -@implementation FinderHook - -+ (void)hookClassMethod:(SEL)oldSelector inClass:(NSString*)className toCallToTheNewMethod:(SEL)newSelector -{ - Class hookedClass = NSClassFromString(className); - Method oldMethod = class_getClassMethod(hookedClass, oldSelector); - Method newMethod = class_getClassMethod(hookedClass, newSelector); - - method_exchangeImplementations(newMethod, oldMethod); -} - -+ (void)hookMethod:(SEL)oldSelector inClass:(NSString*)className toCallToTheNewMethod:(SEL)newSelector -{ - Class hookedClass = NSClassFromString(className); - Method oldMethod = class_getInstanceMethod(hookedClass, oldSelector); - Method newMethod = class_getInstanceMethod(hookedClass, newSelector); - - method_exchangeImplementations(newMethod, oldMethod); -} - -+ (void)install -{ - if (installed) - { - NSLog(@"LiferayNativityFinder: already installed"); - - return; - } - - NSLog(@"LiferayNativityFinder: installing ownCloud Shell extension"); - - [RequestManager sharedInstance]; - - // Icons - [self hookMethod:@selector(drawImage:) inClass:@"IKImageBrowserCell" toCallToTheNewMethod:@selector(IconOverlayHandlers_IKImageBrowserCell_drawImage:)]; // 10.7 & 10.8 & 10.9 (Icon View arrange by name) - - [self hookMethod:@selector(drawImage:) inClass:@"IKFinderReflectiveIconCell" toCallToTheNewMethod:@selector(IconOverlayHandlers_IKFinderReflectiveIconCell_drawImage:)]; // 10.7 & 10.8 & 10.9 (Icon View arrange by everything else) - - [self hookMethod:@selector(drawIconWithFrame:) inClass:@"TListViewIconAndTextCell" toCallToTheNewMethod:@selector(IconOverlayHandlers_drawIconWithFrame:)]; // 10.7 & 10.8 & 10.9 Column View - - [self hookMethod:@selector(drawRect:) inClass:@"TDimmableIconImageView" toCallToTheNewMethod:@selector(IconOverlayHandlers_drawRect:)]; // 10.9 (List and Coverflow Views) - - // Context Menus - [self hookClassMethod:@selector(addViewSpecificStuffToMenu:browserViewController:context:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(ContextMenuHandlers_addViewSpecificStuffToMenu:browserViewController:context:)]; // 10.7 & 10.8 - - [self hookClassMethod:@selector(addViewSpecificStuffToMenu:clickedView:browserViewController:context:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(ContextMenuHandlers_addViewSpecificStuffToMenu:clickedView:browserViewController:context:)]; // 10.9 - - [self hookClassMethod:@selector(handleContextMenuCommon:nodes:event:view:windowController:addPlugIns:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(ContextMenuHandlers_handleContextMenuCommon:nodes:event:view:windowController:addPlugIns:)]; // 10.7 - - [self hookClassMethod:@selector(handleContextMenuCommon:nodes:event:view:browserController:addPlugIns:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(ContextMenuHandlers_handleContextMenuCommon:nodes:event:view:browserController:addPlugIns:)]; // 10.8 - - [self hookClassMethod:@selector(handleContextMenuCommon:nodes:event:clickedView:browserViewController:addPlugIns:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(ContextMenuHandlers_handleContextMenuCommon:nodes:event:clickedView:browserViewController:addPlugIns:)]; // 10.9 - - [self hookMethod:@selector(configureWithNodes:windowController:container:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(ContextMenuHandlers_configureWithNodes:windowController:container:)]; // 10.7 - - [self hookMethod:@selector(configureWithNodes:browserController:container:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(ContextMenuHandlers_configureWithNodes:browserController:container:)]; // 10.8 - - [self hookMethod:@selector(configureFromMenuNeedsUpdate:clickedView:container:event:selectedNodes:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(ContextMenuHandlers_configureFromMenuNeedsUpdate:clickedView:container:event:selectedNodes:)]; // 10.9 - - installed = YES; - - NSLog(@"LiferayNativityFinder: installed"); -} - -+ (void)uninstall -{ - if (!installed) - { - NSLog(@"LiferayNativityFinder: not installed"); - - return; - } - - NSLog(@"LiferayNativityFinder: uninstalling"); - - [[ContentManager sharedInstance] dealloc]; - - [[IconCache sharedInstance] dealloc]; - - [[RequestManager sharedInstance] dealloc]; - - // Icons - [self hookMethod:@selector(IconOverlayHandlers_drawImage:) inClass:@"TIconViewCell" toCallToTheNewMethod:@selector(drawImage:)]; // 10.7 & 10.8 & 10.9 - - [self hookMethod:@selector(IconOverlayHandlers_drawIconWithFrame:) inClass:@"TListViewIconAndTextCell" toCallToTheNewMethod:@selector(drawIconWithFrame:)]; // 10.7 & 10.8 & 10.9 - - // Context Menus - [self hookClassMethod:@selector(ContextMenuHandlers_addViewSpecificStuffToMenu:browserViewController:context:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(addViewSpecificStuffToMenu:browserViewController:context:)]; // 10.7 & 10.8 - - [self hookClassMethod:@selector(ContextMenuHandlers_handleContextMenuCommon:nodes:event:view:windowController:addPlugIns:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(handleContextMenuCommon:nodes:event:view:windowController:addPlugIns:)]; // 10.7 - - [self hookMethod:@selector(ContextMenuHandlers_configureWithNodes:windowController:container:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(configureWithNodes:windowController:container:)]; // 10.7 - - [self hookClassMethod:@selector(ContextMenuHandlers_handleContextMenuCommon:nodes:event:view:browserController:addPlugIns:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(handleContextMenuCommon:nodes:event:view:browserController:addPlugIns:)]; // 10.8 - - [self hookMethod:@selector(ContextMenuHandlers_configureWithNodes:browserController:container:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(configureWithNodes:browserController:container:)]; // 10.8 - - installed = NO; - - NSLog(@"LiferayNativityFinder: uninstalled"); -} - -@end \ No newline at end of file diff --git a/shell_integration/MacOSX/LiferayNativityFinder/LiferayNativityFinder.xcodeproj/svp.mode1v3 b/shell_integration/MacOSX/LiferayNativityFinder/LiferayNativityFinder.xcodeproj/svp.mode1v3 deleted file mode 100644 index 235ec82169..0000000000 --- a/shell_integration/MacOSX/LiferayNativityFinder/LiferayNativityFinder.xcodeproj/svp.mode1v3 +++ /dev/null @@ -1,1542 +0,0 @@ - - - - - ActivePerspectiveName - Project - AllowedModules - - - BundleLoadPath - - MaxInstances - n - Module - PBXSmartGroupTreeModule - Name - Groups and Files Outline View - - - BundleLoadPath - - MaxInstances - n - Module - PBXNavigatorGroup - Name - Editor - - - BundleLoadPath - - MaxInstances - n - Module - XCTaskListModule - Name - Task List - - - BundleLoadPath - - MaxInstances - n - Module - XCDetailModule - Name - File and Smart Group Detail Viewer - - - BundleLoadPath - - MaxInstances - 1 - Module - PBXBuildResultsModule - Name - Detailed Build Results Viewer - - - BundleLoadPath - - MaxInstances - 1 - Module - PBXProjectFindModule - Name - Project Batch Find Tool - - - BundleLoadPath - - MaxInstances - n - Module - XCProjectFormatConflictsModule - Name - Project Format Conflicts List - - - BundleLoadPath - - MaxInstances - n - Module - PBXBookmarksModule - Name - Bookmarks Tool - - - BundleLoadPath - - MaxInstances - n - Module - PBXClassBrowserModule - Name - Class Browser - - - BundleLoadPath - - MaxInstances - n - Module - PBXCVSModule - Name - Source Code Control Tool - - - BundleLoadPath - - MaxInstances - n - Module - PBXDebugBreakpointsModule - Name - Debug Breakpoints Tool - - - BundleLoadPath - - MaxInstances - n - Module - XCDockableInspector - Name - Inspector - - - BundleLoadPath - - MaxInstances - n - Module - PBXOpenQuicklyModule - Name - Open Quickly Tool - - - BundleLoadPath - - MaxInstances - 1 - Module - PBXDebugSessionModule - Name - Debugger - - - BundleLoadPath - - MaxInstances - 1 - Module - PBXDebugCLIModule - Name - Debug Console - - - BundleLoadPath - - MaxInstances - n - Module - XCSnapshotModule - Name - Snapshots Tool - - - BundlePath - /Developer/Library/PrivateFrameworks/DevToolsInterface.framework/Resources - Description - DefaultDescriptionKey - DockingSystemVisible - - Extension - mode1v3 - FavBarConfig - - PBXProjectModuleGUID - 8C37DD941615938A00016A95 - XCBarModuleItemNames - - XCBarModuleItems - - - FirstTimeWindowDisplayed - - Identifier - com.apple.perspectives.project.mode1v3 - MajorVersion - 33 - MinorVersion - 0 - Name - Default - Notifications - - OpenEditors - - - Content - - PBXProjectModuleGUID - 8C99F89B16284444002D2135 - PBXProjectModuleLabel - FinderHook.m - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 8C99F89C16284444002D2135 - PBXProjectModuleLabel - FinderHook.m - _historyCapacity - 0 - bookmark - 8C95FFD716301448003BB463 - history - - 8C95FFB2162D771B003BB463 - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {1882, 573}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 38 444 1882 614 0 0 1920 1058 - - - - Content - - PBXProjectModuleGUID - 8C95FF84162D59A0003BB463 - PBXProjectModuleLabel - FinderHook.m - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 8C95FF85162D59A0003BB463 - PBXProjectModuleLabel - FinderHook.m - _historyCapacity - 0 - bookmark - 8C95FFD816301448003BB463 - history - - 8C95FFC1162D7A3D003BB463 - 8C95FFC2162D7A3D003BB463 - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {1882, 629}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 916 388 1882 670 0 0 1920 1058 - - - - Content - - PBXProjectModuleGUID - 8C99F7B216283292002D2135 - PBXProjectModuleLabel - IconCache.m - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 8C99F7B316283292002D2135 - PBXProjectModuleLabel - IconCache.m - _historyCapacity - 0 - bookmark - 8C95FFD916301448003BB463 - history - - 8C99F90216284ECF002D2135 - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {1882, 573}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 38 444 1882 614 0 0 1920 1058 - - - - Content - - PBXProjectModuleGUID - 8C99F7B616283292002D2135 - PBXProjectModuleLabel - IconCache.h - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 8C99F7B716283292002D2135 - PBXProjectModuleLabel - IconCache.h - _historyCapacity - 0 - bookmark - 8C95FFDA16301448003BB463 - history - - 8C99F90316284ECF002D2135 - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {1882, 573}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 352 444 1882 614 0 0 1920 1058 - - - - PerspectiveWidths - - -1 - -1 - - Perspectives - - - ChosenToolbarItems - - active-combo-popup - action - NSToolbarFlexibleSpaceItem - debugger-enable-breakpoints - build-and-go - com.apple.ide.PBXToolbarStopButton - get-info - NSToolbarFlexibleSpaceItem - com.apple.pbx.toolbar.searchfield - - ControllerClassBaseName - - IconName - WindowOfProjectWithEditor - Identifier - perspective.project - IsVertical - - Layout - - - ContentConfiguration - - PBXBottomSmartGroupGIDs - - 1C37FBAC04509CD000000102 - 1C37FAAC04509CD000000102 - 1C37FABC05509CD000000102 - 1C37FABC05539CD112110102 - E2644B35053B69B200211256 - 1C37FABC04509CD000100104 - 1CC0EA4004350EF90044410B - 1CC0EA4004350EF90041110B - - PBXProjectModuleGUID - 1CE0B1FE06471DED0097A5F4 - PBXProjectModuleLabel - Files - PBXProjectStructureProvided - yes - PBXSmartGroupTreeModuleColumnData - - PBXSmartGroupTreeModuleColumnWidthsKey - - 186 - - PBXSmartGroupTreeModuleColumnsKey_v4 - - MainColumn - - - PBXSmartGroupTreeModuleOutlineStateKey_v7 - - PBXSmartGroupTreeModuleOutlineStateExpansionKey - - 089C166AFE841209C02AAC07 - 08FB77AFFE84173DC02AAC07 - 089C1671FE841209C02AAC07 - 1C37FABC05509CD000000102 - - PBXSmartGroupTreeModuleOutlineStateSelectionKey - - - 3 - 1 - 0 - - - PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {186, 556}} - - PBXTopSmartGroupGIDs - - XCIncludePerspectivesSwitch - - XCSharingToken - com.apple.Xcode.GFSharingToken - - GeometryConfiguration - - Frame - {{0, 0}, {203, 574}} - GroupTreeTableConfiguration - - MainColumn - 186 - - RubberWindowFrame - 632 443 1235 615 0 0 1920 1058 - - Module - PBXSmartGroupTreeModule - Proportion - 203pt - - - Dock - - - BecomeActive - - ContentConfiguration - - PBXProjectModuleGUID - 1CE0B20306471E060097A5F4 - PBXProjectModuleLabel - FinderHook.m - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 1CE0B20406471E060097A5F4 - PBXProjectModuleLabel - FinderHook.m - _historyCapacity - 0 - bookmark - 8C95FFD616301448003BB463 - history - - 8C99F6D716241A83002D2135 - 8C99F7E91628351A002D2135 - 8C99F89616284444002D2135 - 8C99F8FC16284ECF002D2135 - 8C95FF21162C3A8B003BB463 - 8C95FFD516301448003BB463 - - - SplitCount - 1 - - StatusBarVisibility - - - GeometryConfiguration - - Frame - {{0, 0}, {1027, 357}} - RubberWindowFrame - 632 443 1235 615 0 0 1920 1058 - - Module - PBXNavigatorGroup - Proportion - 357pt - - - ContentConfiguration - - PBXProjectModuleGUID - 1CE0B20506471E060097A5F4 - PBXProjectModuleLabel - Detail - - GeometryConfiguration - - Frame - {{0, 362}, {1027, 212}} - RubberWindowFrame - 632 443 1235 615 0 0 1920 1058 - - Module - XCDetailModule - Proportion - 212pt - - - Proportion - 1027pt - - - Name - Project - ServiceClasses - - XCModuleDock - PBXSmartGroupTreeModule - XCModuleDock - PBXNavigatorGroup - XCDetailModule - - TableOfContents - - 8C95FEE8162C08FC003BB463 - 1CE0B1FE06471DED0097A5F4 - 8C95FEE9162C08FC003BB463 - 1CE0B20306471E060097A5F4 - 1CE0B20506471E060097A5F4 - - ToolbarConfigUserDefaultsMinorVersion - 2 - ToolbarConfiguration - xcode.toolbar.config.defaultV3 - - - ControllerClassBaseName - - IconName - WindowOfProject - Identifier - perspective.morph - IsVertical - 0 - Layout - - - BecomeActive - 1 - ContentConfiguration - - PBXBottomSmartGroupGIDs - - 1C37FBAC04509CD000000102 - 1C37FAAC04509CD000000102 - 1C08E77C0454961000C914BD - 1C37FABC05509CD000000102 - 1C37FABC05539CD112110102 - E2644B35053B69B200211256 - 1C37FABC04509CD000100104 - 1CC0EA4004350EF90044410B - 1CC0EA4004350EF90041110B - - PBXProjectModuleGUID - 11E0B1FE06471DED0097A5F4 - PBXProjectModuleLabel - Files - PBXProjectStructureProvided - yes - PBXSmartGroupTreeModuleColumnData - - PBXSmartGroupTreeModuleColumnWidthsKey - - 186 - - PBXSmartGroupTreeModuleColumnsKey_v4 - - MainColumn - - - PBXSmartGroupTreeModuleOutlineStateKey_v7 - - PBXSmartGroupTreeModuleOutlineStateExpansionKey - - 29B97314FDCFA39411CA2CEA - 1C37FABC05509CD000000102 - - PBXSmartGroupTreeModuleOutlineStateSelectionKey - - - 0 - - - PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {186, 337}} - - PBXTopSmartGroupGIDs - - XCIncludePerspectivesSwitch - 1 - XCSharingToken - com.apple.Xcode.GFSharingToken - - GeometryConfiguration - - Frame - {{0, 0}, {203, 355}} - GroupTreeTableConfiguration - - MainColumn - 186 - - RubberWindowFrame - 373 269 690 397 0 0 1440 878 - - Module - PBXSmartGroupTreeModule - Proportion - 100% - - - Name - Morph - PreferredWidth - 300 - ServiceClasses - - XCModuleDock - PBXSmartGroupTreeModule - - TableOfContents - - 11E0B1FE06471DED0097A5F4 - - ToolbarConfiguration - xcode.toolbar.config.default.shortV3 - - - PerspectivesBarVisible - - ShelfIsVisible - - SourceDescription - file at '/Developer/Library/PrivateFrameworks/DevToolsInterface.framework/Resources/XCPerspectivesSpecificationMode1.xcperspec' - StatusbarIsVisible - - TimeStamp - 0.0 - ToolbarConfigUserDefaultsMinorVersion - 2 - ToolbarDisplayMode - 1 - ToolbarIsVisible - - ToolbarSizeMode - 1 - Type - Perspectives - UpdateMessage - The Default Workspace in this version of Xcode now includes support to hide and show the detail view (what has been referred to as the "Metro-Morph" feature). You must discard your current Default Workspace settings and update to the latest Default Workspace in order to gain this feature. Do you wish to update to the latest Workspace defaults for project '%@'? - WindowJustification - 5 - WindowOrderList - - 8C37DD951615938A00016A95 - 8C99F7B616283292002D2135 - 8C99F7B216283292002D2135 - 8C95FF84162D59A0003BB463 - 8C99F89B16284444002D2135 - /Users/svp/Liferay/trunk/LiferayFinderCore/LiferayFinderCore.xcodeproj - - WindowString - 632 443 1235 615 0 0 1920 1058 - WindowToolsV3 - - - FirstTimeWindowDisplayed - - Identifier - windowTool.build - IsVertical - - Layout - - - Dock - - - ContentConfiguration - - PBXProjectModuleGUID - 1CD0528F0623707200166675 - PBXProjectModuleLabel - FinderHook.m - StatusBarVisibility - - - GeometryConfiguration - - Frame - {{0, 0}, {698, 229}} - RubberWindowFrame - 1121 132 698 522 0 0 1920 1058 - - Module - PBXNavigatorGroup - Proportion - 229pt - - - BecomeActive - - ContentConfiguration - - PBXProjectModuleGUID - XCMainBuildResultsModuleGUID - PBXProjectModuleLabel - Build Results - XCBuildResultsTrigger_Collapse - 1021 - XCBuildResultsTrigger_Open - 1011 - - GeometryConfiguration - - Frame - {{0, 234}, {698, 247}} - RubberWindowFrame - 1121 132 698 522 0 0 1920 1058 - - Module - PBXBuildResultsModule - Proportion - 247pt - - - Proportion - 481pt - - - Name - Build Results - ServiceClasses - - PBXBuildResultsModule - - StatusbarIsVisible - - TableOfContents - - 8C37DD951615938A00016A95 - 8C95FEED162C08FC003BB463 - 1CD0528F0623707200166675 - XCMainBuildResultsModuleGUID - - ToolbarConfiguration - xcode.toolbar.config.buildV3 - WindowContentMinSize - 486 300 - WindowString - 1121 132 698 522 0 0 1920 1058 - WindowToolGUID - 8C37DD951615938A00016A95 - WindowToolIsVisible - - - - Identifier - windowTool.debugger - Layout - - - Dock - - - ContentConfiguration - - Debugger - - HorizontalSplitView - - _collapsingFrameDimension - 0.0 - _indexOfCollapsedView - 0 - _percentageOfCollapsedView - 0.0 - isCollapsed - yes - sizes - - {{0, 0}, {317, 164}} - {{317, 0}, {377, 164}} - - - VerticalSplitView - - _collapsingFrameDimension - 0.0 - _indexOfCollapsedView - 0 - _percentageOfCollapsedView - 0.0 - isCollapsed - yes - sizes - - {{0, 0}, {694, 164}} - {{0, 164}, {694, 216}} - - - - LauncherConfigVersion - 8 - PBXProjectModuleGUID - 1C162984064C10D400B95A72 - PBXProjectModuleLabel - Debug - GLUTExamples (Underwater) - - GeometryConfiguration - - DebugConsoleDrawerSize - {100, 120} - DebugConsoleVisible - None - DebugConsoleWindowFrame - {{200, 200}, {500, 300}} - DebugSTDIOWindowFrame - {{200, 200}, {500, 300}} - Frame - {{0, 0}, {694, 380}} - RubberWindowFrame - 321 238 694 422 0 0 1440 878 - - Module - PBXDebugSessionModule - Proportion - 100% - - - Proportion - 100% - - - Name - Debugger - ServiceClasses - - PBXDebugSessionModule - - StatusbarIsVisible - 1 - TableOfContents - - 1CD10A99069EF8BA00B06720 - 1C0AD2AB069F1E9B00FABCE6 - 1C162984064C10D400B95A72 - 1C0AD2AC069F1E9B00FABCE6 - - ToolbarConfiguration - xcode.toolbar.config.debugV3 - WindowString - 321 238 694 422 0 0 1440 878 - WindowToolGUID - 1CD10A99069EF8BA00B06720 - WindowToolIsVisible - 0 - - - Identifier - windowTool.find - Layout - - - Dock - - - Dock - - - ContentConfiguration - - PBXProjectModuleGUID - 1CDD528C0622207200134675 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 1CD0528D0623707200166675 - - SplitCount - 1 - - StatusBarVisibility - 1 - - GeometryConfiguration - - Frame - {{0, 0}, {781, 167}} - RubberWindowFrame - 62 385 781 470 0 0 1440 878 - - Module - PBXNavigatorGroup - Proportion - 781pt - - - Proportion - 50% - - - BecomeActive - 1 - ContentConfiguration - - PBXProjectModuleGUID - 1CD0528E0623707200166675 - PBXProjectModuleLabel - Project Find - - GeometryConfiguration - - Frame - {{8, 0}, {773, 254}} - RubberWindowFrame - 62 385 781 470 0 0 1440 878 - - Module - PBXProjectFindModule - Proportion - 50% - - - Proportion - 428pt - - - Name - Project Find - ServiceClasses - - PBXProjectFindModule - - StatusbarIsVisible - 1 - TableOfContents - - 1C530D57069F1CE1000CFCEE - 1C530D58069F1CE1000CFCEE - 1C530D59069F1CE1000CFCEE - 1CDD528C0622207200134675 - 1C530D5A069F1CE1000CFCEE - 1CE0B1FE06471DED0097A5F4 - 1CD0528E0623707200166675 - - WindowString - 62 385 781 470 0 0 1440 878 - WindowToolGUID - 1C530D57069F1CE1000CFCEE - WindowToolIsVisible - 0 - - - Identifier - MENUSEPARATOR - - - Identifier - windowTool.debuggerConsole - Layout - - - Dock - - - BecomeActive - 1 - ContentConfiguration - - PBXProjectModuleGUID - 1C78EAAC065D492600B07095 - PBXProjectModuleLabel - Debugger Console - - GeometryConfiguration - - Frame - {{0, 0}, {650, 250}} - RubberWindowFrame - 516 632 650 250 0 0 1680 1027 - - Module - PBXDebugCLIModule - Proportion - 209pt - - - Proportion - 209pt - - - Name - Debugger Console - ServiceClasses - - PBXDebugCLIModule - - StatusbarIsVisible - 1 - TableOfContents - - 1C78EAAD065D492600B07095 - 1C78EAAE065D492600B07095 - 1C78EAAC065D492600B07095 - - ToolbarConfiguration - xcode.toolbar.config.consoleV3 - WindowString - 650 41 650 250 0 0 1280 1002 - WindowToolGUID - 1C78EAAD065D492600B07095 - WindowToolIsVisible - 0 - - - Identifier - windowTool.snapshots - Layout - - - Dock - - - Module - XCSnapshotModule - Proportion - 100% - - - Proportion - 100% - - - Name - Snapshots - ServiceClasses - - XCSnapshotModule - - StatusbarIsVisible - Yes - ToolbarConfiguration - xcode.toolbar.config.snapshots - WindowString - 315 824 300 550 0 0 1440 878 - WindowToolIsVisible - Yes - - - Identifier - windowTool.scm - Layout - - - Dock - - - ContentConfiguration - - PBXProjectModuleGUID - 1C78EAB2065D492600B07095 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 1C78EAB3065D492600B07095 - - SplitCount - 1 - - StatusBarVisibility - 1 - - GeometryConfiguration - - Frame - {{0, 0}, {452, 0}} - RubberWindowFrame - 743 379 452 308 0 0 1280 1002 - - Module - PBXNavigatorGroup - Proportion - 0pt - - - BecomeActive - 1 - ContentConfiguration - - PBXProjectModuleGUID - 1CD052920623707200166675 - PBXProjectModuleLabel - SCM - - GeometryConfiguration - - ConsoleFrame - {{0, 259}, {452, 0}} - Frame - {{0, 7}, {452, 259}} - RubberWindowFrame - 743 379 452 308 0 0 1280 1002 - TableConfiguration - - Status - 30 - FileName - 199 - Path - 197.0950012207031 - - TableFrame - {{0, 0}, {452, 250}} - - Module - PBXCVSModule - Proportion - 262pt - - - Proportion - 266pt - - - Name - SCM - ServiceClasses - - PBXCVSModule - - StatusbarIsVisible - 1 - TableOfContents - - 1C78EAB4065D492600B07095 - 1C78EAB5065D492600B07095 - 1C78EAB2065D492600B07095 - 1CD052920623707200166675 - - ToolbarConfiguration - xcode.toolbar.config.scm - WindowString - 743 379 452 308 0 0 1280 1002 - - - Identifier - windowTool.breakpoints - IsVertical - 0 - Layout - - - Dock - - - BecomeActive - 1 - ContentConfiguration - - PBXBottomSmartGroupGIDs - - 1C77FABC04509CD000000102 - - PBXProjectModuleGUID - 1CE0B1FE06471DED0097A5F4 - PBXProjectModuleLabel - Files - PBXProjectStructureProvided - no - PBXSmartGroupTreeModuleColumnData - - PBXSmartGroupTreeModuleColumnWidthsKey - - 168 - - PBXSmartGroupTreeModuleColumnsKey_v4 - - MainColumn - - - PBXSmartGroupTreeModuleOutlineStateKey_v7 - - PBXSmartGroupTreeModuleOutlineStateExpansionKey - - 1C77FABC04509CD000000102 - - PBXSmartGroupTreeModuleOutlineStateSelectionKey - - - 0 - - - PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {168, 350}} - - PBXTopSmartGroupGIDs - - XCIncludePerspectivesSwitch - 0 - - GeometryConfiguration - - Frame - {{0, 0}, {185, 368}} - GroupTreeTableConfiguration - - MainColumn - 168 - - RubberWindowFrame - 315 424 744 409 0 0 1440 878 - - Module - PBXSmartGroupTreeModule - Proportion - 185pt - - - ContentConfiguration - - PBXProjectModuleGUID - 1CA1AED706398EBD00589147 - PBXProjectModuleLabel - Detail - - GeometryConfiguration - - Frame - {{190, 0}, {554, 368}} - RubberWindowFrame - 315 424 744 409 0 0 1440 878 - - Module - XCDetailModule - Proportion - 554pt - - - Proportion - 368pt - - - MajorVersion - 3 - MinorVersion - 0 - Name - Breakpoints - ServiceClasses - - PBXSmartGroupTreeModule - XCDetailModule - - StatusbarIsVisible - 1 - TableOfContents - - 1CDDB66807F98D9800BB5817 - 1CDDB66907F98D9800BB5817 - 1CE0B1FE06471DED0097A5F4 - 1CA1AED706398EBD00589147 - - ToolbarConfiguration - xcode.toolbar.config.breakpointsV3 - WindowString - 315 424 744 409 0 0 1440 878 - WindowToolGUID - 1CDDB66807F98D9800BB5817 - WindowToolIsVisible - 1 - - - Identifier - windowTool.debugAnimator - Layout - - - Dock - - - Module - PBXNavigatorGroup - Proportion - 100% - - - Proportion - 100% - - - Name - Debug Visualizer - ServiceClasses - - PBXNavigatorGroup - - StatusbarIsVisible - 1 - ToolbarConfiguration - xcode.toolbar.config.debugAnimatorV3 - WindowString - 100 100 700 500 0 0 1280 1002 - - - Identifier - windowTool.bookmarks - Layout - - - Dock - - - Module - PBXBookmarksModule - Proportion - 100% - - - Proportion - 100% - - - Name - Bookmarks - ServiceClasses - - PBXBookmarksModule - - StatusbarIsVisible - 0 - WindowString - 538 42 401 187 0 0 1280 1002 - - - Identifier - windowTool.projectFormatConflicts - Layout - - - Dock - - - Module - XCProjectFormatConflictsModule - Proportion - 100% - - - Proportion - 100% - - - Name - Project Format Conflicts - ServiceClasses - - XCProjectFormatConflictsModule - - StatusbarIsVisible - 0 - WindowContentMinSize - 450 300 - WindowString - 50 850 472 307 0 0 1440 877 - - - Identifier - windowTool.classBrowser - Layout - - - Dock - - - BecomeActive - 1 - ContentConfiguration - - OptionsSetName - Hierarchy, all classes - PBXProjectModuleGUID - 1CA6456E063B45B4001379D8 - PBXProjectModuleLabel - Class Browser - NSObject - - GeometryConfiguration - - ClassesFrame - {{0, 0}, {374, 96}} - ClassesTreeTableConfiguration - - PBXClassNameColumnIdentifier - 208 - PBXClassBookColumnIdentifier - 22 - - Frame - {{0, 0}, {630, 331}} - MembersFrame - {{0, 105}, {374, 395}} - MembersTreeTableConfiguration - - PBXMemberTypeIconColumnIdentifier - 22 - PBXMemberNameColumnIdentifier - 216 - PBXMemberTypeColumnIdentifier - 97 - PBXMemberBookColumnIdentifier - 22 - - PBXModuleWindowStatusBarHidden2 - 1 - RubberWindowFrame - 385 179 630 352 0 0 1440 878 - - Module - PBXClassBrowserModule - Proportion - 332pt - - - Proportion - 332pt - - - Name - Class Browser - ServiceClasses - - PBXClassBrowserModule - - StatusbarIsVisible - 0 - TableOfContents - - 1C0AD2AF069F1E9B00FABCE6 - 1C0AD2B0069F1E9B00FABCE6 - 1CA6456E063B45B4001379D8 - - ToolbarConfiguration - xcode.toolbar.config.classbrowser - WindowString - 385 179 630 352 0 0 1440 878 - WindowToolGUID - 1C0AD2AF069F1E9B00FABCE6 - WindowToolIsVisible - 0 - - - Identifier - windowTool.refactoring - IncludeInToolsMenu - 0 - Layout - - - Dock - - - BecomeActive - 1 - GeometryConfiguration - - Frame - {0, 0}, {500, 335} - RubberWindowFrame - {0, 0}, {500, 335} - - Module - XCRefactoringModule - Proportion - 100% - - - Proportion - 100% - - - Name - Refactoring - ServiceClasses - - XCRefactoringModule - - WindowString - 200 200 500 356 0 0 1920 1200 - - - - diff --git a/shell_integration/MacOSX/LiferayNativityFinder/LiferayNativityFinder.xcodeproj/svp.pbxuser b/shell_integration/MacOSX/LiferayNativityFinder/LiferayNativityFinder.xcodeproj/svp.pbxuser deleted file mode 100644 index daa8f96a10..0000000000 --- a/shell_integration/MacOSX/LiferayNativityFinder/LiferayNativityFinder.xcodeproj/svp.pbxuser +++ /dev/null @@ -1,1899 +0,0 @@ -// !$*UTF8*$! -{ - 089C1669FE841209C02AAC07 /* Project object */ = { - activeBuildConfigurationName = Debug; - activeTarget = 8D57630D048677EA00EA77CD /* LiferayFinderCore */; - addToTargets = ( - 8D57630D048677EA00EA77CD /* LiferayFinderCore */, - ); - breakpoints = ( - 8C99F8BD162849F3002D2135 /* FinderHook.m:112 */, - ); - codeSenseManager = 8C37DD981615938A00016A95 /* Code sense */; - perUserDictionary = { - PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = { - PBXFileTableDataSourceColumnSortingDirectionKey = 1; - PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; - PBXFileTableDataSourceColumnWidthsKey = ( - 20, - 788, - 20, - 48, - 43, - 43, - 20, - ); - PBXFileTableDataSourceColumnsKey = ( - PBXFileDataSource_FiletypeID, - PBXFileDataSource_Filename_ColumnID, - PBXFileDataSource_Built_ColumnID, - PBXFileDataSource_ObjectSize_ColumnID, - PBXFileDataSource_Errors_ColumnID, - PBXFileDataSource_Warnings_ColumnID, - PBXFileDataSource_Target_ColumnID, - ); - }; - PBXPerProjectTemplateStateSaveDate = 371984582; - PBXWorkspaceStateSaveDate = 371984582; - }; - perUserProjectItems = { - 8C95FEE7162C08FC003BB463 /* PBXTextBookmark */ = 8C95FEE7162C08FC003BB463 /* PBXTextBookmark */; - 8C95FEEA162C08FC003BB463 /* PBXTextBookmark */ = 8C95FEEA162C08FC003BB463 /* PBXTextBookmark */; - 8C95FEEB162C08FC003BB463 /* PBXTextBookmark */ = 8C95FEEB162C08FC003BB463 /* PBXTextBookmark */; - 8C95FEEC162C08FC003BB463 /* PBXTextBookmark */ = 8C95FEEC162C08FC003BB463 /* PBXTextBookmark */; - 8C95FF03162C3429003BB463 /* PBXTextBookmark */ = 8C95FF03162C3429003BB463 /* PBXTextBookmark */; - 8C95FF04162C3429003BB463 /* PBXTextBookmark */ = 8C95FF04162C3429003BB463 /* PBXTextBookmark */; - 8C95FF05162C3429003BB463 /* PBXTextBookmark */ = 8C95FF05162C3429003BB463 /* PBXTextBookmark */; - 8C95FF06162C3429003BB463 /* PBXTextBookmark */ = 8C95FF06162C3429003BB463 /* PBXTextBookmark */; - 8C95FF21162C3A8B003BB463 /* PBXTextBookmark */ = 8C95FF21162C3A8B003BB463 /* PBXTextBookmark */; - 8C95FF22162C3A8B003BB463 /* XCBuildMessageTextBookmark */ = 8C95FF22162C3A8B003BB463 /* XCBuildMessageTextBookmark */; - 8C95FF23162C3A8B003BB463 /* PBXTextBookmark */ = 8C95FF23162C3A8B003BB463 /* PBXTextBookmark */; - 8C95FF24162C3A8B003BB463 /* PBXTextBookmark */ = 8C95FF24162C3A8B003BB463 /* PBXTextBookmark */; - 8C95FF25162C3A8B003BB463 /* PBXTextBookmark */ = 8C95FF25162C3A8B003BB463 /* PBXTextBookmark */; - 8C95FF26162C3A8B003BB463 /* PBXTextBookmark */ = 8C95FF26162C3A8B003BB463 /* PBXTextBookmark */; - 8C95FF4B162C3D26003BB463 /* PBXTextBookmark */ = 8C95FF4B162C3D26003BB463 /* PBXTextBookmark */; - 8C95FF4C162C3D26003BB463 /* PBXTextBookmark */ = 8C95FF4C162C3D26003BB463 /* PBXTextBookmark */; - 8C95FF4D162C3D26003BB463 /* PBXTextBookmark */ = 8C95FF4D162C3D26003BB463 /* PBXTextBookmark */; - 8C95FF4E162C3D26003BB463 /* PBXTextBookmark */ = 8C95FF4E162C3D26003BB463 /* PBXTextBookmark */; - 8C95FF5A162C3ED2003BB463 /* XCBuildMessageTextBookmark */ = 8C95FF5A162C3ED2003BB463 /* XCBuildMessageTextBookmark */; - 8C95FF5B162C3ED2003BB463 /* PBXTextBookmark */ = 8C95FF5B162C3ED2003BB463 /* PBXTextBookmark */; - 8C95FF6A162D5608003BB463 /* PBXTextBookmark */ = 8C95FF6A162D5608003BB463 /* PBXTextBookmark */; - 8C95FF6B162D5608003BB463 /* PBXTextBookmark */ = 8C95FF6B162D5608003BB463 /* PBXTextBookmark */; - 8C95FF6C162D5608003BB463 /* PBXTextBookmark */ = 8C95FF6C162D5608003BB463 /* PBXTextBookmark */; - 8C95FF6D162D5608003BB463 /* PBXTextBookmark */ = 8C95FF6D162D5608003BB463 /* PBXTextBookmark */; - 8C95FF80162D59A0003BB463 /* XCBuildMessageTextBookmark */ = 8C95FF80162D59A0003BB463 /* XCBuildMessageTextBookmark */; - 8C95FF81162D59A0003BB463 /* PBXTextBookmark */ = 8C95FF81162D59A0003BB463 /* PBXTextBookmark */; - 8C95FF82162D59A0003BB463 /* PBXTextBookmark */ = 8C95FF82162D59A0003BB463 /* PBXTextBookmark */; - 8C95FF83162D59A0003BB463 /* PBXTextBookmark */ = 8C95FF83162D59A0003BB463 /* PBXTextBookmark */; - 8C95FF86162D59A0003BB463 /* PBXTextBookmark */ = 8C95FF86162D59A0003BB463 /* PBXTextBookmark */; - 8C95FF87162D59A0003BB463 /* PBXTextBookmark */ = 8C95FF87162D59A0003BB463 /* PBXTextBookmark */; - 8C95FF88162D59A0003BB463 /* PBXTextBookmark */ = 8C95FF88162D59A0003BB463 /* PBXTextBookmark */; - 8C95FF89162D59A0003BB463 /* PBXTextBookmark */ = 8C95FF89162D59A0003BB463 /* PBXTextBookmark */; - 8C95FFAF162D771B003BB463 /* PBXTextBookmark */ = 8C95FFAF162D771B003BB463 /* PBXTextBookmark */; - 8C95FFB0162D771B003BB463 /* PBXTextBookmark */ = 8C95FFB0162D771B003BB463 /* PBXTextBookmark */; - 8C95FFB1162D771B003BB463 /* PBXTextBookmark */ = 8C95FFB1162D771B003BB463 /* PBXTextBookmark */; - 8C95FFB2162D771B003BB463 /* PBXTextBookmark */ = 8C95FFB2162D771B003BB463 /* PBXTextBookmark */; - 8C95FFB3162D771B003BB463 /* PBXTextBookmark */ = 8C95FFB3162D771B003BB463 /* PBXTextBookmark */; - 8C95FFB4162D771B003BB463 /* PBXTextBookmark */ = 8C95FFB4162D771B003BB463 /* PBXTextBookmark */; - 8C95FFB5162D771B003BB463 /* PBXTextBookmark */ = 8C95FFB5162D771B003BB463 /* PBXTextBookmark */; - 8C95FFC0162D7A3D003BB463 /* PBXTextBookmark */ = 8C95FFC0162D7A3D003BB463 /* PBXTextBookmark */; - 8C95FFC1162D7A3D003BB463 /* PBXTextBookmark */ = 8C95FFC1162D7A3D003BB463 /* PBXTextBookmark */; - 8C95FFC2162D7A3D003BB463 /* PBXTextBookmark */ = 8C95FFC2162D7A3D003BB463 /* PBXTextBookmark */; - 8C95FFC3162D7A3D003BB463 /* PBXTextBookmark */ = 8C95FFC3162D7A3D003BB463 /* PBXTextBookmark */; - 8C95FFC4162D7A3D003BB463 /* PBXTextBookmark */ = 8C95FFC4162D7A3D003BB463 /* PBXTextBookmark */; - 8C95FFC5162D7A3D003BB463 /* PBXTextBookmark */ = 8C95FFC5162D7A3D003BB463 /* PBXTextBookmark */; - 8C95FFC6162D7A3D003BB463 /* PBXTextBookmark */ = 8C95FFC6162D7A3D003BB463 /* PBXTextBookmark */; - 8C95FFD516301448003BB463 /* PBXTextBookmark */ = 8C95FFD516301448003BB463 /* PBXTextBookmark */; - 8C95FFD616301448003BB463 /* PBXTextBookmark */ = 8C95FFD616301448003BB463 /* PBXTextBookmark */; - 8C95FFD716301448003BB463 /* PBXTextBookmark */ = 8C95FFD716301448003BB463 /* PBXTextBookmark */; - 8C95FFD816301448003BB463 /* PBXTextBookmark */ = 8C95FFD816301448003BB463 /* PBXTextBookmark */; - 8C95FFD916301448003BB463 /* PBXTextBookmark */ = 8C95FFD916301448003BB463 /* PBXTextBookmark */; - 8C95FFDA16301448003BB463 /* PBXTextBookmark */ = 8C95FFDA16301448003BB463 /* PBXTextBookmark */; - 8C99F6D716241A83002D2135 = 8C99F6D716241A83002D2135 /* PBXTextBookmark */; - 8C99F6D816241A83002D2135 = 8C99F6D816241A83002D2135 /* PBXTextBookmark */; - 8C99F6D916241A83002D2135 = 8C99F6D916241A83002D2135 /* PBXTextBookmark */; - 8C99F6DA16241A83002D2135 = 8C99F6DA16241A83002D2135 /* PBXTextBookmark */; - 8C99F6DB16241A83002D2135 = 8C99F6DB16241A83002D2135 /* PBXTextBookmark */; - 8C99F6E11626C51C002D2135 = 8C99F6E11626C51C002D2135 /* PBXTextBookmark */; - 8C99F70916280074002D2135 = 8C99F70916280074002D2135 /* PBXTextBookmark */; - 8C99F70A16280074002D2135 = 8C99F70A16280074002D2135 /* PBXTextBookmark */; - 8C99F73216280B63002D2135 = 8C99F73216280B63002D2135 /* PBXTextBookmark */; - 8C99F73316280B63002D2135 = 8C99F73316280B63002D2135 /* PBXTextBookmark */; - 8C99F73416280B63002D2135 = 8C99F73416280B63002D2135 /* PBXTextBookmark */; - 8C99F75E16280FF3002D2135 = 8C99F75E16280FF3002D2135 /* PBXTextBookmark */; - 8C99F75F16280FF3002D2135 = 8C99F75F16280FF3002D2135 /* PBXTextBookmark */; - 8C99F76016280FF3002D2135 = 8C99F76016280FF3002D2135 /* PBXTextBookmark */; - 8C99F79516282FF8002D2135 = 8C99F79516282FF8002D2135 /* PBXTextBookmark */; - 8C99F7AA16283292002D2135 = 8C99F7AA16283292002D2135 /* PBXTextBookmark */; - 8C99F7AB16283292002D2135 = 8C99F7AB16283292002D2135 /* PBXTextBookmark */; - 8C99F7AC16283292002D2135 = 8C99F7AC16283292002D2135 /* PBXTextBookmark */; - 8C99F7B116283292002D2135 = 8C99F7B116283292002D2135 /* PBXTextBookmark */; - 8C99F7B416283292002D2135 = 8C99F7B416283292002D2135 /* PBXTextBookmark */; - 8C99F7B516283292002D2135 = 8C99F7B516283292002D2135 /* PBXTextBookmark */; - 8C99F7B816283292002D2135 = 8C99F7B816283292002D2135 /* PBXTextBookmark */; - 8C99F7B916283292002D2135 = 8C99F7B916283292002D2135 /* PBXTextBookmark */; - 8C99F7BC16283292002D2135 = 8C99F7BC16283292002D2135 /* PBXTextBookmark */; - 8C99F7BE16283292002D2135 = 8C99F7BE16283292002D2135 /* PBXTextBookmark */; - 8C99F7C4162832E3002D2135 = 8C99F7C4162832E3002D2135 /* PBXTextBookmark */; - 8C99F7C5162832E3002D2135 = 8C99F7C5162832E3002D2135 /* PBXTextBookmark */; - 8C99F7C6162832E3002D2135 = 8C99F7C6162832E3002D2135 /* PBXTextBookmark */; - 8C99F7C7162832E3002D2135 = 8C99F7C7162832E3002D2135 /* PBXTextBookmark */; - 8C99F7C8162832E3002D2135 = 8C99F7C8162832E3002D2135 /* PBXTextBookmark */; - 8C99F7C916283348002D2135 = 8C99F7C916283348002D2135 /* PBXTextBookmark */; - 8C99F7CA16283348002D2135 = 8C99F7CA16283348002D2135 /* PBXTextBookmark */; - 8C99F7CB16283348002D2135 = 8C99F7CB16283348002D2135 /* PBXTextBookmark */; - 8C99F7CC16283348002D2135 = 8C99F7CC16283348002D2135 /* PBXTextBookmark */; - 8C99F7CD16283348002D2135 = 8C99F7CD16283348002D2135 /* PBXTextBookmark */; - 8C99F7D316283395002D2135 = 8C99F7D316283395002D2135 /* PBXTextBookmark */; - 8C99F7D416283395002D2135 = 8C99F7D416283395002D2135 /* PBXTextBookmark */; - 8C99F7D516283395002D2135 = 8C99F7D516283395002D2135 /* PBXTextBookmark */; - 8C99F7D616283395002D2135 = 8C99F7D616283395002D2135 /* PBXTextBookmark */; - 8C99F7D716283395002D2135 = 8C99F7D716283395002D2135 /* PBXTextBookmark */; - 8C99F7D816283395002D2135 = 8C99F7D816283395002D2135 /* PBXTextBookmark */; - 8C99F7D9162833DB002D2135 = 8C99F7D9162833DB002D2135 /* PBXTextBookmark */; - 8C99F7DA162833DB002D2135 = 8C99F7DA162833DB002D2135 /* PBXTextBookmark */; - 8C99F7DB162833DB002D2135 = 8C99F7DB162833DB002D2135 /* PBXTextBookmark */; - 8C99F7DC162833DB002D2135 = 8C99F7DC162833DB002D2135 /* PBXTextBookmark */; - 8C99F7DD162833DB002D2135 = 8C99F7DD162833DB002D2135 /* PBXTextBookmark */; - 8C99F7E91628351A002D2135 = 8C99F7E91628351A002D2135 /* PBXTextBookmark */; - 8C99F7EA1628351A002D2135 = 8C99F7EA1628351A002D2135 /* PBXTextBookmark */; - 8C99F7EB1628351A002D2135 = 8C99F7EB1628351A002D2135 /* PBXTextBookmark */; - 8C99F7EC1628351A002D2135 = 8C99F7EC1628351A002D2135 /* PBXTextBookmark */; - 8C99F7ED1628351A002D2135 = 8C99F7ED1628351A002D2135 /* PBXTextBookmark */; - 8C99F7EE1628351A002D2135 = 8C99F7EE1628351A002D2135 /* PBXTextBookmark */; - 8C99F7F11628351A002D2135 = 8C99F7F11628351A002D2135 /* PBXTextBookmark */; - 8C99F7F21628351A002D2135 = 8C99F7F21628351A002D2135 /* PBXTextBookmark */; - 8C99F7F31628351A002D2135 = 8C99F7F31628351A002D2135 /* PBXTextBookmark */; - 8C99F7F41628351A002D2135 = 8C99F7F41628351A002D2135 /* PBXTextBookmark */; - 8C99F7F51628351A002D2135 = 8C99F7F51628351A002D2135 /* PBXTextBookmark */; - 8C99F7F61628351A002D2135 = 8C99F7F61628351A002D2135 /* PBXTextBookmark */; - 8C99F7F71628351A002D2135 = 8C99F7F71628351A002D2135 /* PBXTextBookmark */; - 8C99F80716283601002D2135 = 8C99F80716283601002D2135 /* PBXTextBookmark */; - 8C99F80816283601002D2135 = 8C99F80816283601002D2135 /* PBXTextBookmark */; - 8C99F80916283601002D2135 = 8C99F80916283601002D2135 /* PBXTextBookmark */; - 8C99F80A16283601002D2135 = 8C99F80A16283601002D2135 /* PBXTextBookmark */; - 8C99F80B16283601002D2135 = 8C99F80B16283601002D2135 /* PBXTextBookmark */; - 8C99F80C16283601002D2135 = 8C99F80C16283601002D2135 /* PBXTextBookmark */; - 8C99F80D16283601002D2135 = 8C99F80D16283601002D2135 /* PBXTextBookmark */; - 8C99F84F16283CE1002D2135 = 8C99F84F16283CE1002D2135 /* PBXTextBookmark */; - 8C99F85016283CE1002D2135 = 8C99F85016283CE1002D2135 /* PBXTextBookmark */; - 8C99F85116283CE1002D2135 = 8C99F85116283CE1002D2135 /* PBXTextBookmark */; - 8C99F85216283CE1002D2135 = 8C99F85216283CE1002D2135 /* PBXTextBookmark */; - 8C99F85316283CE1002D2135 = 8C99F85316283CE1002D2135 /* PBXTextBookmark */; - 8C99F85416283CE1002D2135 = 8C99F85416283CE1002D2135 /* PBXTextBookmark */; - 8C99F85516283CE1002D2135 = 8C99F85516283CE1002D2135 /* PBXTextBookmark */; - 8C99F87C1628406A002D2135 = 8C99F87C1628406A002D2135 /* PBXBookmark */; - 8C99F89616284444002D2135 = 8C99F89616284444002D2135 /* PBXTextBookmark */; - 8C99F89716284444002D2135 = 8C99F89716284444002D2135 /* PBXTextBookmark */; - 8C99F89816284444002D2135 = 8C99F89816284444002D2135 /* PBXTextBookmark */; - 8C99F89916284444002D2135 = 8C99F89916284444002D2135 /* PBXTextBookmark */; - 8C99F89A16284444002D2135 = 8C99F89A16284444002D2135 /* PBXTextBookmark */; - 8C99F89D16284444002D2135 = 8C99F89D16284444002D2135 /* PBXTextBookmark */; - 8C99F89E16284444002D2135 = 8C99F89E16284444002D2135 /* PBXTextBookmark */; - 8C99F8AB16284854002D2135 = 8C99F8AB16284854002D2135 /* PBXTextBookmark */; - 8C99F8AC16284854002D2135 = 8C99F8AC16284854002D2135 /* PBXTextBookmark */; - 8C99F8AD16284854002D2135 = 8C99F8AD16284854002D2135 /* PBXTextBookmark */; - 8C99F8AE16284854002D2135 = 8C99F8AE16284854002D2135 /* PBXTextBookmark */; - 8C99F8C716284A2D002D2135 = 8C99F8C716284A2D002D2135 /* PBXTextBookmark */; - 8C99F8C816284A2D002D2135 = 8C99F8C816284A2D002D2135 /* PBXTextBookmark */; - 8C99F8C916284A2D002D2135 = 8C99F8C916284A2D002D2135 /* PBXTextBookmark */; - 8C99F8CA16284A2D002D2135 = 8C99F8CA16284A2D002D2135 /* PBXTextBookmark */; - 8C99F8CB16284A2D002D2135 = 8C99F8CB16284A2D002D2135 /* PBXTextBookmark */; - 8C99F8D816284A7B002D2135 = 8C99F8D816284A7B002D2135 /* PBXTextBookmark */; - 8C99F8D916284A7B002D2135 = 8C99F8D916284A7B002D2135 /* PBXTextBookmark */; - 8C99F8DA16284A7B002D2135 = 8C99F8DA16284A7B002D2135 /* PBXTextBookmark */; - 8C99F8DB16284A7B002D2135 = 8C99F8DB16284A7B002D2135 /* PBXTextBookmark */; - 8C99F8EA16284AB5002D2135 = 8C99F8EA16284AB5002D2135 /* PBXTextBookmark */; - 8C99F8EB16284AB5002D2135 = 8C99F8EB16284AB5002D2135 /* PBXTextBookmark */; - 8C99F8EC16284AB5002D2135 = 8C99F8EC16284AB5002D2135 /* PBXTextBookmark */; - 8C99F8ED16284AB5002D2135 = 8C99F8ED16284AB5002D2135 /* PBXTextBookmark */; - 8C99F8FC16284ECF002D2135 = 8C99F8FC16284ECF002D2135 /* PBXTextBookmark */; - 8C99F8FD16284ECF002D2135 = 8C99F8FD16284ECF002D2135 /* PBXTextBookmark */; - 8C99F8FE16284ECF002D2135 = 8C99F8FE16284ECF002D2135 /* PBXTextBookmark */; - 8C99F8FF16284ECF002D2135 = 8C99F8FF16284ECF002D2135 /* PBXTextBookmark */; - 8C99F90016284ECF002D2135 = 8C99F90016284ECF002D2135 /* PBXTextBookmark */; - 8C99F90116284ECF002D2135 = 8C99F90116284ECF002D2135 /* PBXTextBookmark */; - 8C99F90216284ECF002D2135 = 8C99F90216284ECF002D2135 /* PBXTextBookmark */; - 8C99F90316284ECF002D2135 = 8C99F90316284ECF002D2135 /* PBXTextBookmark */; - 8C99F90D16284F81002D2135 = 8C99F90D16284F81002D2135 /* PBXTextBookmark */; - 8C99F90E16284F81002D2135 = 8C99F90E16284F81002D2135 /* PBXTextBookmark */; - 8C99F91016284F81002D2135 = 8C99F91016284F81002D2135 /* PBXTextBookmark */; - 8C99F91116284F81002D2135 = 8C99F91116284F81002D2135 /* PBXTextBookmark */; - }; - sourceControlManager = 8C37DD971615938A00016A95 /* Source Control */; - userBuildSettings = { - }; - }; - 8C37DD971615938A00016A95 /* Source Control */ = { - isa = PBXSourceControlManager; - fallbackIsa = XCSourceControlManager; - isSCMEnabled = 0; - scmConfiguration = { - repositoryNamesForRoots = { - "" = ""; - }; - }; - }; - 8C37DD981615938A00016A95 /* Code sense */ = { - isa = PBXCodeSenseManager; - indexTemplatePath = ""; - }; - 8C37DD99161593BD00016A95 /* FinderHook.h */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1823, 854}}"; - sepNavSelRange = "{212, 0}"; - sepNavVisRange = "{0, 212}"; - }; - }; - 8C37DD9A161593BD00016A95 /* FinderHook.m */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1823, 2275}}"; - sepNavSelRange = "{2654, 15}"; - sepNavVisRange = "{2334, 1837}"; - sepNavWindowFrame = "{{38, 91}, {1882, 941}}"; - }; - }; - 8C37DD9B161593BD00016A95 /* logger.c */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {966, 455}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 468}"; - sepNavWindowFrame = "{{15, 112}, {1882, 941}}"; - }; - }; - 8C37DD9C161593BD00016A95 /* logger.h */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {966, 404}}"; - sepNavSelRange = "{178, 0}"; - sepNavVisRange = "{0, 178}"; - }; - }; - 8C95FEE7162C08FC003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 13"; - rLen = 0; - rLoc = 199; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C95FEEA162C08FC003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 101"; - rLen = 0; - rLoc = 3293; - rType = 0; - vrLen = 2201; - vrLoc = 2277; - }; - 8C95FEEB162C08FC003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 71"; - rLen = 0; - rLoc = 1312; - rType = 0; - vrLen = 1180; - vrLoc = 209; - }; - 8C95FEEC162C08FC003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 18"; - rLen = 0; - rLoc = 289; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C95FF03162C3429003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 13"; - rLen = 0; - rLoc = 199; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C95FF04162C3429003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 161"; - rLen = 0; - rLoc = 5458; - rType = 0; - vrLen = 2235; - vrLoc = 3315; - }; - 8C95FF05162C3429003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 71"; - rLen = 0; - rLoc = 1312; - rType = 0; - vrLen = 1180; - vrLoc = 209; - }; - 8C95FF06162C3429003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 16"; - rLen = 0; - rLoc = 257; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C95FF21162C3A8B003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 13"; - rLen = 0; - rLoc = 199; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C95FF22162C3A8B003BB463 /* XCBuildMessageTextBookmark */ = { - isa = PBXTextBookmark; - comments = "Incompatible type for argument 1 of 'drawInRect:fromRect:operation:fraction:'"; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - fallbackIsa = XCBuildMessageTextBookmark; - rLen = 1; - rLoc = 163; - rType = 1; - }; - 8C95FF23162C3A8B003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 162"; - rLen = 0; - rLoc = 5438; - rType = 0; - vrLen = 918; - vrLoc = 4615; - }; - 8C95FF24162C3A8B003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 162"; - rLen = 0; - rLoc = 5539; - rType = 0; - vrLen = 2216; - vrLoc = 3255; - }; - 8C95FF25162C3A8B003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 71"; - rLen = 0; - rLoc = 1312; - rType = 0; - vrLen = 1180; - vrLoc = 209; - }; - 8C95FF26162C3A8B003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 16"; - rLen = 0; - rLoc = 257; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C95FF4B162C3D26003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 163"; - rLen = 0; - rLoc = 5438; - rType = 0; - vrLen = 1100; - vrLoc = 4615; - }; - 8C95FF4C162C3D26003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 162"; - rLen = 0; - rLoc = 5347; - rType = 0; - vrLen = 2389; - vrLoc = 3255; - }; - 8C95FF4D162C3D26003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 71"; - rLen = 0; - rLoc = 1312; - rType = 0; - vrLen = 1180; - vrLoc = 209; - }; - 8C95FF4E162C3D26003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 16"; - rLen = 0; - rLoc = 257; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C95FF5A162C3ED2003BB463 /* XCBuildMessageTextBookmark */ = { - isa = PBXTextBookmark; - comments = "Invalid initializer"; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - fallbackIsa = XCBuildMessageTextBookmark; - rLen = 1; - rLoc = 137; - rType = 1; - }; - 8C95FF5B162C3ED2003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 130"; - rLen = 0; - rLoc = 4289; - rType = 0; - vrLen = 472; - vrLoc = 4042; - }; - 8C95FF6A162D5608003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 163"; - rLen = 0; - rLoc = 5438; - rType = 0; - vrLen = 1202; - vrLoc = 4119; - }; - 8C95FF6B162D5608003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 130"; - rLen = 0; - rLoc = 4297; - rType = 0; - vrLen = 2221; - vrLoc = 3493; - }; - 8C95FF6C162D5608003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 71"; - rLen = 0; - rLoc = 1312; - rType = 0; - vrLen = 1180; - vrLoc = 209; - }; - 8C95FF6D162D5608003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 16"; - rLen = 0; - rLoc = 257; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C95FF80162D59A0003BB463 /* XCBuildMessageTextBookmark */ = { - isa = PBXTextBookmark; - comments = "'FinderHook' may not respond to '-previewItemTitle'"; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - fallbackIsa = XCBuildMessageTextBookmark; - rLen = 1; - rLoc = 132; - rType = 1; - }; - 8C95FF81162D59A0003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 129"; - rLen = 0; - rLoc = 4242; - rType = 0; - vrLen = 1283; - vrLoc = 3691; - }; - 8C95FF82162D59A0003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 47"; - rLen = 703; - rLoc = 1521; - rType = 0; - vrLen = 1950; - vrLoc = 1305; - }; - 8C95FF83162D59A0003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 163"; - rLen = 0; - rLoc = 5539; - rType = 0; - vrLen = 2373; - vrLoc = 3279; - }; - 8C95FF86162D59A0003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD99161593BD00016A95 /* FinderHook.h */; - rLen = 0; - rLoc = 9223372036854775807; - rType = 0; - }; - 8C95FF87162D59A0003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD99161593BD00016A95 /* FinderHook.h */; - name = "FinderHook.h: 12"; - rLen = 0; - rLoc = 188; - rType = 0; - vrLen = 212; - vrLoc = 0; - }; - 8C95FF88162D59A0003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 16"; - rLen = 0; - rLoc = 257; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C95FF89162D59A0003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 71"; - rLen = 0; - rLoc = 1312; - rType = 0; - vrLen = 1180; - vrLoc = 209; - }; - 8C95FFAF162D771B003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 129"; - rLen = 0; - rLoc = 4242; - rType = 0; - vrLen = 1283; - vrLoc = 3691; - }; - 8C95FFB0162D771B003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 134"; - rLen = 0; - rLoc = 4428; - rType = 0; - vrLen = 991; - vrLoc = 3489; - }; - 8C95FFB1162D771B003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD99161593BD00016A95 /* FinderHook.h */; - name = "FinderHook.h: 17"; - rLen = 0; - rLoc = 212; - rType = 0; - vrLen = 212; - vrLoc = 0; - }; - 8C95FFB2162D771B003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 163"; - rLen = 0; - rLoc = 5539; - rType = 0; - vrLen = 2373; - vrLoc = 3279; - }; - 8C95FFB3162D771B003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 150"; - rLen = 0; - rLoc = 5140; - rType = 0; - vrLen = 2275; - vrLoc = 3275; - }; - 8C95FFB4162D771B003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 71"; - rLen = 0; - rLoc = 1312; - rType = 0; - vrLen = 1180; - vrLoc = 209; - }; - 8C95FFB5162D771B003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 16"; - rLen = 0; - rLoc = 257; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C95FFC0162D7A3D003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 138"; - rLen = 0; - rLoc = 4428; - rType = 0; - vrLen = 1182; - vrLoc = 2480; - }; - 8C95FFC1162D7A3D003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD99161593BD00016A95 /* FinderHook.h */; - name = "FinderHook.h: 17"; - rLen = 0; - rLoc = 212; - rType = 0; - vrLen = 212; - vrLoc = 0; - }; - 8C95FFC2162D7A3D003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - rLen = 0; - rLoc = 9223372036854775930; - rType = 0; - }; - 8C95FFC3162D7A3D003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 88"; - rLen = 0; - rLoc = 2528; - rType = 0; - vrLen = 2433; - vrLoc = 2334; - }; - 8C95FFC4162D7A3D003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 154"; - rLen = 0; - rLoc = 5140; - rType = 0; - vrLen = 2522; - vrLoc = 2482; - }; - 8C95FFC5162D7A3D003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 71"; - rLen = 0; - rLoc = 1312; - rType = 0; - vrLen = 1180; - vrLoc = 209; - }; - 8C95FFC6162D7A3D003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 16"; - rLen = 0; - rLoc = 257; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C95FFD516301448003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 138"; - rLen = 0; - rLoc = 4428; - rType = 0; - vrLen = 1128; - vrLoc = 2480; - }; - 8C95FFD616301448003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 89"; - rLen = 0; - rLoc = 2534; - rType = 0; - vrLen = 1132; - vrLoc = 2480; - }; - 8C95FFD716301448003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 154"; - rLen = 0; - rLoc = 5140; - rType = 0; - vrLen = 1725; - vrLoc = 2482; - }; - 8C95FFD816301448003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 91"; - rLen = 15; - rLoc = 2654; - rType = 0; - vrLen = 1837; - vrLoc = 2334; - }; - 8C95FFD916301448003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 71"; - rLen = 0; - rLoc = 1312; - rType = 0; - vrLen = 763; - vrLoc = 209; - }; - 8C95FFDA16301448003BB463 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 16"; - rLen = 0; - rLoc = 257; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F6921622D145002D2135 /* IconCache.h */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1823, 542}}"; - sepNavSelRange = "{257, 0}"; - sepNavVisRange = "{0, 359}"; - sepNavWindowFrame = "{{15, 112}, {1882, 941}}"; - }; - }; - 8C99F6931622D145002D2135 /* IconCache.m */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1823, 1040}}"; - sepNavSelRange = "{1312, 0}"; - sepNavVisRange = "{209, 763}"; - sepNavWindowFrame = "{{38, 91}, {1882, 941}}"; - }; - }; - 8C99F6D716241A83002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9C161593BD00016A95 /* logger.h */; - name = "logger.h: 10"; - rLen = 0; - rLoc = 178; - rType = 0; - vrLen = 178; - vrLoc = 0; - }; - 8C99F6D816241A83002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD99161593BD00016A95 /* FinderHook.h */; - name = "FinderHook.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 212; - vrLoc = 0; - }; - 8C99F6D916241A83002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 990; - vrLoc = 3; - }; - 8C99F6DA16241A83002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 12"; - rLen = 0; - rLoc = 255; - rType = 0; - vrLen = 207; - vrLoc = 0; - }; - 8C99F6DB16241A83002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - comments = "Expected ')' before '{' token"; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - rLen = 1; - rLoc = 21; - rType = 1; - }; - 8C99F6E11626C51C002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 18"; - rLen = 0; - rLoc = 312; - rType = 0; - vrLen = 565; - vrLoc = 0; - }; - 8C99F70916280074002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - comments = "Instance variable 'dictionary_' accessed in class method"; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - rLen = 1; - rLoc = 44; - rType = 1; - }; - 8C99F70A16280074002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 30"; - rLen = 0; - rLoc = 697; - rType = 0; - vrLen = 298; - vrLoc = 293; - }; - 8C99F73216280B63002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 30"; - rLen = 0; - rLoc = 651; - rType = 0; - vrLen = 256; - vrLoc = 184; - }; - 8C99F73316280B63002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - comments = "Expected specifier-qualifier-list before 'property'"; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - rLen = 1; - rLoc = 13; - rType = 1; - }; - 8C99F73416280B63002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 13"; - rLen = 0; - rLoc = 199; - rType = 0; - vrLen = 286; - vrLoc = 0; - }; - 8C99F75E16280FF3002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 17"; - rLen = 0; - rLoc = 290; - rType = 0; - vrLen = 251; - vrLoc = 76; - }; - 8C99F75F16280FF3002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - comments = "Passing argument 1 of 'removeObjectForKey:' makes pointer from integer without a cast"; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - rLen = 1; - rLoc = 44; - rType = 1; - }; - 8C99F76016280FF3002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 33"; - rLen = 0; - rLoc = 697; - rType = 0; - vrLen = 263; - vrLoc = 344; - }; - 8C99F79516282FF8002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - comments = "Stray '\\342' in program"; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - rLen = 0; - rLoc = 111; - rType = 1; - }; - 8C99F7AA16283292002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 41"; - rLen = 0; - rLoc = 1155; - rType = 0; - vrLen = 589; - vrLoc = 209; - }; - 8C99F7AB16283292002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 13"; - rLen = 0; - rLoc = 199; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F7AC16283292002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 13"; - rLen = 0; - rLoc = 199; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F7B116283292002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 27"; - rLen = 0; - rLoc = 785; - rType = 0; - vrLen = 1795; - vrLoc = 644; - }; - 8C99F7B416283292002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 34"; - rLen = 0; - rLoc = 785; - rType = 0; - vrLen = 891; - vrLoc = 0; - }; - 8C99F7B516283292002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 38"; - rLen = 0; - rLoc = 615; - rType = 0; - vrLen = 1122; - vrLoc = 0; - }; - 8C99F7B816283292002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 17"; - rLen = 0; - rLoc = 290; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F7B916283292002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 18"; - rLen = 0; - rLoc = 289; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F7BC16283292002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F7BD16283292002D2135 /* NSValue.h */; - rLen = 1; - rLoc = 35; - rType = 1; - }; - 8C99F7BD16283292002D2135 /* NSValue.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = NSValue.h; - path = /Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSValue.h; - sourceTree = ""; - }; - 8C99F7BE16283292002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F7BF16283292002D2135 /* NSValue.h */; - name = "NSValue.h: 20"; - rLen = 0; - rLoc = 463; - rType = 0; - vrLen = 1777; - vrLoc = 566; - }; - 8C99F7BF16283292002D2135 /* NSValue.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = NSValue.h; - path = /Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSValue.h; - sourceTree = ""; - }; - 8C99F7C4162832E3002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 13"; - rLen = 0; - rLoc = 199; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F7C5162832E3002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 27"; - rLen = 0; - rLoc = 785; - rType = 0; - vrLen = 1795; - vrLoc = 644; - }; - 8C99F7C6162832E3002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 38"; - rLen = 0; - rLoc = 615; - rType = 0; - vrLen = 1122; - vrLoc = 0; - }; - 8C99F7C7162832E3002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 18"; - rLen = 0; - rLoc = 289; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F7C8162832E3002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F7BD16283292002D2135 /* NSValue.h */; - name = "NSValue.h: 20"; - rLen = 0; - rLoc = 463; - rType = 0; - vrLen = 1777; - vrLoc = 566; - }; - 8C99F7C916283348002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 13"; - rLen = 0; - rLoc = 199; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F7CA16283348002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 55"; - rLen = 0; - rLoc = 1724; - rType = 0; - vrLen = 2171; - vrLoc = 1717; - }; - 8C99F7CB16283348002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 38"; - rLen = 0; - rLoc = 615; - rType = 0; - vrLen = 1122; - vrLoc = 0; - }; - 8C99F7CC16283348002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 18"; - rLen = 0; - rLoc = 289; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F7CD16283348002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F7BF16283292002D2135 /* NSValue.h */; - name = "NSValue.h: 20"; - rLen = 0; - rLoc = 463; - rType = 0; - vrLen = 1777; - vrLoc = 566; - }; - 8C99F7D316283395002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 13"; - rLen = 0; - rLoc = 199; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F7D416283395002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 38"; - rLen = 0; - rLoc = 615; - rType = 0; - vrLen = 1122; - vrLoc = 0; - }; - 8C99F7D516283395002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 52"; - rLen = 0; - rLoc = 816; - rType = 0; - vrLen = 1083; - vrLoc = 76; - }; - 8C99F7D616283395002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 34"; - rLen = 0; - rLoc = 1014; - rType = 0; - vrLen = 1923; - vrLoc = 410; - }; - 8C99F7D716283395002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 18"; - rLen = 0; - rLoc = 289; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F7D816283395002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F7BF16283292002D2135 /* NSValue.h */; - name = "NSValue.h: 20"; - rLen = 0; - rLoc = 463; - rType = 0; - vrLen = 1777; - vrLoc = 566; - }; - 8C99F7D9162833DB002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 13"; - rLen = 0; - rLoc = 199; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F7DA162833DB002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 51"; - rLen = 0; - rLoc = 789; - rType = 0; - vrLen = 1083; - vrLoc = 76; - }; - 8C99F7DB162833DB002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 34"; - rLen = 0; - rLoc = 1014; - rType = 0; - vrLen = 1923; - vrLoc = 410; - }; - 8C99F7DC162833DB002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 18"; - rLen = 0; - rLoc = 289; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F7DD162833DB002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F7BF16283292002D2135 /* NSValue.h */; - name = "NSValue.h: 20"; - rLen = 0; - rLoc = 463; - rType = 0; - vrLen = 1777; - vrLoc = 566; - }; - 8C99F7E91628351A002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD99161593BD00016A95 /* FinderHook.h */; - name = "FinderHook.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 212; - vrLoc = 0; - }; - 8C99F7EA1628351A002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 53"; - rLen = 0; - rLoc = 818; - rType = 0; - vrLen = 602; - vrLoc = 552; - }; - 8C99F7EB1628351A002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 13"; - rLen = 0; - rLoc = 199; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F7EC1628351A002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 27"; - rLen = 12; - rLoc = 749; - rType = 0; - vrLen = 971; - vrLoc = 44; - }; - 8C99F7ED1628351A002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9B161593BD00016A95 /* logger.c */; - name = "logger.c: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 468; - vrLoc = 0; - }; - 8C99F7EE1628351A002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9B161593BD00016A95 /* logger.c */; - name = "logger.c: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 468; - vrLoc = 0; - }; - 8C99F7F11628351A002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9B161593BD00016A95 /* logger.c */; - name = "logger.c: 32"; - rLen = 0; - rLoc = 503; - rType = 0; - vrLen = 528; - vrLoc = 0; - }; - 8C99F7F21628351A002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9B161593BD00016A95 /* logger.c */; - name = "logger.c: 32"; - rLen = 0; - rLoc = 503; - rType = 0; - vrLen = 528; - vrLoc = 0; - }; - 8C99F7F31628351A002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 34"; - rLen = 0; - rLoc = 1014; - rType = 0; - vrLen = 1923; - vrLoc = 410; - }; - 8C99F7F41628351A002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 116"; - rLen = 0; - rLoc = 4210; - rType = 0; - vrLen = 2170; - vrLoc = 2179; - }; - 8C99F7F51628351A002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 38"; - rLen = 0; - rLoc = 615; - rType = 0; - vrLen = 1083; - vrLoc = 76; - }; - 8C99F7F61628351A002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 18"; - rLen = 0; - rLoc = 289; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F7F71628351A002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F7BF16283292002D2135 /* NSValue.h */; - name = "NSValue.h: 20"; - rLen = 0; - rLoc = 463; - rType = 0; - vrLen = 1777; - vrLoc = 566; - }; - 8C99F80716283601002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9B161593BD00016A95 /* logger.c */; - name = "logger.c: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 468; - vrLoc = 0; - }; - 8C99F80816283601002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 116"; - rLen = 0; - rLoc = 4210; - rType = 0; - vrLen = 2170; - vrLoc = 2179; - }; - 8C99F80916283601002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 106"; - rLen = 0; - rLoc = 3894; - rType = 0; - vrLen = 2099; - vrLoc = 0; - }; - 8C99F80A16283601002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9B161593BD00016A95 /* logger.c */; - name = "logger.c: 36"; - rLen = 0; - rLoc = 528; - rType = 0; - vrLen = 528; - vrLoc = 0; - }; - 8C99F80B16283601002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 38"; - rLen = 0; - rLoc = 615; - rType = 0; - vrLen = 1083; - vrLoc = 76; - }; - 8C99F80C16283601002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 18"; - rLen = 0; - rLoc = 289; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F80D16283601002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F7BF16283292002D2135 /* NSValue.h */; - name = "NSValue.h: 20"; - rLen = 0; - rLoc = 463; - rType = 0; - vrLen = 1777; - vrLoc = 566; - }; - 8C99F84F16283CE1002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9B161593BD00016A95 /* logger.c */; - name = "logger.c: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 472; - vrLoc = 0; - }; - 8C99F85016283CE1002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 106"; - rLen = 0; - rLoc = 3894; - rType = 0; - vrLen = 2099; - vrLoc = 0; - }; - 8C99F85116283CE1002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 106"; - rLen = 0; - rLoc = 3894; - rType = 0; - vrLen = 2517; - vrLoc = 2432; - }; - 8C99F85216283CE1002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9B161593BD00016A95 /* logger.c */; - name = "logger.c: 36"; - rLen = 0; - rLoc = 528; - rType = 0; - vrLen = 534; - vrLoc = 0; - }; - 8C99F85316283CE1002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F7BF16283292002D2135 /* NSValue.h */; - name = "NSValue.h: 20"; - rLen = 0; - rLoc = 463; - rType = 0; - vrLen = 1777; - vrLoc = 566; - }; - 8C99F85416283CE1002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 38"; - rLen = 0; - rLoc = 615; - rType = 0; - vrLen = 1083; - vrLoc = 76; - }; - 8C99F85516283CE1002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 18"; - rLen = 0; - rLoc = 289; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F87C1628406A002D2135 /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - }; - 8C99F89616284444002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9B161593BD00016A95 /* logger.c */; - name = "logger.c: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 468; - vrLoc = 0; - }; - 8C99F89716284444002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 53"; - rLen = 0; - rLoc = 818; - rType = 0; - vrLen = 638; - vrLoc = 516; - }; - 8C99F89816284444002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 51"; - rLen = 0; - rLoc = 818; - rType = 0; - vrLen = 685; - vrLoc = 516; - }; - 8C99F89916284444002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 28"; - rLen = 0; - rLoc = 452; - rType = 0; - vrLen = 1083; - vrLoc = 76; - }; - 8C99F89A16284444002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 61"; - rLen = 0; - rLoc = 1056; - rType = 0; - vrLen = 1209; - vrLoc = 44; - }; - 8C99F89D16284444002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 24"; - rLen = 0; - rLoc = 672; - rType = 0; - vrLen = 2099; - vrLoc = 0; - }; - 8C99F89E16284444002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 18"; - rLen = 0; - rLoc = 289; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F8AB16284854002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 51"; - rLen = 0; - rLoc = 818; - rType = 0; - vrLen = 685; - vrLoc = 516; - }; - 8C99F8AC16284854002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 99"; - rLen = 0; - rLoc = 3293; - rType = 0; - vrLen = 2299; - vrLoc = 1954; - }; - 8C99F8AD16284854002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 61"; - rLen = 0; - rLoc = 1056; - rType = 0; - vrLen = 1209; - vrLoc = 44; - }; - 8C99F8AE16284854002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 18"; - rLen = 0; - rLoc = 289; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F8BD162849F3002D2135 /* FinderHook.m:112 */ = { - isa = PBXFileBreakpoint; - actions = ( - ); - breakpointStyle = 0; - continueAfterActions = 0; - countType = 0; - delayBeforeContinue = 0; - fileReference = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - functionName = "-HOOK_drawIconWithFrame:"; - hitCount = 0; - ignoreCount = 0; - lineNumber = 112; - location = LiferayFinderCore; - modificationTime = 371740467.865518; - originalNumberOfMultipleMatches = 1; - state = 0; - }; - 8C99F8C716284A2D002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 51"; - rLen = 0; - rLoc = 818; - rType = 0; - vrLen = 685; - vrLoc = 516; - }; - 8C99F8C816284A2D002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 101"; - rLen = 0; - rLoc = 3293; - rType = 0; - vrLen = 2592; - vrLoc = 2478; - }; - 8C99F8C916284A2D002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 107"; - rLen = 0; - rLoc = 3293; - rType = 0; - vrLen = 2484; - vrLoc = 2595; - }; - 8C99F8CA16284A2D002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 61"; - rLen = 0; - rLoc = 1056; - rType = 0; - vrLen = 1209; - vrLoc = 44; - }; - 8C99F8CB16284A2D002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 18"; - rLen = 0; - rLoc = 289; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F8D816284A7B002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 51"; - rLen = 0; - rLoc = 818; - rType = 0; - vrLen = 685; - vrLoc = 516; - }; - 8C99F8D916284A7B002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 109"; - rLen = 0; - rLoc = 3615; - rType = 0; - vrLen = 2394; - vrLoc = 2595; - }; - 8C99F8DA16284A7B002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 61"; - rLen = 0; - rLoc = 1056; - rType = 0; - vrLen = 1209; - vrLoc = 44; - }; - 8C99F8DB16284A7B002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 18"; - rLen = 0; - rLoc = 289; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F8EA16284AB5002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 51"; - rLen = 0; - rLoc = 818; - rType = 0; - vrLen = 685; - vrLoc = 516; - }; - 8C99F8EB16284AB5002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 106"; - rLen = 0; - rLoc = 3293; - rType = 0; - vrLen = 2394; - vrLoc = 2595; - }; - 8C99F8EC16284AB5002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 61"; - rLen = 0; - rLoc = 1056; - rType = 0; - vrLen = 1209; - vrLoc = 44; - }; - 8C99F8ED16284AB5002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 18"; - rLen = 0; - rLoc = 289; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F8FC16284ECF002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 51"; - rLen = 0; - rLoc = 818; - rType = 0; - vrLen = 685; - vrLoc = 516; - }; - 8C99F8FD16284ECF002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 13"; - rLen = 0; - rLoc = 199; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F8FE16284ECF002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 13"; - rLen = 0; - rLoc = 199; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F8FF16284ECF002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 106"; - rLen = 0; - rLoc = 3293; - rType = 0; - vrLen = 1840; - vrLoc = 1390; - }; - 8C99F90016284ECF002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 109"; - rLen = 0; - rLoc = 3615; - rType = 0; - vrLen = 2148; - vrLoc = 2303; - }; - 8C99F90116284ECF002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 61"; - rLen = 0; - rLoc = 1056; - rType = 0; - vrLen = 1209; - vrLoc = 44; - }; - 8C99F90216284ECF002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 71"; - rLen = 0; - rLoc = 1312; - rType = 0; - vrLen = 1180; - vrLoc = 209; - }; - 8C99F90316284ECF002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6921622D145002D2135 /* IconCache.h */; - name = "IconCache.h: 18"; - rLen = 0; - rLoc = 289; - rType = 0; - vrLen = 359; - vrLoc = 0; - }; - 8C99F90D16284F81002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F6931622D145002D2135 /* IconCache.m */; - name = "IconCache.m: 55"; - rLen = 0; - rLoc = 1155; - rType = 0; - vrLen = 235; - vrLoc = 251; - }; - 8C99F90E16284F81002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C99F90F16284F81002D2135 /* Finder.h */; - name = "Finder.h: 796"; - rLen = 0; - rLoc = 25014; - rType = 0; - vrLen = 426; - vrLoc = 24765; - }; - 8C99F90F16284F81002D2135 /* Finder.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = Finder.h; - path = /Users/svp/Liferay/trunk/LiferayFinderCore/Finder/Finder.h; - sourceTree = ""; - }; - 8C99F91016284F81002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - comments = "'IconCache' may not respond to '-registerIcon:'"; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - rLen = 1; - rLoc = 26; - rType = 1; - }; - 8C99F91116284F81002D2135 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; - name = "FinderHook.m: 27"; - rLen = 0; - rLoc = 720; - rType = 0; - vrLen = 398; - vrLoc = 525; - }; - 8D57630D048677EA00EA77CD /* LiferayFinderCore */ = { - activeExec = 0; - }; -} diff --git a/shell_integration/MacOSX/LiferayNativityInjector/LiferayNativityInjector.sdef b/shell_integration/MacOSX/LiferayNativityInjector/LiferayNativityInjector.sdef deleted file mode 100644 index 149fb46d73..0000000000 --- a/shell_integration/MacOSX/LiferayNativityInjector/LiferayNativityInjector.sdef +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/shell_integration/MacOSX/OwnCloud.xcworkspace/contents.xcworkspacedata b/shell_integration/MacOSX/OwnCloud.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000000..a21afc399a --- /dev/null +++ b/shell_integration/MacOSX/OwnCloud.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/shell_integration/MacOSX/OwnCloud.xcworkspace/xcshareddata/OwnCloud.xccheckout b/shell_integration/MacOSX/OwnCloud.xcworkspace/xcshareddata/OwnCloud.xccheckout new file mode 100644 index 0000000000..6fee20835a --- /dev/null +++ b/shell_integration/MacOSX/OwnCloud.xcworkspace/xcshareddata/OwnCloud.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 5264E8F5-AB49-45F3-868F-647EEFAB70E0 + IDESourceControlProjectName + OwnCloud + IDESourceControlProjectOriginsDictionary + + 09EE94AA-F410-4594-AB26-5A0220DEAEC7 + ssh://github.com/owncloud/mirall.git + + IDESourceControlProjectPath + shell_integration/MacOSX/OwnCloud.xcworkspace + IDESourceControlProjectRelativeInstallPathDictionary + + 09EE94AA-F410-4594-AB26-5A0220DEAEC7 + ../../.. + + IDESourceControlProjectURL + ssh://github.com/owncloud/mirall.git + IDESourceControlProjectVersion + 110 + IDESourceControlProjectWCCIdentifier + 09EE94AA-F410-4594-AB26-5A0220DEAEC7 + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 09EE94AA-F410-4594-AB26-5A0220DEAEC7 + IDESourceControlWCCName + mirall + + + + diff --git a/shell_integration/MacOSX/LiferayNativityFinder/ContentManager.h b/shell_integration/MacOSX/OwnCloudFinder/ContentManager.h similarity index 100% rename from shell_integration/MacOSX/LiferayNativityFinder/ContentManager.h rename to shell_integration/MacOSX/OwnCloudFinder/ContentManager.h diff --git a/shell_integration/MacOSX/LiferayNativityFinder/ContentManager.m b/shell_integration/MacOSX/OwnCloudFinder/ContentManager.m similarity index 99% rename from shell_integration/MacOSX/LiferayNativityFinder/ContentManager.m rename to shell_integration/MacOSX/OwnCloudFinder/ContentManager.m index bcaed184f1..8ca237088a 100644 --- a/shell_integration/MacOSX/LiferayNativityFinder/ContentManager.m +++ b/shell_integration/MacOSX/OwnCloudFinder/ContentManager.m @@ -237,7 +237,7 @@ static ContentManager* sharedInstance = nil; } else { - NSLog(@"LiferayNativityFinder: refreshing icon badges failed"); + NSLog(@"OwnCloudFinder: refreshing icon badges failed"); return; } diff --git a/shell_integration/MacOSX/OwnCloudFinder/ContextMenuHandlers.h b/shell_integration/MacOSX/OwnCloudFinder/ContextMenuHandlers.h new file mode 100644 index 0000000000..dc604cd6b0 --- /dev/null +++ b/shell_integration/MacOSX/OwnCloudFinder/ContextMenuHandlers.h @@ -0,0 +1,28 @@ +/** + * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. + */ + +#import + +@interface NSObject (ContextMenuHandlers) + +struct TFENodeVector; + ++ (void)OCContextMenuHandlers_handleContextMenuCommon:(unsigned int)arg1 nodes:(const struct TFENodeVector*)arg2 event:(id)arg3 view:(id)arg4 browserController:(id)arg5 addPlugIns:(BOOL)arg6; ++ (void)OCContextMenuHandlers_handleContextMenuCommon:(unsigned int)arg1 nodes:(const struct TFENodeVector*)arg2 event:(id)arg3 view:(id)arg4 windowController:(id)arg5 addPlugIns:(BOOL)arg6; ++ (void)OCContextMenuHandlers_addViewSpecificStuffToMenu:(id)arg1 browserViewController:(id)arg2 context:(unsigned int)arg3; + +- (void)OCContextMenuHandlers_configureWithNodes:(const struct TFENodeVector*)arg1 browserController:(id)arg2 container:(BOOL)arg3; +- (void)OCContextMenuHandlers_configureWithNodes:(const struct TFENodeVector*)arg1 windowController:(id)arg2 container:(BOOL)arg3; + +@end \ No newline at end of file diff --git a/shell_integration/MacOSX/LiferayNativityFinder/ContextMenuHandlers.m b/shell_integration/MacOSX/OwnCloudFinder/ContextMenuHandlers.m similarity index 88% rename from shell_integration/MacOSX/LiferayNativityFinder/ContextMenuHandlers.m rename to shell_integration/MacOSX/OwnCloudFinder/ContextMenuHandlers.m index d370f4e2b4..28f81d5740 100644 --- a/shell_integration/MacOSX/LiferayNativityFinder/ContextMenuHandlers.m +++ b/shell_integration/MacOSX/OwnCloudFinder/ContextMenuHandlers.m @@ -17,9 +17,9 @@ @implementation NSObject (ContextMenuHandlers) -+ (void)ContextMenuHandlers_addViewSpecificStuffToMenu:(id)arg1 browserViewController:(id)arg2 context:(unsigned int)arg3 // 10.7 & 10.8 ++ (void)OCContextMenuHandlers_addViewSpecificStuffToMenu:(id)arg1 browserViewController:(id)arg2 context:(unsigned int)arg3 // 10.7 & 10.8 { - [self ContextMenuHandlers_addViewSpecificStuffToMenu:arg1 browserViewController:arg2 context:arg3]; + [self OCContextMenuHandlers_addViewSpecificStuffToMenu:arg1 browserViewController:arg2 context:arg3]; MenuManager* menuManager = [MenuManager sharedInstance]; @@ -30,9 +30,9 @@ } } -+ (void)ContextMenuHandlers_addViewSpecificStuffToMenu:(id)arg1 clickedView:(id)arg2 browserViewController:(id)arg3 context:(unsigned int)arg4 // 10.9 ++ (void)OCContextMenuHandlers_addViewSpecificStuffToMenu:(id)arg1 clickedView:(id)arg2 browserViewController:(id)arg3 context:(unsigned int)arg4 // 10.9 { - [self ContextMenuHandlers_addViewSpecificStuffToMenu:arg1 clickedView:arg2 browserViewController:arg3 context:arg4]; + [self OCContextMenuHandlers_addViewSpecificStuffToMenu:arg1 clickedView:arg2 browserViewController:arg3 context:arg4]; MenuManager* menuManager = [MenuManager sharedInstance]; diff --git a/shell_integration/MacOSX/LiferayNativityFinder/ContextMenuHandlers.m.unc b/shell_integration/MacOSX/OwnCloudFinder/ContextMenuHandlers.m.unc similarity index 100% rename from shell_integration/MacOSX/LiferayNativityFinder/ContextMenuHandlers.m.unc rename to shell_integration/MacOSX/OwnCloudFinder/ContextMenuHandlers.m.unc diff --git a/shell_integration/MacOSX/LiferayNativityFinder/English.lproj/InfoPlist.strings b/shell_integration/MacOSX/OwnCloudFinder/English.lproj/InfoPlist.strings similarity index 100% rename from shell_integration/MacOSX/LiferayNativityFinder/English.lproj/InfoPlist.strings rename to shell_integration/MacOSX/OwnCloudFinder/English.lproj/InfoPlist.strings diff --git a/shell_integration/MacOSX/LiferayNativityFinder/Finder/Finder.h b/shell_integration/MacOSX/OwnCloudFinder/Finder/Finder.h similarity index 100% rename from shell_integration/MacOSX/LiferayNativityFinder/Finder/Finder.h rename to shell_integration/MacOSX/OwnCloudFinder/Finder/Finder.h diff --git a/shell_integration/MacOSX/LiferayNativityFinder/FinderHook.h b/shell_integration/MacOSX/OwnCloudFinder/FinderHook.h similarity index 100% rename from shell_integration/MacOSX/LiferayNativityFinder/FinderHook.h rename to shell_integration/MacOSX/OwnCloudFinder/FinderHook.h diff --git a/shell_integration/MacOSX/OwnCloudFinder/FinderHook.m b/shell_integration/MacOSX/OwnCloudFinder/FinderHook.m new file mode 100644 index 0000000000..582db48add --- /dev/null +++ b/shell_integration/MacOSX/OwnCloudFinder/FinderHook.m @@ -0,0 +1,125 @@ +/** + * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. + */ + +#import "ContentManager.h" +#import "FinderHook.h" +#import "IconCache.h" +#import "objc/objc-class.h" +#import "RequestManager.h" + +static BOOL installed = NO; + +@implementation FinderHook + ++ (void)hookClassMethod:(SEL)oldSelector inClass:(NSString*)className toCallToTheNewMethod:(SEL)newSelector +{ + Class hookedClass = NSClassFromString(className); + Method oldMethod = class_getClassMethod(hookedClass, oldSelector); + Method newMethod = class_getClassMethod(hookedClass, newSelector); + + method_exchangeImplementations(newMethod, oldMethod); +} + ++ (void)hookMethod:(SEL)oldSelector inClass:(NSString*)className toCallToTheNewMethod:(SEL)newSelector +{ + Class hookedClass = NSClassFromString(className); + Method oldMethod = class_getInstanceMethod(hookedClass, oldSelector); + Method newMethod = class_getInstanceMethod(hookedClass, newSelector); + + method_exchangeImplementations(newMethod, oldMethod); +} + ++ (void)install +{ + if (installed) + { + NSLog(@"OwnCloudFinder: already installed"); + + return; + } + + NSLog(@"OwnCloudFinder: installing ownCloud Shell extension"); + + [RequestManager sharedInstance]; + + // Icons + [self hookMethod:@selector(drawImage:) inClass:@"IKImageBrowserCell" toCallToTheNewMethod:@selector(OCIconOverlayHandlers_IKImageBrowserCell_drawImage:)]; // 10.7 & 10.8 & 10.9 (Icon View arrange by name) + + [self hookMethod:@selector(drawImage:) inClass:@"IKFinderReflectiveIconCell" toCallToTheNewMethod:@selector(OCIconOverlayHandlers_IKFinderReflectiveIconCell_drawImage:)]; // 10.7 & 10.8 & 10.9 (Icon View arrange by everything else) + + [self hookMethod:@selector(drawIconWithFrame:) inClass:@"TListViewIconAndTextCell" toCallToTheNewMethod:@selector(OCIconOverlayHandlers_drawIconWithFrame:)]; // 10.7 & 10.8 & 10.9 Column View + + [self hookMethod:@selector(drawRect:) inClass:@"TDimmableIconImageView" toCallToTheNewMethod:@selector(OCIconOverlayHandlers_drawRect:)]; // 10.9 (List and Coverflow Views) + + // Context Menus + [self hookClassMethod:@selector(addViewSpecificStuffToMenu:browserViewController:context:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(OCContextMenuHandlers_addViewSpecificStuffToMenu:browserViewController:context:)]; // 10.7 & 10.8 + + [self hookClassMethod:@selector(addViewSpecificStuffToMenu:clickedView:browserViewController:context:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(OCContextMenuHandlers_addViewSpecificStuffToMenu:clickedView:browserViewController:context:)]; // 10.9 + + [self hookClassMethod:@selector(handleContextMenuCommon:nodes:event:view:windowController:addPlugIns:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(OCContextMenuHandlers_handleContextMenuCommon:nodes:event:view:windowController:addPlugIns:)]; // 10.7 + + [self hookClassMethod:@selector(handleContextMenuCommon:nodes:event:view:browserController:addPlugIns:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(OCContextMenuHandlers_handleContextMenuCommon:nodes:event:view:browserController:addPlugIns:)]; // 10.8 + + [self hookClassMethod:@selector(handleContextMenuCommon:nodes:event:clickedView:browserViewController:addPlugIns:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(OCContextMenuHandlers_handleContextMenuCommon:nodes:event:clickedView:browserViewController:addPlugIns:)]; // 10.9 + + [self hookMethod:@selector(configureWithNodes:windowController:container:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(OCContextMenuHandlers_configureWithNodes:windowController:container:)]; // 10.7 + + [self hookMethod:@selector(configureWithNodes:browserController:container:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(OCContextMenuHandlers_configureWithNodes:browserController:container:)]; // 10.8 + + [self hookMethod:@selector(configureFromMenuNeedsUpdate:clickedView:container:event:selectedNodes:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(OCContextMenuHandlers_configureFromMenuNeedsUpdate:clickedView:container:event:selectedNodes:)]; // 10.9 + + installed = YES; + + NSLog(@"OwnCloudFinder: installed"); +} + ++ (void)uninstall +{ + if (!installed) + { + NSLog(@"OwnCloudFinder: not installed"); + + return; + } + + NSLog(@"OwnCloudFinder: uninstalling"); + + [[ContentManager sharedInstance] dealloc]; + + [[IconCache sharedInstance] dealloc]; + + [[RequestManager sharedInstance] dealloc]; + + // Icons + [self hookMethod:@selector(OCIconOverlayHandlers_drawImage:) inClass:@"TIconViewCell" toCallToTheNewMethod:@selector(drawImage:)]; // 10.7 & 10.8 & 10.9 + + [self hookMethod:@selector(OCIconOverlayHandlers_drawIconWithFrame:) inClass:@"TListViewIconAndTextCell" toCallToTheNewMethod:@selector(drawIconWithFrame:)]; // 10.7 & 10.8 & 10.9 + + // Context Menus + [self hookClassMethod:@selector(OCContextMenuHandlers_addViewSpecificStuffToMenu:browserViewController:context:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(addViewSpecificStuffToMenu:browserViewController:context:)]; // 10.7 & 10.8 + + [self hookClassMethod:@selector(OCContextMenuHandlers_handleContextMenuCommon:nodes:event:view:windowController:addPlugIns:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(handleContextMenuCommon:nodes:event:view:windowController:addPlugIns:)]; // 10.7 + + [self hookMethod:@selector(OCContextMenuHandlers_configureWithNodes:windowController:container:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(configureWithNodes:windowController:container:)]; // 10.7 + + [self hookClassMethod:@selector(OCContextMenuHandlers_handleContextMenuCommon:nodes:event:view:browserController:addPlugIns:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(handleContextMenuCommon:nodes:event:view:browserController:addPlugIns:)]; // 10.8 + + [self hookMethod:@selector(OCContextMenuHandlers_configureWithNodes:browserController:container:) inClass:@"TContextMenu" toCallToTheNewMethod:@selector(configureWithNodes:browserController:container:)]; // 10.8 + + installed = NO; + + NSLog(@"OwnCloudFinder: uninstalled"); +} + +@end \ No newline at end of file diff --git a/shell_integration/MacOSX/LiferayNativityFinder/GCDAsyncSocket.h b/shell_integration/MacOSX/OwnCloudFinder/GCDAsyncSocket.h similarity index 100% rename from shell_integration/MacOSX/LiferayNativityFinder/GCDAsyncSocket.h rename to shell_integration/MacOSX/OwnCloudFinder/GCDAsyncSocket.h diff --git a/shell_integration/MacOSX/LiferayNativityFinder/GCDAsyncSocket.m b/shell_integration/MacOSX/OwnCloudFinder/GCDAsyncSocket.m similarity index 100% rename from shell_integration/MacOSX/LiferayNativityFinder/GCDAsyncSocket.m rename to shell_integration/MacOSX/OwnCloudFinder/GCDAsyncSocket.m diff --git a/shell_integration/MacOSX/LiferayNativityFinder/IconCache.h b/shell_integration/MacOSX/OwnCloudFinder/IconCache.h similarity index 100% rename from shell_integration/MacOSX/LiferayNativityFinder/IconCache.h rename to shell_integration/MacOSX/OwnCloudFinder/IconCache.h diff --git a/shell_integration/MacOSX/LiferayNativityFinder/IconCache.m b/shell_integration/MacOSX/OwnCloudFinder/IconCache.m similarity index 100% rename from shell_integration/MacOSX/LiferayNativityFinder/IconCache.m rename to shell_integration/MacOSX/OwnCloudFinder/IconCache.m diff --git a/shell_integration/MacOSX/LiferayNativityFinder/IconOverlayHandlers.h b/shell_integration/MacOSX/OwnCloudFinder/IconOverlayHandlers.h similarity index 78% rename from shell_integration/MacOSX/LiferayNativityFinder/IconOverlayHandlers.h rename to shell_integration/MacOSX/OwnCloudFinder/IconOverlayHandlers.h index d6b1f91be7..0657fa87fc 100644 --- a/shell_integration/MacOSX/LiferayNativityFinder/IconOverlayHandlers.h +++ b/shell_integration/MacOSX/OwnCloudFinder/IconOverlayHandlers.h @@ -16,8 +16,8 @@ @interface NSObject (IconOverlayHandlers) -- (void)IconOverlayHandlers_drawIconWithFrame:(struct CGRect)arg1; -- (void)IconOverlayHandlers_drawImage:(id)arg1; -- (void)IconOverlayHandlers_drawRect:(struct CGRect)arg1; +- (void)OCIconOverlayHandlers_drawIconWithFrame:(struct CGRect)arg1; +- (void)OCIconOverlayHandlers_drawImage:(id)arg1; +- (void)OCIconOverlayHandlers_drawRect:(struct CGRect)arg1; @end \ No newline at end of file diff --git a/shell_integration/MacOSX/LiferayNativityFinder/IconOverlayHandlers.m b/shell_integration/MacOSX/OwnCloudFinder/IconOverlayHandlers.m similarity index 86% rename from shell_integration/MacOSX/LiferayNativityFinder/IconOverlayHandlers.m rename to shell_integration/MacOSX/OwnCloudFinder/IconOverlayHandlers.m index 87519ef6e6..90b22fd584 100644 --- a/shell_integration/MacOSX/LiferayNativityFinder/IconOverlayHandlers.m +++ b/shell_integration/MacOSX/OwnCloudFinder/IconOverlayHandlers.m @@ -22,7 +22,7 @@ - (void)IconOverlayHandlers_drawIconWithFrame:(struct CGRect)arg1 { - [self IconOverlayHandlers_drawIconWithFrame:arg1]; + [self OCIconOverlayHandlers_drawIconWithFrame:arg1]; NSURL* url = [[NSClassFromString(@"FINode") nodeFromNodeRef:[(TIconAndTextCell*)self node]->fNodeRef] previewItemURL]; @@ -48,21 +48,21 @@ } } -- (void)IconOverlayHandlers_IKImageBrowserCell_drawImage:(id)arg1 +- (void)OCIconOverlayHandlers_IKImageBrowserCell_drawImage:(id)arg1 { - IKImageWrapper*imageWrapper = [self IconOverlayHandlers_imageWrapper:arg1]; + IKImageWrapper*imageWrapper = [self OCIconOverlayHandlers_imageWrapper:arg1]; - [self IconOverlayHandlers_IKImageBrowserCell_drawImage:imageWrapper]; + [self OCIconOverlayHandlers_IKImageBrowserCell_drawImage:imageWrapper]; } -- (void)IconOverlayHandlers_IKFinderReflectiveIconCell_drawImage:(id)arg1 +- (void)OCIconOverlayHandlers_IKFinderReflectiveIconCell_drawImage:(id)arg1 { - IKImageWrapper*imageWrapper = [self IconOverlayHandlers_imageWrapper:arg1]; + IKImageWrapper*imageWrapper = [self OCIconOverlayHandlers_imageWrapper:arg1]; - [self IconOverlayHandlers_IKFinderReflectiveIconCell_drawImage:imageWrapper]; + [self OCIconOverlayHandlers_IKFinderReflectiveIconCell_drawImage:imageWrapper]; } -- (IKImageWrapper*)IconOverlayHandlers_imageWrapper:(id)arg1 +- (IKImageWrapper*)OCIconOverlayHandlers_imageWrapper:(id)arg1 { TIconViewCell* realSelf = (TIconViewCell*)self; FINode* node = (FINode*)[realSelf representedItem]; @@ -111,9 +111,9 @@ } } -- (void)IconOverlayHandlers_drawRect:(struct CGRect)arg1 +- (void)OCIconOverlayHandlers_drawRect:(struct CGRect)arg1 { - [self IconOverlayHandlers_drawRect:arg1]; + [self OCIconOverlayHandlers_drawRect:arg1]; NSView* supersuperview = [[(NSView*)self superview] superview]; diff --git a/shell_integration/MacOSX/LiferayNativityFinder/Info.plist b/shell_integration/MacOSX/OwnCloudFinder/Info.plist similarity index 97% rename from shell_integration/MacOSX/LiferayNativityFinder/Info.plist rename to shell_integration/MacOSX/OwnCloudFinder/Info.plist index b7111eae40..bfd7c65910 100644 --- a/shell_integration/MacOSX/LiferayNativityFinder/Info.plist +++ b/shell_integration/MacOSX/OwnCloudFinder/Info.plist @@ -2,8 +2,6 @@ - NSPrincipalClass - FinderHook CFBundleDevelopmentRegion English CFBundleExecutable @@ -11,7 +9,7 @@ CFBundleIconFile CFBundleIdentifier - com.liferay.nativity + com.owncloud.finder CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -42,5 +40,7 @@ CFPlugInUnloadFunction + NSPrincipalClass + FinderHook diff --git a/shell_integration/MacOSX/LiferayNativityFinder/JSONKit.h b/shell_integration/MacOSX/OwnCloudFinder/JSONKit.h similarity index 100% rename from shell_integration/MacOSX/LiferayNativityFinder/JSONKit.h rename to shell_integration/MacOSX/OwnCloudFinder/JSONKit.h diff --git a/shell_integration/MacOSX/LiferayNativityFinder/JSONKit.m b/shell_integration/MacOSX/OwnCloudFinder/JSONKit.m similarity index 100% rename from shell_integration/MacOSX/LiferayNativityFinder/JSONKit.m rename to shell_integration/MacOSX/OwnCloudFinder/JSONKit.m diff --git a/shell_integration/MacOSX/LiferayNativityFinder/MenuManager.h b/shell_integration/MacOSX/OwnCloudFinder/MenuManager.h similarity index 100% rename from shell_integration/MacOSX/LiferayNativityFinder/MenuManager.h rename to shell_integration/MacOSX/OwnCloudFinder/MenuManager.h diff --git a/shell_integration/MacOSX/LiferayNativityFinder/MenuManager.m b/shell_integration/MacOSX/OwnCloudFinder/MenuManager.m similarity index 100% rename from shell_integration/MacOSX/LiferayNativityFinder/MenuManager.m rename to shell_integration/MacOSX/OwnCloudFinder/MenuManager.m diff --git a/shell_integration/MacOSX/LiferayNativityFinder/LiferayNativityFinder.xcodeproj/project.pbxproj b/shell_integration/MacOSX/OwnCloudFinder/OwnCloudFinder.xcodeproj/project.pbxproj similarity index 93% rename from shell_integration/MacOSX/LiferayNativityFinder/LiferayNativityFinder.xcodeproj/project.pbxproj rename to shell_integration/MacOSX/OwnCloudFinder/OwnCloudFinder.xcodeproj/project.pbxproj index 1b299f12c9..c6c6979247 100644 --- a/shell_integration/MacOSX/LiferayNativityFinder/LiferayNativityFinder.xcodeproj/project.pbxproj +++ b/shell_integration/MacOSX/OwnCloudFinder/OwnCloudFinder.xcodeproj/project.pbxproj @@ -48,7 +48,7 @@ 8C37DDB9161594B400016A95 /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; }; 8C99F6921622D145002D2135 /* IconCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IconCache.h; sourceTree = ""; }; 8C99F6931622D145002D2135 /* IconCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IconCache.m; sourceTree = ""; }; - 8D576316048677EA00EA77CD /* LiferayNativityFinder.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LiferayNativityFinder.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; + 8D576316048677EA00EA77CD /* OwnCloudFinder.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OwnCloudFinder.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ @@ -67,7 +67,7 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 089C166AFE841209C02AAC07 /* LiferayNativityFinder */ = { + 089C166AFE841209C02AAC07 /* OwnCloudFinder */ = { isa = PBXGroup; children = ( 08FB77AFFE84173DC02AAC07 /* Source */, @@ -75,7 +75,7 @@ 089C1671FE841209C02AAC07 /* External Frameworks and Libraries */, 19C28FB6FE9D52B211CA2CBB /* Products */, ); - name = LiferayNativityFinder; + name = OwnCloudFinder; sourceTree = ""; usesTabs = 1; }; @@ -152,7 +152,7 @@ 19C28FB6FE9D52B211CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 8D576316048677EA00EA77CD /* LiferayNativityFinder.bundle */, + 8D576316048677EA00EA77CD /* OwnCloudFinder.bundle */, ); name = Products; sourceTree = ""; @@ -160,9 +160,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8D57630D048677EA00EA77CD /* LiferayNativityFinder */ = { + 8D57630D048677EA00EA77CD /* OwnCloudFinder */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "LiferayNativityFinder" */; + buildConfigurationList = 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "OwnCloudFinder" */; buildPhases = ( 8D57630F048677EA00EA77CD /* Resources */, 8D576311048677EA00EA77CD /* Sources */, @@ -172,10 +172,10 @@ ); dependencies = ( ); - name = LiferayNativityFinder; + name = OwnCloudFinder; productInstallPath = "$(HOME)/Library/Bundles"; - productName = LiferayNativityFinder; - productReference = 8D576316048677EA00EA77CD /* LiferayNativityFinder.bundle */; + productName = OwnCloudFinder; + productReference = 8D576316048677EA00EA77CD /* OwnCloudFinder.bundle */; productType = "com.apple.product-type.bundle"; }; /* End PBXNativeTarget section */ @@ -186,7 +186,7 @@ attributes = { LastUpgradeCheck = 0460; }; - buildConfigurationList = 1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "LiferayNativityFinder" */; + buildConfigurationList = 1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "OwnCloudFinder" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; @@ -196,11 +196,11 @@ French, German, ); - mainGroup = 089C166AFE841209C02AAC07 /* LiferayNativityFinder */; + mainGroup = 089C166AFE841209C02AAC07 /* OwnCloudFinder */; projectDirPath = ""; projectRoot = ""; targets = ( - 8D57630D048677EA00EA77CD /* LiferayNativityFinder */, + 8D57630D048677EA00EA77CD /* OwnCloudFinder */, ); }; /* End PBXProject section */ @@ -260,7 +260,7 @@ GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Bundles"; - PRODUCT_NAME = LiferayNativityFinder; + PRODUCT_NAME = OwnCloudFinder; WRAPPER_EXTENSION = bundle; }; name = Debug; @@ -277,7 +277,7 @@ GCC_MODEL_TUNING = G5; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Bundles"; - PRODUCT_NAME = LiferayNativityFinder; + PRODUCT_NAME = OwnCloudFinder; WRAPPER_EXTENSION = bundle; }; name = Release; @@ -315,7 +315,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "LiferayNativityFinder" */ = { + 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "OwnCloudFinder" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB911B08733D790010E9CD /* Debug */, @@ -324,7 +324,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "LiferayNativityFinder" */ = { + 1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "OwnCloudFinder" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB911F08733D790010E9CD /* Debug */, diff --git a/shell_integration/MacOSX/LiferayNativityFinder/LiferayNativityFinder.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/shell_integration/MacOSX/OwnCloudFinder/OwnCloudFinder.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 65% rename from shell_integration/MacOSX/LiferayNativityFinder/LiferayNativityFinder.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to shell_integration/MacOSX/OwnCloudFinder/OwnCloudFinder.xcodeproj/project.xcworkspace/contents.xcworkspacedata index f5850463db..25ab3b4240 100644 --- a/shell_integration/MacOSX/LiferayNativityFinder/LiferayNativityFinder.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/shell_integration/MacOSX/OwnCloudFinder/OwnCloudFinder.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:OwnCloudFinder.xcodeproj"> diff --git a/shell_integration/MacOSX/LiferayNativityFinder/LiferayNativityFinder.xcodeproj/xcuserdata/mackie.xcuserdatad/xcschemes/xcschememanagement.plist b/shell_integration/MacOSX/OwnCloudFinder/OwnCloudFinder.xcodeproj/xcuserdata/guruz.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from shell_integration/MacOSX/LiferayNativityFinder/LiferayNativityFinder.xcodeproj/xcuserdata/mackie.xcuserdatad/xcschemes/xcschememanagement.plist rename to shell_integration/MacOSX/OwnCloudFinder/OwnCloudFinder.xcodeproj/xcuserdata/guruz.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/shell_integration/MacOSX/LiferayNativityFinder/RequestManager.h b/shell_integration/MacOSX/OwnCloudFinder/RequestManager.h similarity index 100% rename from shell_integration/MacOSX/LiferayNativityFinder/RequestManager.h rename to shell_integration/MacOSX/OwnCloudFinder/RequestManager.h diff --git a/shell_integration/MacOSX/LiferayNativityFinder/RequestManager.m b/shell_integration/MacOSX/OwnCloudFinder/RequestManager.m similarity index 98% rename from shell_integration/MacOSX/LiferayNativityFinder/RequestManager.m rename to shell_integration/MacOSX/OwnCloudFinder/RequestManager.m index 2549cdabd3..e4393be43b 100644 --- a/shell_integration/MacOSX/LiferayNativityFinder/RequestManager.m +++ b/shell_integration/MacOSX/OwnCloudFinder/RequestManager.m @@ -217,7 +217,7 @@ static RequestManager* sharedInstance = nil; { NSLog(@"Connect Socket!"); NSError *err = nil; - if (![_socket connectToHost:@"localhost" onPort:33001 withTimeout:5 error:&err]) // Asynchronous! + if (![_socket connectToHost:@"localhost" onPort:34001 withTimeout:5 error:&err]) // Asynchronous! { // If there was an error, it's likely something like "already connected" or "no delegate set" NSLog(@"I goofed: %@", err); diff --git a/shell_integration/MacOSX/LiferayNativityInjector/English.lproj/InfoPlist.strings b/shell_integration/MacOSX/OwnCloudInjector/English.lproj/InfoPlist.strings similarity index 100% rename from shell_integration/MacOSX/LiferayNativityInjector/English.lproj/InfoPlist.strings rename to shell_integration/MacOSX/OwnCloudInjector/English.lproj/InfoPlist.strings diff --git a/shell_integration/MacOSX/LiferayNativityInjector/Info.plist b/shell_integration/MacOSX/OwnCloudInjector/Info.plist similarity index 89% rename from shell_integration/MacOSX/LiferayNativityInjector/Info.plist rename to shell_integration/MacOSX/OwnCloudInjector/Info.plist index bb17f059cf..45f86a8b5b 100644 --- a/shell_integration/MacOSX/LiferayNativityInjector/Info.plist +++ b/shell_integration/MacOSX/OwnCloudInjector/Info.plist @@ -7,51 +7,51 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.liferay.nativity + com.owncloud.injector CFBundleInfoDictionaryVersion 6.0 CFBundleName - LiferayNativityInjector + OwnCloudInjector CFBundlePackageType osax CFBundleShortVersionString 1.0.2 CFBundleSignature - NVTY + OWNC CFBundleVersion 1.0.2 OSAScriptingDefinition - LiferayNativityInjector.sdef + OwnCloudInjector.sdef OSAXHandlers Events - NVTYload - - Handler - HandleLoadEvent - ThreadSafe - - Context - Process - - NVTYunld - - Handler - HandleUnloadEvent - ThreadSafe - - Context - Process - NVTYlded + Context + Process Handler HandleLoadedEvent ThreadSafe + + NVTYload + Context Process + Handler + HandleLoadEvent + ThreadSafe + + + NVTYunld + + Context + Process + Handler + HandleUnloadEvent + ThreadSafe + diff --git a/shell_integration/MacOSX/LiferayNativityInjector/LNStandardVersionComparator.h b/shell_integration/MacOSX/OwnCloudInjector/LNStandardVersionComparator.h similarity index 100% rename from shell_integration/MacOSX/LiferayNativityInjector/LNStandardVersionComparator.h rename to shell_integration/MacOSX/OwnCloudInjector/LNStandardVersionComparator.h diff --git a/shell_integration/MacOSX/LiferayNativityInjector/LNStandardVersionComparator.m b/shell_integration/MacOSX/OwnCloudInjector/LNStandardVersionComparator.m similarity index 100% rename from shell_integration/MacOSX/LiferayNativityInjector/LNStandardVersionComparator.m rename to shell_integration/MacOSX/OwnCloudInjector/LNStandardVersionComparator.m diff --git a/shell_integration/MacOSX/LiferayNativityInjector/LNVersionComparisonProtocol.h b/shell_integration/MacOSX/OwnCloudInjector/LNVersionComparisonProtocol.h similarity index 100% rename from shell_integration/MacOSX/LiferayNativityInjector/LNVersionComparisonProtocol.h rename to shell_integration/MacOSX/OwnCloudInjector/LNVersionComparisonProtocol.h diff --git a/shell_integration/MacOSX/LiferayNativityInjector/LiferayNativityInjector.m b/shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.m similarity index 93% rename from shell_integration/MacOSX/LiferayNativityInjector/LiferayNativityInjector.m rename to shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.m index 8e89a0d8d3..b8e9791eb8 100644 --- a/shell_integration/MacOSX/LiferayNativityInjector/LiferayNativityInjector.m +++ b/shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.m @@ -7,27 +7,27 @@ #define WAIT_FOR_APPLE_EVENT_TO_ENTER_HANDLER_IN_SECONDS 1.0 #define FINDER_MIN_TESTED_VERSION @"10.7" #define FINDER_MAX_TESTED_VERSION @"10.8.5" -#define LIFERAYNATIVITY_INJECTED_NOTIFICATION @"LiferayNativityInjectedNotification" +#define LIFERAYNATIVITY_INJECTED_NOTIFICATION @"OwnCloudInjectedNotification" EXPORT OSErr HandleLoadEvent(const AppleEvent* ev, AppleEvent* reply, long refcon); static NSString* globalLock = @"I'm the global lock to prevent concruent handler executions"; // SIMBL-compatible interface -@interface LiferayNativityShell : NSObject { } +@interface OwnCloudShell : NSObject { } -(void) install; -(void) uninstall; @end // just a dummy class for locating our bundle -@interface LiferayNativityInjector : NSObject { } +@interface OwnCloudInjector : NSObject { } @end -@implementation LiferayNativityInjector { } +@implementation OwnCloudInjector { } @end static bool liferayNativityLoaded = false; -static NSString* liferayNativityBundleName = @"LiferayNativityFinder"; +static NSString* liferayNativityBundleName = @"OwnCloudFinder"; typedef struct { NSString* location; @@ -128,7 +128,7 @@ static OSErr loadBundle(LNBundleType type, AppleEvent* reply, long refcon) { } } - NSBundle* liferayNativityInjectorBundle = [NSBundle bundleForClass:[LiferayNativityInjector class]]; + NSBundle* liferayNativityInjectorBundle = [NSBundle bundleForClass:[OwnCloudInjector class]]; NSString* liferayNativityLocation = [liferayNativityInjectorBundle pathForResource:bundleName ofType:@"bundle"]; NSBundle* pluginBundle = [NSBundle bundleWithPath:liferayNativityLocation]; if (!pluginBundle) { @@ -182,11 +182,11 @@ static LNBundleType mainBundleType(AppleEvent* reply) { EXPORT OSErr HandleLoadEvent(const AppleEvent* ev, AppleEvent* reply, long refcon) { @synchronized(globalLock) { @autoreleasepool { - NSBundle* injectorBundle = [NSBundle bundleForClass:[LiferayNativityInjector class]]; + NSBundle* injectorBundle = [NSBundle bundleForClass:[OwnCloudInjector class]]; NSString* injectorVersion = [injectorBundle objectForInfoDictionaryKey:@"CFBundleVersion"]; if (!injectorVersion || ![injectorVersion isKindOfClass:[NSString class]]) { - reportError(reply, [NSString stringWithFormat:@"Unable to determine LiferayNativityInjector version!"]); + reportError(reply, [NSString stringWithFormat:@"Unable to determine OwnCloudInjector version!"]); return 7; } @@ -206,7 +206,7 @@ EXPORT OSErr HandleLoadEvent(const AppleEvent* ev, AppleEvent* reply, long refco return noErr; } @catch (NSException* exception) { - reportError(reply, [NSString stringWithFormat:@"Failed to load LiferayNativity with exception: %@", exception]); + reportError(reply, [NSString stringWithFormat:@"Failed to load OwnCloudFinder with exception: %@", exception]); } return 1; @@ -232,13 +232,13 @@ EXPORT OSErr HandleUnloadEvent(const AppleEvent* ev, AppleEvent* reply, long ref @autoreleasepool { @try { if (!liferayNativityLoaded) { - NSLog(@"LiferayNativityInjector: not loaded."); + NSLog(@"OwnCloudInjector: not loaded."); return noErr; } NSString* bundleName = liferayNativityBundleName; - NSBundle* liferayNativityInjectorBundle = [NSBundle bundleForClass:[LiferayNativityInjector class]]; + NSBundle* liferayNativityInjectorBundle = [NSBundle bundleForClass:[OwnCloudInjector class]]; NSString* liferayNativityLocation = [liferayNativityInjectorBundle pathForResource:bundleName ofType:@"bundle"]; NSBundle* pluginBundle = [NSBundle bundleWithPath:liferayNativityLocation]; if (!pluginBundle) { @@ -261,7 +261,7 @@ EXPORT OSErr HandleUnloadEvent(const AppleEvent* ev, AppleEvent* reply, long ref return noErr; } @catch (NSException* exception) { - reportError(reply, [NSString stringWithFormat:@"Failed to unload LiferayNativity with exception: %@", exception]); + reportError(reply, [NSString stringWithFormat:@"Failed to unload OwnCloudFinder with exception: %@", exception]); } return 1; diff --git a/shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.sdef b/shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.sdef new file mode 100644 index 0000000000..3d4c5fdd4e --- /dev/null +++ b/shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.sdef @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/shell_integration/MacOSX/LiferayNativityInjector/LiferayNativityInjector.xcodeproj/project.pbxproj b/shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.xcodeproj/project.pbxproj similarity index 78% rename from shell_integration/MacOSX/LiferayNativityInjector/LiferayNativityInjector.xcodeproj/project.pbxproj rename to shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.xcodeproj/project.pbxproj index ce634a01a9..99498951e7 100644 --- a/shell_integration/MacOSX/LiferayNativityInjector/LiferayNativityInjector.xcodeproj/project.pbxproj +++ b/shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.xcodeproj/project.pbxproj @@ -7,27 +7,27 @@ objects = { /* Begin PBXBuildFile section */ - 0B36CB92182461A10039B237 /* LiferayNativityFinder.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0B36CB91182461A10039B237 /* LiferayNativityFinder.bundle */; }; + 0B36CB92182461A10039B237 /* OwnCloudFinder.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0B36CB91182461A10039B237 /* OwnCloudFinder.bundle */; }; 0BD9C38E1778EF450094CF5D /* license.txt in Resources */ = {isa = PBXBuildFile; fileRef = 0BD9C38D1778EF450094CF5D /* license.txt */; }; 8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; }; 8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; }; - D6ACBEA2117B7D5600F6691C /* LiferayNativityInjector.m in Sources */ = {isa = PBXBuildFile; fileRef = D6ACBE9E117B7D5600F6691C /* LiferayNativityInjector.m */; }; + D6ACBEA2117B7D5600F6691C /* OwnCloudInjector.m in Sources */ = {isa = PBXBuildFile; fileRef = D6ACBE9E117B7D5600F6691C /* OwnCloudInjector.m */; }; D6ACBEA3117B7D5600F6691C /* LNStandardVersionComparator.m in Sources */ = {isa = PBXBuildFile; fileRef = D6ACBEA0117B7D5600F6691C /* LNStandardVersionComparator.m */; }; - D6ACBEA5117B7D6100F6691C /* LiferayNativityInjector.sdef in Resources */ = {isa = PBXBuildFile; fileRef = D6ACBEA4117B7D6100F6691C /* LiferayNativityInjector.sdef */; }; + D6ACBEA5117B7D6100F6691C /* OwnCloudInjector.sdef in Resources */ = {isa = PBXBuildFile; fileRef = D6ACBEA4117B7D6100F6691C /* OwnCloudInjector.sdef */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; }; - 0B36CB91182461A10039B237 /* LiferayNativityFinder.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; path = LiferayNativityFinder.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; + 0B36CB91182461A10039B237 /* OwnCloudFinder.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; path = OwnCloudFinder.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 0BD9C38D1778EF450094CF5D /* license.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = license.txt; sourceTree = ""; }; 8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - D60A992314CE37030061AD6D /* LiferayNativity.osax */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LiferayNativity.osax; sourceTree = BUILT_PRODUCTS_DIR; }; - D6ACBE9E117B7D5600F6691C /* LiferayNativityInjector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LiferayNativityInjector.m; sourceTree = ""; }; + D60A992314CE37030061AD6D /* OwnCloudFinder.osax */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OwnCloudFinder.osax; sourceTree = BUILT_PRODUCTS_DIR; }; + D6ACBE9E117B7D5600F6691C /* OwnCloudInjector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OwnCloudInjector.m; sourceTree = ""; }; D6ACBE9F117B7D5600F6691C /* LNVersionComparisonProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LNVersionComparisonProtocol.h; sourceTree = ""; }; D6ACBEA0117B7D5600F6691C /* LNStandardVersionComparator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LNStandardVersionComparator.m; sourceTree = ""; }; D6ACBEA1117B7D5600F6691C /* LNStandardVersionComparator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LNStandardVersionComparator.h; sourceTree = ""; }; - D6ACBEA4117B7D6100F6691C /* LiferayNativityInjector.sdef */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = LiferayNativityInjector.sdef; sourceTree = ""; }; + D6ACBEA4117B7D6100F6691C /* OwnCloudInjector.sdef */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = OwnCloudInjector.sdef; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -67,8 +67,8 @@ 089C167CFE841241C02AAC07 /* Resources */ = { isa = PBXGroup; children = ( - 0B36CB91182461A10039B237 /* LiferayNativityFinder.bundle */, - D6ACBEA4117B7D6100F6691C /* LiferayNativityInjector.sdef */, + 0B36CB91182461A10039B237 /* OwnCloudFinder.bundle */, + D6ACBEA4117B7D6100F6691C /* OwnCloudInjector.sdef */, 8D576317048677EA00EA77CD /* Info.plist */, 8D5B49A704867FD3000E48DA /* InfoPlist.strings */, 0BD9C38D1778EF450094CF5D /* license.txt */, @@ -79,7 +79,7 @@ 08FB77AFFE84173DC02AAC07 /* Source */ = { isa = PBXGroup; children = ( - D6ACBE9E117B7D5600F6691C /* LiferayNativityInjector.m */, + D6ACBE9E117B7D5600F6691C /* OwnCloudInjector.m */, D6ACBE9F117B7D5600F6691C /* LNVersionComparisonProtocol.h */, D6ACBEA0117B7D5600F6691C /* LNStandardVersionComparator.m */, D6ACBEA1117B7D5600F6691C /* LNStandardVersionComparator.h */, @@ -90,7 +90,7 @@ D60A992414CE37030061AD6D /* Products */ = { isa = PBXGroup; children = ( - D60A992314CE37030061AD6D /* LiferayNativity.osax */, + D60A992314CE37030061AD6D /* OwnCloudFinder.osax */, ); name = Products; sourceTree = ""; @@ -98,9 +98,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8D57630D048677EA00EA77CD /* LiferayNativity.osax */ = { + 8D57630D048677EA00EA77CD /* OwnCloudFinder.osax */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "LiferayNativity.osax" */; + buildConfigurationList = 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "OwnCloudFinder.osax" */; buildPhases = ( 8D57630F048677EA00EA77CD /* Resources */, 8D576311048677EA00EA77CD /* Sources */, @@ -110,10 +110,10 @@ ); dependencies = ( ); - name = LiferayNativity.osax; + name = OwnCloudFinder.osax; productInstallPath = "$(HOME)/Library/Bundles"; productName = "TotalFinder-osax"; - productReference = D60A992314CE37030061AD6D /* LiferayNativity.osax */; + productReference = D60A992314CE37030061AD6D /* OwnCloudFinder.osax */; productType = "com.apple.product-type.bundle"; }; /* End PBXNativeTarget section */ @@ -126,7 +126,7 @@ LastUpgradeCheck = 0460; ORGANIZATIONNAME = BinaryAge; }; - buildConfigurationList = 1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "LiferayNativityInjector" */; + buildConfigurationList = 1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "OwnCloudInjector" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; @@ -139,7 +139,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 8D57630D048677EA00EA77CD /* LiferayNativity.osax */, + 8D57630D048677EA00EA77CD /* OwnCloudFinder.osax */, ); }; /* End PBXProject section */ @@ -149,9 +149,9 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 0B36CB92182461A10039B237 /* LiferayNativityFinder.bundle in Resources */, + 0B36CB92182461A10039B237 /* OwnCloudFinder.bundle in Resources */, 8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */, - D6ACBEA5117B7D6100F6691C /* LiferayNativityInjector.sdef in Resources */, + D6ACBEA5117B7D6100F6691C /* OwnCloudInjector.sdef in Resources */, 0BD9C38E1778EF450094CF5D /* license.txt in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -163,7 +163,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - D6ACBEA2117B7D5600F6691C /* LiferayNativityInjector.m in Sources */, + D6ACBEA2117B7D5600F6691C /* OwnCloudInjector.m in Sources */, D6ACBEA3117B7D5600F6691C /* LNStandardVersionComparator.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -195,7 +195,7 @@ "-framework", AppKit, ); - PRODUCT_NAME = LiferayNativity; + PRODUCT_NAME = OwnCloudFinder; SKIP_INSTALL = YES; WRAPPER_EXTENSION = osax; }; @@ -214,7 +214,7 @@ "-framework", AppKit, ); - PRODUCT_NAME = LiferayNativity; + PRODUCT_NAME = OwnCloudFinder; WRAPPER_EXTENSION = osax; }; name = Release; @@ -245,7 +245,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "LiferayNativity.osax" */ = { + 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "OwnCloudFinder.osax" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB911B08733D790010E9CD /* Debug */, @@ -254,7 +254,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "LiferayNativityInjector" */ = { + 1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "OwnCloudInjector" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB911F08733D790010E9CD /* Debug */, diff --git a/shell_integration/MacOSX/LiferayNativityInjector/LiferayNativityInjector.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 64% rename from shell_integration/MacOSX/LiferayNativityInjector/LiferayNativityInjector.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.xcodeproj/project.xcworkspace/contents.xcworkspacedata index af6464bbab..25ab3b4240 100644 --- a/shell_integration/MacOSX/LiferayNativityInjector/LiferayNativityInjector.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:OwnCloudFinder.xcodeproj"> diff --git a/shell_integration/MacOSX/LiferayNativityInjector/LiferayNativityInjector.xcodeproj/xcshareddata/xcschemes/LiferayNativity.osax.xcscheme b/shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.xcodeproj/xcshareddata/xcschemes/OwnCloudFinder.osax.xcscheme similarity index 84% rename from shell_integration/MacOSX/LiferayNativityInjector/LiferayNativityInjector.xcodeproj/xcshareddata/xcschemes/LiferayNativity.osax.xcscheme rename to shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.xcodeproj/xcshareddata/xcschemes/OwnCloudFinder.osax.xcscheme index 05ce02170d..7ba1d7a8ae 100644 --- a/shell_integration/MacOSX/LiferayNativityInjector/LiferayNativityInjector.xcodeproj/xcshareddata/xcschemes/LiferayNativity.osax.xcscheme +++ b/shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.xcodeproj/xcshareddata/xcschemes/OwnCloudFinder.osax.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "OwnCloudFinder.bundle" + BlueprintName = "OwnCloudFinder" + ReferencedContainer = "container:../OwnCloudFinder/OwnCloudFinder.xcodeproj"> + BuildableName = "OwnCloudFinder.osax" + BlueprintName = "OwnCloudFinder.osax" + ReferencedContainer = "container:OwnCloudInjector.xcodeproj"> diff --git a/shell_integration/MacOSX/LiferayNativityInjector/LiferayNativityInjector.xcodeproj/xcuserdata/mackie.xcuserdatad/xcschemes/xcschememanagement.plist b/shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.xcodeproj/xcuserdata/guruz.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from shell_integration/MacOSX/LiferayNativityInjector/LiferayNativityInjector.xcodeproj/xcuserdata/mackie.xcuserdatad/xcschemes/xcschememanagement.plist rename to shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.xcodeproj/xcuserdata/guruz.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/shell_integration/MacOSX/LiferayNativityInjector/license.txt b/shell_integration/MacOSX/OwnCloudInjector/license.txt similarity index 100% rename from shell_integration/MacOSX/LiferayNativityInjector/license.txt rename to shell_integration/MacOSX/OwnCloudInjector/license.txt diff --git a/shell_integration/MacOSX/deploy.sh b/shell_integration/MacOSX/deploy.sh index 13bbbce2cf..0a9d47f801 100644 --- a/shell_integration/MacOSX/deploy.sh +++ b/shell_integration/MacOSX/deploy.sh @@ -1,8 +1,14 @@ #!/bin/sh # osascript $HOME/owncloud.com/mirall/shell_integration/MacOSX/unload.scpt -sudo rm -rf /Library/ScriptingAdditions/LiferayNativity.osax -sudo cp -r $HOME/Library/Developer/Xcode/DerivedData/LiferayNativity-gvtginoclfyisuagangtxsfbuztw/Build/Products/Debug/LiferayNativity.osax /Library/ScriptingAdditions/ +sudo rm -rf /Library/ScriptingAdditions/OwnCloudFinder.osax +# Klaas' machine +OSAXDIR=$HOME/Library/Developer/Xcode/DerivedData/OwnCloud-*/Build/Products/Debug/OwnCloudFinder.osax +[ -d $OSAXDIR ] ||OSAXDIR=$HOME/Library/Developer/Xcode/DerivedData/OwnCloud-*/Build/Intermediates/ArchiveIntermediates/OwnCloudFinder.osax/IntermediateBuildFilesPath/UninstalledProducts/OwnCloudFinder.osax + +# Markus' machine +[ -d $OSAXDIR ] || echo "OSAX does not exist" +[ -d $OSAXDIR ] && sudo cp -rv $OSAXDIR /Library/ScriptingAdditions/ sudo killall Finder sleep 1 diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp index f9bd2a309a..baa84bb1f5 100644 --- a/src/mirall/owncloudgui.cpp +++ b/src/mirall/owncloudgui.cpp @@ -97,7 +97,7 @@ ownCloudGui::ownCloudGui(Application *parent) : void ownCloudGui::setupOverlayIcons() { - if( Utility::isMac() && QFile::exists("/Library/ScriptingAdditions/LiferayNativity.osax") ) { + if( Utility::isMac() && QFile::exists("/Library/ScriptingAdditions/OwnCloudFinder.osax") ) { QString aScript = QString::fromUtf8("tell application \"Finder\"\n" " try\n" " «event NVTYload»\n" From dc1836611182a9bf111470a568c15ff60472db62 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 18 Aug 2014 14:45:48 +0200 Subject: [PATCH 46/94] DiscoveryPhase: put in namespace Mirall --- src/mirall/discoveryphase.cpp | 4 ++++ src/mirall/discoveryphase.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/mirall/discoveryphase.cpp b/src/mirall/discoveryphase.cpp index 507e5ba104..3963ccfee4 100644 --- a/src/mirall/discoveryphase.cpp +++ b/src/mirall/discoveryphase.cpp @@ -16,6 +16,8 @@ #include #include +namespace Mirall { + bool DiscoveryJob::isInBlackList(const QString& path) const { if (_selectiveSyncBlackList.isEmpty()) { @@ -84,3 +86,5 @@ void DiscoveryJob::start() { emit finished(csync_update(_csync_ctx)); deleteLater(); } + +} diff --git a/src/mirall/discoveryphase.h b/src/mirall/discoveryphase.h index 7e4c0e379e..7788f6d02c 100644 --- a/src/mirall/discoveryphase.h +++ b/src/mirall/discoveryphase.h @@ -19,6 +19,9 @@ #include #include + +namespace Mirall { + /** * The Discovery Phase was once called "update" phase in csync therms. * Its goal is to look at the files in one of the remote and check comared to the db @@ -60,3 +63,4 @@ signals: void folderDiscovered(bool local, QString folderUrl); }; +} From 3760f14da826b4c4619392eda37bf48d49a8be2a Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 18 Aug 2014 15:16:33 +0200 Subject: [PATCH 47/94] Restore the log window --- src/mirall/logger.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mirall/logger.cpp b/src/mirall/logger.cpp index 4ab9232d3f..0bc8d1ccb8 100644 --- a/src/mirall/logger.cpp +++ b/src/mirall/logger.cpp @@ -50,7 +50,7 @@ Logger *Logger::instance() Logger::Logger( QObject* parent) : QObject(parent), _showTime(true), _doLogging(false), _doFileFlush(false), _logExpire(0) { -// qInstallMessageHandler(mirallLogCatcher); + qInstallMessageHandler(mirallLogCatcher); } Logger::~Logger() { From 1781400340df442017353fceec504fc3bfcef12e Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 18 Aug 2014 15:28:24 +0200 Subject: [PATCH 48/94] fix compilation --- src/mirall/folderman.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mirall/folderman.h b/src/mirall/folderman.h index 469b24b405..bc5e9a4323 100644 --- a/src/mirall/folderman.h +++ b/src/mirall/folderman.h @@ -51,7 +51,7 @@ public: * QString targetPath on remote */ void addFolderDefinition(const QString&, const QString&, const QString& , - const QStringList &selectiveSyncBlacklist = QStringList{} ); + const QStringList &selectiveSyncBlacklist = QStringList() ); /** Returns the folder which the file or directory stored in path is in */ Folder* folderForPath(const QString& path); From 7f38ce89085f7e2557eb76d0c6dcc124bd385a81 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 18 Aug 2014 15:45:38 +0200 Subject: [PATCH 49/94] Selective sync: the button should only be enabled while connected --- src/mirall/accountsettings.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp index 260d37e2fe..ca2b49b08e 100644 --- a/src/mirall/accountsettings.cpp +++ b/src/mirall/accountsettings.cpp @@ -158,9 +158,10 @@ void AccountSettings::slotFolderActivated( const QModelIndex& indx ) } else { ui->_buttonAdd->setVisible(true); } - ui->_buttonAdd->setEnabled(_account && _account->state() == Account::Connected); + bool isConnected = _account && _account->state() == Account::Connected; + ui->_buttonAdd->setEnabled(isConnected); ui->_buttonEnable->setEnabled( isValid ); - ui->_buttonSelectiveSync->setEnabled( isValid ); + ui->_buttonSelectiveSync->setEnabled(isConnected && isValid); if ( isValid ) { bool folderEnabled = _model->data( indx, FolderStatusDelegate::FolderSyncEnabled).toBool(); From c291eb3db41426b12ac808e7b1c95c706828a987 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 18 Aug 2014 15:45:58 +0200 Subject: [PATCH 50/94] Fix compilation error --- src/mirall/folderwizard.cpp | 4 ++-- src/mirall/selectivesyncdialog.cpp | 2 -- src/mirall/selectivesyncdialog.h | 5 ++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/mirall/folderwizard.cpp b/src/mirall/folderwizard.cpp index e619cd78c2..434c8608d1 100644 --- a/src/mirall/folderwizard.cpp +++ b/src/mirall/folderwizard.cpp @@ -446,7 +446,7 @@ void FolderWizardSelectiveSync::initializePage() if (targetPath.startsWith('/')) { targetPath = targetPath.mid(1); } - _treeView->setFolderInfo(targetPath, alias, {}); + _treeView->setFolderInfo(targetPath, alias); QWizardPage::initializePage(); } @@ -460,7 +460,7 @@ void FolderWizardSelectiveSync::cleanupPage() { QString alias = wizard()->field(QLatin1String("alias")).toString(); QString targetPath = wizard()->property("targetPath").toString(); - _treeView->setFolderInfo(targetPath, alias, {}); + _treeView->setFolderInfo(targetPath, alias); QWizardPage::cleanupPage(); } diff --git a/src/mirall/selectivesyncdialog.cpp b/src/mirall/selectivesyncdialog.cpp index 0012a91254..8e0cf20bf7 100644 --- a/src/mirall/selectivesyncdialog.cpp +++ b/src/mirall/selectivesyncdialog.cpp @@ -280,5 +280,3 @@ void SelectiveSyncDialog::accept() } - - diff --git a/src/mirall/selectivesyncdialog.h b/src/mirall/selectivesyncdialog.h index 44cab643b7..0506c18f27 100644 --- a/src/mirall/selectivesyncdialog.h +++ b/src/mirall/selectivesyncdialog.h @@ -29,7 +29,7 @@ public: QStringList createBlackList(QTreeWidgetItem* root = 0) const; void refreshFolders(); void setFolderInfo(const QString &folderPath, const QString &rootName, - const QStringList &oldBlackList) { + const QStringList &oldBlackList = QStringList()) { _folderPath = folderPath; _rootName = rootName; _oldBlackList = oldBlackList; @@ -61,5 +61,4 @@ private: Folder *_folder; }; - -} \ No newline at end of file +} From 6fbbe2d0e460e0af03df02fa6905afbcec4cc09a Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 18 Aug 2014 17:02:55 +0200 Subject: [PATCH 51/94] Create ShellIconOverlayIdentifiers key It may not exist. Registration fails in that case. --- .../OCOverlays/OCOverlayRegistrationHandler.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.cpp b/shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.cpp index 0271ee9c30..7b6985dfc3 100644 --- a/shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.cpp +++ b/shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.cpp @@ -24,7 +24,8 @@ HRESULT OCOverlayRegistrationHandler::MakeRegistryEntries(const CLSID& clsid, PC { HRESULT hResult; HKEY shellOverlayKey = NULL; - hResult = HRESULT_FROM_WIN32(RegOpenKeyEx(HKEY_LOCAL_MACHINE, REGISTRY_OVERLAY_KEY, 0, KEY_WRITE, &shellOverlayKey)); + // the key may not exist yet + hResult = HRESULT_FROM_WIN32(RegCreateKeyEx(HKEY_LOCAL_MACHINE, REGISTRY_OVERLAY_KEY, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &shellOverlayKey, NULL)); if (!SUCCEEDED(hResult)) { hResult = RegCreateKey(HKEY_LOCAL_MACHINE, REGISTRY_OVERLAY_KEY, &shellOverlayKey); if(!SUCCEEDED(hResult)) { From 2fb19e25b5eb7b21074aa2107f45ccf614c3259c Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 18 Aug 2014 17:03:47 +0200 Subject: [PATCH 52/94] Fix clang 3.0 compilation --- src/mirall/selectivesyncdialog.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mirall/selectivesyncdialog.cpp b/src/mirall/selectivesyncdialog.cpp index 8e0cf20bf7..c687798869 100644 --- a/src/mirall/selectivesyncdialog.cpp +++ b/src/mirall/selectivesyncdialog.cpp @@ -214,13 +214,13 @@ QStringList SelectiveSyncTreeView::createBlackList(QTreeWidgetItem* root) const if (!root) { root = topLevelItem(0); } - if (!root) return {}; + if (!root) return QStringList(); switch(root->checkState(0)) { case Qt::Unchecked: - return { root->data(0, Qt::UserRole).toString() }; + return QStringList(root->data(0, Qt::UserRole).toString()); case Qt::Checked: - return {}; + return QStringList(); case Qt::PartiallyChecked: break; } From 9c98883bea4e20eecde7be59ad6eb00f2d836e18 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 18 Aug 2014 20:40:20 +0200 Subject: [PATCH 53/94] propagator mkcol: If the server replies with a file-id in the header, use it Newer server will have a file id directly in the file header. https://github.com/owncloud/core/issues/9000 --- src/mirall/propagatorjobs.cpp | 37 ++++++++++++++++++++++++++--------- src/mirall/propagatorjobs.h | 1 + 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/mirall/propagatorjobs.cpp b/src/mirall/propagatorjobs.cpp index a94c04a754..dad244c5d7 100644 --- a/src/mirall/propagatorjobs.cpp +++ b/src/mirall/propagatorjobs.cpp @@ -182,6 +182,19 @@ void PropagateRemoteMkdir::propfind_results(void *userdata, } } +/* + * Called after the headers have been recieved, try to extract the fileId + */ +void PropagateRemoteMkdir::post_headers(ne_request* req, void* userdata, const ne_status* ) +{ + const char *header = ne_get_response_header(req, "OC-FileId"); + if( header ) { + qDebug() << "MKCOL: " << static_cast(userdata)->_item._file << " FileID from header:" << header; + static_cast(userdata)->_item._fileId = header; + } +} + + void PropagateRemoteMkdir::start() { if (_propagator->_abortRequested.fetchAndAddRelaxed(0)) @@ -190,8 +203,13 @@ void PropagateRemoteMkdir::start() QScopedPointer uri( ne_path_escape((_propagator->_remoteDir + _item._file).toUtf8())); + ne_hook_post_headers(_propagator->_session, post_headers, this); + int rc = ne_mkcol(_propagator->_session, uri.data()); + ne_unhook_post_headers(_propagator->_session, post_headers, this); + + /* Special for mkcol: it returns 405 if the directory already exists. * Ignore that error */ // Wed, 15 Nov 1995 06:25:24 GMT @@ -202,15 +220,16 @@ void PropagateRemoteMkdir::start() return; } - // Get the fileid - // This is required so that wa can detect moves even if the folder is renamed on the server - // while files are still uploading - // TODO: Now we have to do a propfind because the server does not give the file id in the request - // https://github.com/owncloud/core/issues/9000 - - ne_propfind_handler *hdl = ne_propfind_create(_propagator->_session, uri.data(), 0); - ne_propfind_named(hdl, ls_props, propfind_results, this); - ne_propfind_destroy(hdl); + if (_item._fileId.isEmpty()) { + // Owncloud 7.0.0 and before did not have a header with the file id. + // (https://github.com/owncloud/core/issues/9000) + // So we must get the file id using a PROPFIND + // This is required so that wa can detect moves even if the folder is renamed on the server + // while files are still uploading + ne_propfind_handler *hdl = ne_propfind_create(_propagator->_session, uri.data(), 0); + ne_propfind_named(hdl, ls_props, propfind_results, this); + ne_propfind_destroy(hdl); + } done(SyncFileItem::Success); } diff --git a/src/mirall/propagatorjobs.h b/src/mirall/propagatorjobs.h index df7a5e4722..6e8e30cbe1 100644 --- a/src/mirall/propagatorjobs.h +++ b/src/mirall/propagatorjobs.h @@ -96,6 +96,7 @@ public: void start() Q_DECL_OVERRIDE; private: static void propfind_results(void *userdata, const ne_uri *uri, const ne_prop_result_set *set); + static void post_headers(ne_request *req, void *userdata, const ne_status *status); friend class PropagateDirectory; // So it can access the _item; }; class PropagateLocalRename : public PropagateItemJob { From 94f3a1ab1f4a7c9b913fae29012ec3ca69dc356e Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Tue, 19 Aug 2014 01:25:24 -0400 Subject: [PATCH 54/94] [tx-robot] updated from transifex --- translations/mirall_ca.ts | 262 +++++++++++++++-------------- translations/mirall_cs.ts | 268 ++++++++++++++++-------------- translations/mirall_de.ts | 264 +++++++++++++++-------------- translations/mirall_el.ts | 262 +++++++++++++++-------------- translations/mirall_en.ts | 262 +++++++++++++++-------------- translations/mirall_es.ts | 264 +++++++++++++++-------------- translations/mirall_es_AR.ts | 262 +++++++++++++++-------------- translations/mirall_et.ts | 262 +++++++++++++++-------------- translations/mirall_eu.ts | 262 +++++++++++++++-------------- translations/mirall_fa.ts | 262 +++++++++++++++-------------- translations/mirall_fi.ts | 262 +++++++++++++++-------------- translations/mirall_fr.ts | 262 +++++++++++++++-------------- translations/mirall_gl.ts | 264 +++++++++++++++-------------- translations/mirall_hu.ts | 262 +++++++++++++++-------------- translations/mirall_it.ts | 264 +++++++++++++++-------------- translations/mirall_ja.ts | 262 +++++++++++++++-------------- translations/mirall_nl.ts | 264 +++++++++++++++-------------- translations/mirall_pl.ts | 262 +++++++++++++++-------------- translations/mirall_pt.ts | 262 +++++++++++++++-------------- translations/mirall_pt_BR.ts | 264 +++++++++++++++-------------- translations/mirall_ru.ts | 262 +++++++++++++++-------------- translations/mirall_sk.ts | 313 ++++++++++++++++++----------------- translations/mirall_sl.ts | 262 +++++++++++++++-------------- translations/mirall_sv.ts | 262 +++++++++++++++-------------- translations/mirall_th.ts | 262 +++++++++++++++-------------- translations/mirall_tr.ts | 264 +++++++++++++++-------------- translations/mirall_uk.ts | 262 +++++++++++++++-------------- translations/mirall_zh_CN.ts | 262 +++++++++++++++-------------- translations/mirall_zh_TW.ts | 262 +++++++++++++++-------------- 29 files changed, 4067 insertions(+), 3602 deletions(-) diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts index e176c48352..e7540b5170 100644 --- a/translations/mirall_ca.ts +++ b/translations/mirall_ca.ts @@ -63,17 +63,22 @@ Formulari - + + Selective Sync... + + + + Account Maintenance Manteniment del compte - + Edit Ignored Files Edita fitxers ignorats - + Modify Account Modifica el compte @@ -89,7 +94,7 @@ - + Pause Pausa @@ -104,111 +109,111 @@ Afegeix carpeta... - + Storage Usage Ús de l'emmagatzemament - + Retrieving usage information... Obtenint informació de l'ús... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Nota</b> Algunes carpetes, incloent els fitxers muntats a través de xarxa o compartits, poden tenir límits diferents. - + Resume Continua - + Confirm Folder Remove Confirma l'eliminació de la carpeta - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Voleu aturar la sincronització de la carpeta <i>%1</i>?</p><p><b>Nota:</b> Això no eliminarà els fitxers del client.</p> - + Confirm Folder Reset Confirmeu la reinicialització de la carpeta - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Voleu reiniciar la carpeta <i>%1</i> i reconstruir la base de dades del client?</p><p><b>Nota:</b> Aquesta funció existeix només per tasques de manteniment. Cap fitxer no s'eliminarà, però podria provocar-se un transit de dades significant i podria trigar diversos minuts o hores en completar-se, depenent de la mida de la carpeta. Utilitzeu aquesta opció només si us ho recomana l'administrador.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) de %2 l'espai del servidor en ús. - + No connection to %1 at <a href="%2">%3</a>. No hi ha connexió amb %1 a <a href="%2">%3</a>. - + No %1 connection configured. La connexió %1 no està configurada. - + Sync Running S'està sincronitzant - + No account configured. No hi ha cap compte configurat - + The syncing operation is running.<br/>Do you want to terminate it? S'està sincronitzant.<br/>Voleu parar-la? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 de %4) %5 pendents a un ràtio de %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 de %2, fitxer %3 de %4 Temps restant total %5 - + Connected to <a href="%1">%2</a>. Connectat a <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Connectat a <a href="%1">%2</a> com a <i>%3</i>. - + Currently there is no storage usage information available. Actualment no hi ha informació disponible de l'ús d'emmagatzemament. @@ -353,7 +358,7 @@ Temps restant total %5 Activitat de sincronització - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -362,17 +367,17 @@ Això podria ser perquè la carpeta ha estat reconfigurada silenciosament, o que Esteu segur que voleu executar aquesta operació? - + Remove All Files? Esborra tots els fitxers? - + Remove all files Esborra tots els fitxers - + Keep files Mantén els fitxers @@ -390,52 +395,52 @@ Esteu segur que voleu executar aquesta operació? S'ha trobat un diari de sincronització antic '%1', però no s'ha pogut eliminar. Assegureu-vos que no hi ha cap aplicació que actualment en faci ús. - + Undefined State. Estat indefinit. - + Waits to start syncing. Espera per començar la sincronització. - + Preparing for sync. Perparant per la sincronització. - + Sync is running. S'està sincronitzant. - + Last Sync was successful. La darrera sincronització va ser correcta. - + Last Sync was successful, but with warnings on individual files. La última sincronització ha estat un èxit, però amb avisos en fitxers individuals. - + Setup Error. Error de configuració. - + User Abort. Cancel·la usuari. - + Sync is paused. La sincronització està en pausa. - + %1 (Sync is paused) %1 (Sync està pausat) @@ -462,8 +467,8 @@ Esteu segur que voleu executar aquesta operació? Mirall::FolderWizard - - + + Add Folder Afegeix una carpeta @@ -471,67 +476,67 @@ Esteu segur que voleu executar aquesta operació? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Feu clic per seleccionar un directori local per sincronitzar. - + Enter the path to the local folder. Introduïu la ruta del directori local. - + The directory alias is a descriptive name for this sync connection. L'àlies del directori és un nom descriptiu per la connexió de ssincronització. - + No valid local folder selected! No s'ha seleccionat cap directori local vàlid! - + You have no permission to write to the selected folder! No teniu permisos per escriure en la carpeta seleccionada! - + The local path %1 is already an upload folder. Please pick another one! La ruta local %1 ja és n directori de pujada. Si us play, seleccioneu un altre! - + An already configured folder is contained in the current entry. L'entrada actual conté una carpeta ja configurada. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. El fitxer seleccionat és un enllaç simbòlic. Aquest enllaç apunta a una carpeta ja configurada. - + An already configured folder contains the currently entered folder. Un directori ja configurat conté el directori qe heu introduït. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. El directori seleccionat és un enllaç simbòlic. Ja heu configurat una carpeta que apunta als pares de la carpeta que apunta aquest enllaç. - + The alias can not be empty. Please provide a descriptive alias word. L'àlies no pot ser buit. Faciliteu una paraula descriptiva. - + The alias <i>%1</i> is already in use. Please pick another alias. L'alies <i>%1%<i> ja està en ús. Si us plau, esculli un altre àlies. - + Select the source folder Seleccioneu la carpeta font @@ -539,51 +544,59 @@ Esteu segur que voleu executar aquesta operació? Mirall::FolderWizardRemotePath - + Add Remote Folder Afegeix carpeta remota - + Enter the name of the new folder: Escriviu el nom de la carpeta nova: - + Folder was successfully created on %1. La carpeta s'ha creat correctament a %1. - + Failed to create the folder on %1. Please check manually. No s'ha pogut crear el directori en %1. Si us plau, comproveu-lo manualment. - + Choose this to sync the entire account Escolliu-ho per sincronitzar el compte sencer - + This folder is already being synced. Ja s'està sincronitzant aquest directori. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. Ja esteu sincronitzant <i>%1</i>, que és una carpeta dins de <i>%2</i>. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. Ja esteu sincronitzant tots els vostres fitxers. Sincronitzar una altra carpeta <b>no</b> està permes. Si voleu sincronitzar múltiples carpetes, elimineu la configuració de sincronització de la carpeta arrel. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Avís:</b> @@ -1335,7 +1348,7 @@ No és aconsellada usar-la. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash El fitxer %1 no es pot reanomenar a %2 perquè hi ha un xoc amb el nom d'un fitxer local @@ -1351,17 +1364,17 @@ No és aconsellada usar-la. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. No s'ha de canviar el nom d'aquesta carpeta. Es reanomena de nou amb el seu nom original. - + This folder must not be renamed. Please name it back to Shared. Aquesta carpeta no es pot reanomenar. Reanomeneu-la de nou Shared. - + The file was renamed but is part of a read only share. The original file was restored. El fitxer s'ha reanomenat però és part d'una compartició només de lectura. El fixter original s'ha restaurat. @@ -1789,229 +1802,229 @@ Proveu de sincronitzar-los de nou. Mirall::SyncEngine - + Success. Èxit. - + CSync failed to create a lock file. CSync ha fallat en crear un fitxer de bloqueig. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync ha fallat en carregar o crear el fitxer de revista. Assegureu-vos que yeniu permisos de lectura i escriptura en la carpeta local de sincronització. - + CSync failed to write the journal file. CSync ha fallat en escriure el fitxer de revista - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>No s'ha pogut carregar el connector %1 per csync.<br/>Comproveu la instal·lació!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. L'hora del sistema d'aquest client és diferent de l'hora del sistema del servidor. Useu un servei de sincronització de temps (NTP) en el servidor i al client perquè l'hora sigui la mateixa. - + CSync could not detect the filesystem type. CSync no ha pogut detectar el tipus de fitxers del sistema. - + CSync got an error while processing internal trees. CSync ha patit un error mentre processava els àrbres interns. - + CSync failed to reserve memory. CSync ha fallat en reservar memòria. - + CSync fatal parameter error. Error fatal de paràmetre en CSync. - + CSync processing step update failed. El pas d'actualització del processat de CSync ha fallat. - + CSync processing step reconcile failed. El pas de reconciliació del processat de CSync ha fallat. - + CSync processing step propagate failed. El pas de propagació del processat de CSync ha fallat. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>La carpeta destí no existeix.</p><p>Comproveu la configuració de sincronització</p> - + A remote file can not be written. Please check the remote access. No es pot escriure el fitxer remot. Reviseu l'acces remot. - + The local filesystem can not be written. Please check permissions. No es pot escriure al sistema de fitxers local. Reviseu els permisos. - + CSync failed to connect through a proxy. CSync ha fallat en connectar a través d'un proxy. - + CSync could not authenticate at the proxy. CSync no s'ha pogut acreditar amb el proxy. - + CSync failed to lookup proxy or server. CSync ha fallat en cercar el proxy o el servidor. - + CSync failed to authenticate at the %1 server. L'autenticació de CSync ha fallat al servidor %1. - + CSync failed to connect to the network. CSync ha fallat en connectar-se a la xarxa. - + A network connection timeout happened. Temps excedit en la connexió. - + A HTTP transmission error happened. S'ha produït un error en la transmissió HTTP. - + CSync failed due to not handled permission deniend. CSync ha fallat en no implementar el permís denegat. - + CSync failed to access CSync ha fallat en accedir - + CSync tried to create a directory that already exists. CSync ha intentat crear una carpeta que ja existeix. - - + + CSync: No space on %1 server available. CSync: No hi ha espai disponible al servidor %1. - + CSync unspecified error. Error inespecífic de CSync. - + Aborted by the user Aturat per l'usuari - + An internal error number %1 happened. S'ha produït l'error intern número %1. - + The item is not synced because of previous errors: %1 L'element no s'ha sincronitzat degut a errors previs: %1 - + Symbolic links are not supported in syncing. La sincronització d'enllaços simbòlics no està implementada. - + File is listed on the ignore list. El fitxer està a la llista d'ignorats. - + File contains invalid characters that can not be synced cross platform. El fitxer conté caràcters no vàlids que no es poden sincronitzar entre plataformes. - + Unable to initialize a sync journal. No es pot inicialitzar un periòdic de sincronització - + Cannot open the sync journal No es pot obrir el diari de sincronització - + Not allowed because you don't have permission to add sub-directories in that directory No es permet perquè no teniu permisos per afegir subcarpetes en aquesta carpeta - + Not allowed because you don't have permission to add parent directory No es permet perquè no teniu permisos per afegir una carpeta inferior - + Not allowed because you don't have permission to add files in that directory No es permet perquè no teniu permisos per afegir fitxers en aquesta carpeta - + Not allowed to upload this file because it is read-only on the server, restoring No es permet pujar aquest fitxer perquè només és de lectura en el servidor, es restaura - - + + Not allowed to remove, restoring No es permet l'eliminació, es restaura - + Move not allowed, item restored No es permet moure'l, l'element es restaura - + Move not allowed because %1 is read-only No es permet moure perquè %1 només és de lectura - + the destination el destí - + the source l'origen @@ -2027,8 +2040,8 @@ Proveu de sincronitzar-los de nou. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2165,6 +2178,14 @@ Proveu de sincronitzar-los de nou. Actualitzat + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2405,7 +2426,7 @@ Proveu de sincronitzar-los de nou. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Si encara no teniu un servidor ownCloud, mireu <a href="https://owncloud.com">owncloud.com</a> per més informació. @@ -2414,15 +2435,10 @@ Proveu de sincronitzar-los de nou. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> <p><small>Construit de la revisió Git <a href="%1">%2</a> a %3, %4 usant Qt %5.</small><p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts index 89d880a3a9..a0eaa31ed3 100644 --- a/translations/mirall_cs.ts +++ b/translations/mirall_cs.ts @@ -63,17 +63,22 @@ Formulář - + + Selective Sync... + + + + Account Maintenance Správa účtu - + Edit Ignored Files Editovat ignorované soubory - + Modify Account Upravit účet @@ -89,7 +94,7 @@ - + Pause Pozastavit @@ -104,111 +109,111 @@ Přidat složku... - + Storage Usage Obsazený prostor - + Retrieving usage information... Zjišťuji obsazený prostor... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Poznámka:</b> Některé složky, včetně síťových či sdílených složek, mohou mít jiné limity. - + Resume Obnovit - + Confirm Folder Remove Potvrdit odstranění složky - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Opravdu chcete zastavit synchronizaci složky <i>%1</i>?</p><p><b>Poznámka:</b> Tato akce nesmaže soubory z místní složky.</p> - + Confirm Folder Reset Potvrdit restartování složky - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Skutečně chcete resetovat složku <i>%1</i> a znovu sestavit klientskou databázi?</p><p><b>Poznámka:</b> Tato funkce je určena pouze pro účely údržby. Žádné soubory nebudou smazány, ale může to způsobit velké datové přenosy a dokončení může trvat mnoho minut či hodin v závislosti na množství dat ve složce. Použijte tuto volbu pouze na pokyn správce.</p> - + Discovering %1 - + Hledám %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) z %2 místa na disku použito. - + No connection to %1 at <a href="%2">%3</a>. Žádné spojení s %1 na <a href="%2">%3</a>. - + No %1 connection configured. Žádné spojení s %1 nenastaveno. - + Sync Running Synchronizace probíhá - + No account configured. Žádný účet nenastaven. - + The syncing operation is running.<br/>Do you want to terminate it? Operace synchronizace právě probíhá.<br/>Přejete si ji ukončit? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 z %4) zbývající čas %5 při rychlosti %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 z %2, soubor %3 ze %4 Celkový zbývající čas %5 - + Connected to <a href="%1">%2</a>. Připojeno k <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Připojeno k <a href="%1">%2</a> jako <i>%3</i>. - + Currently there is no storage usage information available. Momentálně nejsou k dispozici žádné informace o využití úložiště @@ -353,7 +358,7 @@ Celkový zbývající čas %5 Průběh synchronizace - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -362,17 +367,17 @@ Toto může být způsobeno změnou v nastavení synchronizace složky nebo tím Opravdu chcete provést tuto akci? - + Remove All Files? Odstranit všechny soubory? - + Remove all files Odstranit všechny soubory - + Keep files Ponechat soubory @@ -390,52 +395,52 @@ Opravdu chcete provést tuto akci? Byl nalezen starý záznam synchronizace '%1', ale nebylo možné jej odebrat. Ujistěte se, že není aktuálně používán jinou aplikací. - + Undefined State. Nedefinovaný stav. - + Waits to start syncing. Vyčkává na spuštění synchronizace. - + Preparing for sync. Příprava na synchronizaci. - + Sync is running. Synchronizace probíhá. - + Last Sync was successful. Poslední synchronizace byla úspěšná. - + Last Sync was successful, but with warnings on individual files. Poslední synchronizace byla úspěšná, ale s varováním u některých souborů - + Setup Error. Chyba nastavení. - + User Abort. Zrušení uživatelem. - + Sync is paused. Synchronizace pozastavena. - + %1 (Sync is paused) %1 (Synchronizace je pozastavena) @@ -462,8 +467,8 @@ Opravdu chcete provést tuto akci? Mirall::FolderWizard - - + + Add Folder Přidat složku @@ -471,67 +476,67 @@ Opravdu chcete provést tuto akci? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Kliknutím zvolíte místní složku k synchronizaci. - + Enter the path to the local folder. Zadejte cestu k místní složce. - + The directory alias is a descriptive name for this sync connection. Alias složky je popisné jméno pro tuto synchronizaci. - + No valid local folder selected! Nebyla vybrána místní složka! - + You have no permission to write to the selected folder! Nemáte oprávněné pro zápis do zvolené složky! - + The local path %1 is already an upload folder. Please pick another one! Místní cesta %1 je již nastavena jako složka pro odesílání. Zvolte, prosím, jinou! - + An already configured folder is contained in the current entry. V aktuální položce se již nachází složka s nastavenou synchronizací. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. Vybraná složka je symbolický odkaz. Cílová složka tohoto odkazu již obsahuje nastavenou složku. - + An already configured folder contains the currently entered folder. Právě zadaná složka je již obsažena ve složce s nastavenou synchronizací. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. Zvolená složka je symbolický odkaz. Cílová složka tohoto odkazu již obsahuje složku s nastavenou synchronizací. - + The alias can not be empty. Please provide a descriptive alias word. Alias nemůže být prázdný. Zadejte prosím slovo, kterým složku popíšete. - + The alias <i>%1</i> is already in use. Please pick another alias. Alias <i>%1</i> je již používán. Zvolte prosím jiný. - + Select the source folder Zvolte zdrojovou složku @@ -539,51 +544,59 @@ Opravdu chcete provést tuto akci? Mirall::FolderWizardRemotePath - + Add Remote Folder Přidat vzdálený adresář - + Enter the name of the new folder: Zadejte název nové složky: - + Folder was successfully created on %1. Složka byla úspěšně vytvořena na %1. - + Failed to create the folder on %1. Please check manually. Na %1 selhalo vytvoření složky. Zkontrolujte to, prosím, ručně. - + Choose this to sync the entire account Zvolte toto k provedení synchronizace celého účtu - + This folder is already being synced. Tato složka je již synchronizována. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. Již synchronizujete složku <i>%1</i>, která je složce <i>%2</i> nadřazená. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. Již synchronizujete všechny vaše soubory. Synchronizování další složky <b>není</b> podporováno. Pokud chcete synchronizovat více složek, odstraňte, prosím, synchronizaci aktuální kořenové složky. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Varování:</b> @@ -1218,7 +1231,7 @@ Nedoporučuje se jí používat. Skip folders configuration - + Přeskočit konfiguraci adresářů @@ -1335,7 +1348,7 @@ Nedoporučuje se jí používat. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash Soubor %1 nemohl být přejmenován na %2 z důvodu kolize názvu se souborem v místním systému. @@ -1351,17 +1364,17 @@ Nedoporučuje se jí používat. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Tato složka nemůže být přejmenována. Byl jí vrácen původní název. - + This folder must not be renamed. Please name it back to Shared. Tato složka nemůže být přejmenována. Přejmenujte jí prosím zpět na Shared. - + The file was renamed but is part of a read only share. The original file was restored. Soubor byl přejmenován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven. @@ -1790,229 +1803,229 @@ Zkuste provést novou synchronizaci. Mirall::SyncEngine - + Success. Úspěch. - + CSync failed to create a lock file. CSync nemůže vytvořit soubor zámku. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync se nepodařilo načíst či vytvořit soubor žurnálu. Ujistěte se, že máte oprávnění pro čtení a zápis v místní synchronizované složce. - + CSync failed to write the journal file. CSync se nepodařilo zapsat do souboru žurnálu. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Plugin %1 pro csync nelze načíst.<br/>Zkontrolujte prosím instalaci!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Systémový čas na klientovi je rozdílný od systémového času serveru. Použijte, prosím, službu synchronizace času (NTP) na serveru i klientovi, aby byl čas na obou strojích stejný. - + CSync could not detect the filesystem type. CSync nemohl detekovat typ souborového systému. - + CSync got an error while processing internal trees. CSync obdrželo chybu při zpracování vnitřních struktur. - + CSync failed to reserve memory. CSync se nezdařilo rezervovat paměť. - + CSync fatal parameter error. CSync: kritická chyba parametrů. - + CSync processing step update failed. CSync se nezdařilo zpracovat krok aktualizace. - + CSync processing step reconcile failed. CSync se nezdařilo zpracovat krok sladění. - + CSync processing step propagate failed. CSync se nezdařilo zpracovat krok propagace. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Cílový adresář neexistuje.</p><p>Zkontrolujte, prosím, nastavení synchronizace.</p> - + A remote file can not be written. Please check the remote access. Vzdálený soubor nelze zapsat. Ověřte prosím vzdálený přístup. - + The local filesystem can not be written. Please check permissions. Do místního souborového systému nelze zapisovat. Ověřte, prosím, přístupová práva. - + CSync failed to connect through a proxy. CSync se nezdařilo připojit skrze proxy. - + CSync could not authenticate at the proxy. CSync se nemohlo přihlásit k proxy. - + CSync failed to lookup proxy or server. CSync se nezdařilo najít proxy server nebo cílový server. - + CSync failed to authenticate at the %1 server. CSync se nezdařilo přihlásit k serveru %1. - + CSync failed to connect to the network. CSync se nezdařilo připojit k síti. - + A network connection timeout happened. Došlo k vypršení časového limitu síťového spojení. - + A HTTP transmission error happened. Nastala chyba HTTP přenosu. - + CSync failed due to not handled permission deniend. CSync selhalo z důvodu nezpracovaného odmítnutí práv. - + CSync failed to access CSync se nezdařil přístup - + CSync tried to create a directory that already exists. CSync se pokusilo vytvořit adresář, který již existuje. - - + + CSync: No space on %1 server available. CSync: Nedostatek volného místa na serveru %1. - + CSync unspecified error. Nespecifikovaná chyba CSync. - + Aborted by the user Zrušeno uživatelem - + An internal error number %1 happened. Nastala vnitřní chyba číslo %1. - + The item is not synced because of previous errors: %1 Položka nebyla synchronizována kvůli předchozí chybě: %1 - + Symbolic links are not supported in syncing. Symbolické odkazy nejsou při synchronizaci podporovány. - + File is listed on the ignore list. Soubor se nachází na seznamu ignorovaných. - + File contains invalid characters that can not be synced cross platform. Soubor obsahuje alespoň jeden neplatný znak, který narušuje synchronizaci v prostředí více platforem. - + Unable to initialize a sync journal. Nemohu inicializovat synchronizační žurnál. - + Cannot open the sync journal Nelze otevřít synchronizační žurnál - + Not allowed because you don't have permission to add sub-directories in that directory Není povoleno, protože nemáte oprávnění vytvářet podadresáře v tomto adresáři. - + Not allowed because you don't have permission to add parent directory Není povoleno, protože nemáte oprávnění vytvořit rodičovský adresář. - + Not allowed because you don't have permission to add files in that directory Není povoleno, protože nemáte oprávnění přidávat soubory do tohoto adresáře - + Not allowed to upload this file because it is read-only on the server, restoring Není povoleno nahrát tento soubor, protože je na serveru uložen pouze pro čtení, obnovuji - - + + Not allowed to remove, restoring Odstranění není povoleno, obnovuji - + Move not allowed, item restored Přesun není povolen, položka obnovena - + Move not allowed because %1 is read-only Přesun není povolen, protože %1 je pouze pro čtení - + the destination cílové umístění - + the source zdroj @@ -2028,8 +2041,8 @@ Zkuste provést novou synchronizaci. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2143,7 +2156,7 @@ Zkuste provést novou synchronizaci. Discovering %1 - + Hledám %1 @@ -2166,6 +2179,14 @@ Zkuste provést novou synchronizaci. Aktuální + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2406,7 +2427,7 @@ Zkuste provést novou synchronizaci. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Pokud zatím nemáte ownCloud server, získáte více informací na <a href="https://owncloud.com">owncloud.com</a> @@ -2415,15 +2436,10 @@ Zkuste provést novou synchronizaci. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> <p><small>Sestaveno z Git revize <a href="%1">%2</a> na %3, %4 pomocí Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts index d14b1e2845..cdd8fd4ddc 100644 --- a/translations/mirall_de.ts +++ b/translations/mirall_de.ts @@ -63,17 +63,22 @@ Formular - + + Selective Sync... + + + + Account Maintenance Kontoverwaltung - + Edit Ignored Files Ignorierte Dateien bearbeiten - + Modify Account Konto bearbeiten @@ -89,7 +94,7 @@ - + Pause Anhalten @@ -104,112 +109,112 @@ Ordner hinzufügen... - + Storage Usage Speicherbelegung - + Retrieving usage information... Nutzungsinformationen werden abgerufen ... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Hinweis:</b> Einige Ordner, einschließlich über das Netzwerk verbundene oder freigegebene Ordner, können unterschiedliche Beschränkungen haben. - + Resume Fortsetzen - + Confirm Folder Remove Löschen des Ordners bestätigen - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Wollen Sie wirklich die Synchronisation des Ordners <i>%1</i> beenden?</p><p><b>Anmerkung:</b> Dies wird keine Dateien von ihrem Rechner löschen.</p> - + Confirm Folder Reset Zurücksetzen des Ordners bestätigen - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Wollen Sie wirklich den Ordner <i>%1</i> zurücksetzen und die Datenbank auf dem Client neu aufbauen?</p><p><b>Anmerkung:</b> Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entfernt, jedoch kann diese Aktion erheblichen Datenverkehr verursachen und je nach Umfang des Ordners mehrere Minuten oder Stunden in Anspruch nehmen. Verwenden Sie diese Funktion nur dann, wenn ihr Administrator dies ausdrücklich wünscht.</p> - + Discovering %1 Entdecke %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) von %2 Serverkapazität in Benutzung. - + No connection to %1 at <a href="%2">%3</a>. Keine Verbindung mit %1 zu <a href="%2">%3</a>. - + No %1 connection configured. Keine %1-Verbindung konfiguriert. - + Sync Running Synchronisation läuft - + No account configured. Kein Konto konfiguriert. - + The syncing operation is running.<br/>Do you want to terminate it? Die Synchronistation läuft gerade.<br/>Wollen Sie diese beenden? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 von %4) %5 übrig bei einer Rate von %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 von %2, Datei %3 von %4 Gesamtzeit übrig %5 - + Connected to <a href="%1">%2</a>. Verbunden mit <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Verbunden mit <a href="%1">%2</a> als <i>%3</i>. - + Currently there is no storage usage information available. Derzeit sind keine Speichernutzungsinformationen verfügbar. @@ -354,7 +359,7 @@ Gesamtzeit übrig %5 Synchronisierungsaktivität - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -363,17 +368,17 @@ Vielleicht wurde der Ordner neu konfiguriert, oder alle Dateien wurden händisch Sind Sie sicher, dass sie diese Operation durchführen wollen? - + Remove All Files? Alle Dateien löschen? - + Remove all files Lösche alle Dateien - + Keep files Dateien behalten @@ -391,52 +396,52 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen? Ein altes Synchronisations-Journal '%1' wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet. - + Undefined State. Undefinierter Zustand. - + Waits to start syncing. Wartet auf Beginn der Synchronistation - + Preparing for sync. Synchronisation wird vorbereitet. - + Sync is running. Synchronisation läuft. - + Last Sync was successful. Die letzte Synchronisation war erfolgreich. - + Last Sync was successful, but with warnings on individual files. Letzte Synchronisation war erfolgreich, aber mit Warnungen für einzelne Dateien. - + Setup Error. Setup-Fehler. - + User Abort. Benutzer-Abbruch - + Sync is paused. Synchronisation wurde angehalten. - + %1 (Sync is paused) %1 (Synchronisation ist pausiert) @@ -463,8 +468,8 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen? Mirall::FolderWizard - - + + Add Folder Ordner hinzufügen @@ -472,67 +477,67 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Zur Auswahl eines lokalen Verzeichnisses für die Synchronisation klicken. - + Enter the path to the local folder. Pfad zum lokalen Verzeichnis eingeben - + The directory alias is a descriptive name for this sync connection. Der Verzeichnis-Alias ist der beschreibende Name der Synchronisationsverbindung. - + No valid local folder selected! Keinen gültigen lokales Ordner gewählt! - + You have no permission to write to the selected folder! Sie haben keine Schreibberechtigung für den ausgewählten Ordner! - + The local path %1 is already an upload folder. Please pick another one! Das lokale Verzeichnis %1 ist bereits ein Verzeichnis zum Hochladen. Bitte wählen Sie ein anderes Verzeichnis! - + An already configured folder is contained in the current entry. Ein bereits konfigurierter Ordner ist im aktuellen Verzeichnis vorhanden. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. Das gewählte Verzeichnis ist ein symbolischer Link. Ein bereits konfigurierter Ordner befindet sich in dem Ordner auf den dieser Link zeigt. - + An already configured folder contains the currently entered folder. Ein bereits konfigurierter Ordner beinhaltet den aktuell eingegebenen Ordner. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. Der ausgewählte Ordner ist ein symbolischer Link. Ein bereits konfigurierter Ordner ist die Wurzel des aktuell ausgewählten Ordners, auf den der Link zeigt. - + The alias can not be empty. Please provide a descriptive alias word. Der Alias darf nicht leer sein. Bitte ein anschauliches Alias-Wort eingeben. - + The alias <i>%1</i> is already in use. Please pick another alias. Der Alias <i>%1</i> wird bereits benutzt. Bitte wählen Sie einen anderen Alias. - + Select the source folder Den Quellordner wählen @@ -540,51 +545,59 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen? Mirall::FolderWizardRemotePath - + Add Remote Folder Entfernten Ordner hinzufügen - + Enter the name of the new folder: Geben Sie den Namen des neuen Ordners ein: - + Folder was successfully created on %1. Order erfolgreich auf %1 erstellt. - + Failed to create the folder on %1. Please check manually. Die Erstellung des Ordners auf %1 ist fehlgeschlagen. Bitte prüfen Sie dies manuell. - + Choose this to sync the entire account Wählen Sie dies, um das gesamte Konto zu synchronisieren - + This folder is already being synced. Dieser Ordner wird bereits synchronisiert. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. Sie synchronisieren bereits <i>%1</i>, das ein übergeordneten Ordner von <i>%2</i> ist. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. Sie synchronisieren bereits alle Ihre Dateien. Die Synchronisation anderer Verzeichnisse wird <b>nicht</b> unterstützt. Wenn Sie mehrere Ordner synchronisieren möchten, entfernen Sie bitte das aktuell konfigurierte Wurzelverzeichnis zur Synchronisation. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Warnung:</b> @@ -1336,7 +1349,7 @@ Es ist nicht ratsam, diese zu benutzen. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht zu %2 umbenannt werden @@ -1352,17 +1365,17 @@ Es ist nicht ratsam, diese zu benutzen. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Dieser Ordner muss nicht umbenannt werden. Er wurde zurück zum Originalnamen umbenannt. - + This folder must not be renamed. Please name it back to Shared. Dieser Ordner muss nicht umbenannt werden. Bitte benennen Sie es zurück wie in der Freigabe. - + The file was renamed but is part of a read only share. The original file was restored. Die Datei wurde auf einer Nur-Lese-Freigabe umbenannt. Die Original-Datei wurde wiederhergestellt. @@ -1790,229 +1803,229 @@ Versuchen Sie diese nochmals zu synchronisieren. Mirall::SyncEngine - + Success. Erfolgreich - + CSync failed to create a lock file. CSync konnte keine lock-Datei erstellen. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync konnte den Synchronisationsbericht nicht laden oder erstellen. Stellen Sie bitte sicher, dass Sie Lese- und Schreibrechte auf das lokale Synchronisationsverzeichnis haben. - + CSync failed to write the journal file. CSync konnte den Synchronisationsbericht nicht schreiben. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Das %1-Plugin für csync konnte nicht geladen werden.<br/>Bitte überprüfen Sie die Installation!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Die Uhrzeit auf diesem Computer und dem Server sind verschieden. Bitte verwenden Sie ein Zeitsynchronisationsprotokolls (NTP) auf Ihrem Server und Klienten, damit die gleiche Uhrzeit verwendet wird. - + CSync could not detect the filesystem type. CSync konnte den Typ des Dateisystem nicht feststellen. - + CSync got an error while processing internal trees. CSync hatte einen Fehler bei der Verarbeitung von internen Strukturen. - + CSync failed to reserve memory. CSync konnte keinen Speicher reservieren. - + CSync fatal parameter error. CSync hat einen schwerwiegender Parameterfehler festgestellt. - + CSync processing step update failed. CSync Verarbeitungsschritt "Aktualisierung" fehlgeschlagen. - + CSync processing step reconcile failed. CSync Verarbeitungsschritt "Abgleich" fehlgeschlagen. - + CSync processing step propagate failed. CSync Verarbeitungsschritt "Übertragung" fehlgeschlagen. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Das Zielverzeichnis existiert nicht.</p><p>Bitte prüfen Sie die Synchronisationseinstellungen.</p> - + A remote file can not be written. Please check the remote access. Eine Remote-Datei konnte nicht geschrieben werden. Bitte den Remote-Zugriff überprüfen. - + The local filesystem can not be written. Please check permissions. Kann auf dem lokalen Dateisystem nicht schreiben. Bitte Berechtigungen überprüfen. - + CSync failed to connect through a proxy. CSync konnte sich nicht über einen Proxy verbinden. - + CSync could not authenticate at the proxy. CSync konnte sich nicht am Proxy authentifizieren. - + CSync failed to lookup proxy or server. CSync konnte den Proxy oder Server nicht auflösen. - + CSync failed to authenticate at the %1 server. CSync konnte sich nicht am Server %1 authentifizieren. - + CSync failed to connect to the network. CSync konnte sich nicht mit dem Netzwerk verbinden. - + A network connection timeout happened. Eine Zeitüberschreitung der Netzwerkverbindung ist aufgetreten. - + A HTTP transmission error happened. Es hat sich ein HTTP-Übertragungsfehler ereignet. - + CSync failed due to not handled permission deniend. CSync wegen fehlender Berechtigung fehlgeschlagen. - + CSync failed to access CSync-Zugriff fehlgeschlagen - + CSync tried to create a directory that already exists. CSync versuchte, ein Verzeichnis zu erstellen, welches bereits existiert. - - + + CSync: No space on %1 server available. CSync: Kein Platz auf Server %1 frei. - + CSync unspecified error. CSync unbekannter Fehler. - + Aborted by the user Abbruch durch den Benutzer - + An internal error number %1 happened. Interne Fehlernummer %1 aufgetreten. - + The item is not synced because of previous errors: %1 Das Element ist aufgrund vorheriger Fehler nicht synchronisiert: %1 - + Symbolic links are not supported in syncing. Symbolische Verknüpfungen werden bei der Synchronisation nicht unterstützt. - + File is listed on the ignore list. Die Datei ist in der Ignorierliste geführt. - + File contains invalid characters that can not be synced cross platform. Die Datei beinhaltet ungültige Zeichen und kann nicht plattformübergreifend synchronisiert werden. - + Unable to initialize a sync journal. Synchronisationsbericht konnte nicht initialisiert werden. - + Cannot open the sync journal Synchronisationsbericht kann nicht geöffnet werden - + Not allowed because you don't have permission to add sub-directories in that directory Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben - + Not allowed because you don't have permission to add parent directory Nicht erlaubt, da Sie keine Rechte zur Erstellung von Hauptordnern haben - + Not allowed because you don't have permission to add files in that directory Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben - + Not allowed to upload this file because it is read-only on the server, restoring Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist, Wiederherstellung - - + + Not allowed to remove, restoring Löschen nicht erlaubt, Wiederherstellung - + Move not allowed, item restored Verschieben nicht erlaubt, Element wiederhergestellt - + Move not allowed because %1 is read-only Verschieben nicht erlaubt, da %1 schreibgeschützt ist - + the destination Das Ziel - + the source Die Quelle @@ -2028,9 +2041,9 @@ Versuchen Sie diese nochmals zu synchronisieren. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - <p>Version %1 Für weitere Informationen besuche bitte <a href='%2'>%3</a>.</p><p>Urheberrecht von ownCloud, Inc.<p><p>Zur Verfügung gestellt durch %4 und lizensiert unter der GNU General Public License (GPL) Version 2.0.<br>%5 und das %5 Logo sind eingetragene Warenzeichen von %4 in den Vereinigten Staaten, anderen Ländern oder beides.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2166,6 +2179,14 @@ Versuchen Sie diese nochmals zu synchronisieren. Aktuell + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2406,7 +2427,7 @@ Versuchen Sie diese nochmals zu synchronisieren. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Wenn Sie noch keinen ownCloud-Server haben, informieren Sie sich unter <a href="https://owncloud.com">owncloud.com</a>. @@ -2415,15 +2436,10 @@ Versuchen Sie diese nochmals zu synchronisieren. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> <p><small>Erstellt aus Git-Revision <a href="%1">%2</a> vom %3, %4 mit Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts index e8db5b3f81..2abfff7905 100644 --- a/translations/mirall_el.ts +++ b/translations/mirall_el.ts @@ -63,17 +63,22 @@ Φόρμα - + + Selective Sync... + + + + Account Maintenance Συντήρηση Λογαριασμού - + Edit Ignored Files Επεξεργασία Αρχείων προς Αγνόηση - + Modify Account Τροποποίηση Λογαριασμού @@ -89,7 +94,7 @@ - + Pause Παύση @@ -104,94 +109,94 @@ Προσθήκη φακέλου... - + Storage Usage Χρήση Αποθηκευτικού Χώρου - + Retrieving usage information... Λήψη πληροφοριών χρήσης... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Σημείωση:</b> Κάποιοι φάκελοι, συμπεριλαμβανομένων των δικτυακών δίσκων ή των κοινόχρηστων φακέλων, μπορεί να έχουν διαφορετικά όρια. - + Resume Συνέχεια - + Confirm Folder Remove Επιβεβαίωση Αφαίρεσης Φακέλου - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Θέλετε στ' αλήθεια να σταματήσετε το συγχρονισμό του φακέλου <i>%1</i>;</p><p><b>Σημείωση:</b> Αυτό δεν θα αφαιρέσει τα αρχεία από το δέκτη.</p> - + Confirm Folder Reset Επιβεβαίωση Επαναφοράς Φακέλου - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Θέλετε στ' αλήθεια να επαναφέρετε το φάκελο <i>%1</i> και να επαναδημιουργήσετε τη βάση δεδομένων του δέκτη;</p><p><b>Σημείωση:</b> Αυτή η λειτουργία έχει σχεδιαστεί αποκλειστικά για λόγους συντήρησης. Κανένα αρχείο δεν θα αφαιρεθεί, αλλά αυτό μπορεί να προκαλέσει σημαντική κίνηση δεδομένων και να πάρει αρκετά λεπτά ή ώρες μέχρι να ολοκληρωθεί, ανάλογα με το μέγεθος του φακέλου. Χρησιμοποιείστε αυτή την επιλογή μόνο εάν έχετε συμβουλευτεί αναλόγως από το διαχειριστή σας.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) από %2 αποθηκευτικός χώρος διακομιστή σε χρήση. - + No connection to %1 at <a href="%2">%3</a>. Δεν υπάρχει σύνδεση με %1 στο <a href="%2">%3</a>. - + No %1 connection configured. Δεν έχει ρυθμιστεί σύνδεση με το %1. - + Sync Running Εκτελείται Συγχρονισμός - + No account configured. Δεν ρυθμίστηκε λογαριασμός. - + The syncing operation is running.<br/>Do you want to terminate it? Η λειτουργία συγχρονισμού εκτελείται.<br/> Θέλετε να την τερματίσετε; - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 από %4) %5 απομένουν με ταχύτητα %6/δευτ - + %1 of %2, file %3 of %4 Total time left %5 %1 από %2, αρχείο %3 από%4 @@ -199,17 +204,17 @@ Total time left %5 Συνολικός χρόνος που απομένει %5 - + Connected to <a href="%1">%2</a>. Συνδεδεμένοι με <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Συνδεδεμένοι με <a href="%1">%2</a> ως <i>%3</i>. - + Currently there is no storage usage information available. Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες. @@ -354,7 +359,7 @@ Total time left %5 Δραστηριότητα Συγχρονισμού - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -363,17 +368,17 @@ Are you sure you want to perform this operation? Είστε σίγουροι ότι θέλετε να εκτελέσετε αυτή τη λειτουργία; - + Remove All Files? Αφαίρεση Όλων των Αρχείων; - + Remove all files Αφαίρεση όλων των αρχείων - + Keep files Διατήρηση αρχείων @@ -391,52 +396,52 @@ Are you sure you want to perform this operation? Βρέθηκε ένα παλαιότερο αρχείο συγχρονισμού '%1', αλλά δεν μπόρεσε να αφαιρεθεί. Παρακαλώ βεβαιωθείτε ότι καμμία εφαρμογή δεν το χρησιμοποιεί αυτή τη στιγμή. - + Undefined State. Απροσδιόριστη Κατάσταση. - + Waits to start syncing. Αναμονή έναρξης συγχρονισμού. - + Preparing for sync. Προετοιμασία για συγχρονισμό. - + Sync is running. Ο συγχρονισμός εκτελείται. - + Last Sync was successful. Ο τελευταίος συγχρονισμός ήταν επιτυχής. - + Last Sync was successful, but with warnings on individual files. Ο τελευταίος συγχρονισμός ήταν επιτυχής, αλλά υπήρχαν προειδοποιήσεις σε συγκεκριμένα αρχεία. - + Setup Error. Σφάλμα Ρύθμισης. - + User Abort. Ματαίωση από Χρήστη. - + Sync is paused. Παύση συγχρονισμού. - + %1 (Sync is paused) %1 (Παύση συγχρονισμού) @@ -463,8 +468,8 @@ Are you sure you want to perform this operation? Mirall::FolderWizard - - + + Add Folder Προσθήκη Φακέλου @@ -472,67 +477,67 @@ Are you sure you want to perform this operation? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Κλικάρετε για να επιλέξετε έναν τοπικό φάκελο προς συγχρονισμό. - + Enter the path to the local folder. Εισάγετε τη διαδρομή προς τον τοπικό φάκελο. - + The directory alias is a descriptive name for this sync connection. Το όνομα καταλόγου είναι ένα περιγραφικό όνομα για αυτή τη σύνδεση συγχρονισμού. - + No valid local folder selected! Δεν επιλέχθηκε έγκυρος τοπικός φάκελος! - + You have no permission to write to the selected folder! Δεν έχετε δικαιώματα εγγραφής στον επιλεγμένο φάκελο! - + The local path %1 is already an upload folder. Please pick another one! Η τοπική διαδρομή %1 είναι ήδη ένας φάκελος μεταφόρτωσης. Παρακαλώ επιλέξτε κάποιον άλλο! - + An already configured folder is contained in the current entry. Ένας ήδη ρυθμισμένος φάκελος περιέχεται στην τρέχουσα καταχώρηση. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. Ο επιλεγμένος φάκελος είναι ένας συμβολικός σύνδεσμος. Ένας ήδη ρυθμισμένος φάκελος περιέχεται στο φάκελο στον οποίο καταλήγει αυτός ο σύνδεσμος. - + An already configured folder contains the currently entered folder. Ένας ήδη ρυθμισμένος φάκελος περιέχει τον φάκελο που μόλις επιλέξατε. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. Ο επιλεγμένος φάκελος είναι ένας συμβολικός σύνδεσμος. Ο φάκελος στον οποίο οδηγεί ο σύνδεσμος περιέχεται σε έναν φάκελο που είναι ήδη ρυθμισμένος. - + The alias can not be empty. Please provide a descriptive alias word. Το ψευδώνυμο δεν μπορεί να είναι κενό. Παρακαλώ δώστε μια περιγραφική λέξη ψευδωνύμου. - + The alias <i>%1</i> is already in use. Please pick another alias. Το ψευδώνυμο <i>%1</i> είναι ήδη σε χρήση. Παρακαλώ επιλέξτε άλλο ψευδώνυμο. - + Select the source folder Επιλογή του φακέλου προέλευσης @@ -540,51 +545,59 @@ Are you sure you want to perform this operation? Mirall::FolderWizardRemotePath - + Add Remote Folder Προσθήκη Απομακρυσμένου Φακέλου - + Enter the name of the new folder: Εισάγετε το όνομα του νέου φακέλου: - + Folder was successfully created on %1. Επιτυχής δημιουργία φακέλου στο %1. - + Failed to create the folder on %1. Please check manually. Αποτυχία δημιουργίας φακέλου στο %1. Παρακαλώ ελέγξτε χειροκίνητα. - + Choose this to sync the entire account Επιλέξτε να συγχρονίσετε ολόκληρο το λογαριασμό - + This folder is already being synced. Αυτός ο φάκελος συγχρονίζεται ήδη. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. Ο φάκελος <i>%1</i>, ο οποίος είναι γονεϊκός φάκελος του <i>%2</i>, συγχρονίζεται ήδη. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. Συγχρονίζετε ήδη όλα σας τα αρχεία. Ο συγχρονισμός ενός ακόμα φακέλου <b>δεν</b> υποστηρίζεται. Εάν θέλετε να συγχρονίσετε πολλαπλούς φακέλους, παρακαλώ αφαιρέστε την τρέχουσα ρύθμιση συχρονισμού του βασικού φακέλου. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Προειδοποίηση:</b> @@ -1336,7 +1349,7 @@ It is not advisable to use it. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash Το αρχείο %1 δεν είναι δυνατό να μετονομαστεί σε %2 λόγω μιας διένεξης με το όνομα ενός τοπικού αρχείου @@ -1352,17 +1365,17 @@ It is not advisable to use it. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Μετονομάζεται πίσω στο αρχικό του όνομα. - + This folder must not be renamed. Please name it back to Shared. Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Παρακαλώ ονομάστε τον ξανά Κοινόχρηστος. - + The file was renamed but is part of a read only share. The original file was restored. Το αρχείο μετονομάστηκε αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Το αρχικό αρχείο επαναφέρθηκε. @@ -1790,229 +1803,229 @@ It is not advisable to use it. Mirall::SyncEngine - + Success. Επιτυχία. - + CSync failed to create a lock file. Το CSync απέτυχε να δημιουργήσει ένα αρχείο κλειδώματος. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. Το CSync απέτυχε να φορτώσει ή να δημιουργήσει το αρχείο καταλόγου. Βεβαιωθείτε ότι έχετε άδειες ανάγνωσης και εγγραφής στον τοπικό κατάλογο συγχρονισμού. - + CSync failed to write the journal file. Το CSync απέτυχε να εγγράψει στο αρχείο καταλόγου. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Το πρόσθετο του %1 για το csync δεν μπόρεσε να φορτωθεί.<br/>Παρακαλούμε επαληθεύσετε την εγκατάσταση!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Η ώρα του συστήματος στον τοπικό υπολογιστή διαφέρει από την ώρα του συστήματος στο διακομιστή. Παρακαλούμε χρησιμοποιήστε μια υπηρεσία χρονικού συγχρονισμού (NTP) στο διακομιστή και στον τοπικό υπολογιστή ώστε η ώρα να παραμένει η ίδια. - + CSync could not detect the filesystem type. To CSync δεν μπορούσε να ανιχνεύσει τον τύπο του συστήματος αρχείων. - + CSync got an error while processing internal trees. Το CSync έλαβε κάποιο μήνυμα λάθους κατά την επεξεργασία της εσωτερικής διεργασίας. - + CSync failed to reserve memory. Το CSync απέτυχε να δεσμεύσει μνήμη. - + CSync fatal parameter error. Μοιραίο σφάλμα παράμετρου CSync. - + CSync processing step update failed. Η ενημέρωση του βήματος επεξεργασίας του CSync απέτυχε. - + CSync processing step reconcile failed. CSync στάδιο επεξεργασίας συμφιλίωση απέτυχε. - + CSync processing step propagate failed. Η μετάδοση του βήματος επεξεργασίας του CSync απέτυχε. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Ο κατάλογος προορισμού δεν υπάρχει.</p><p>Παρακαλώ ελέγξτε τις ρυθμίσεις συγχρονισμού.</p> - + A remote file can not be written. Please check the remote access. Ένα απομακρυσμένο αρχείο δεν μπορεί να εγγραφεί. Παρακαλούμε ελέγξτε την απομακρυσμένη πρόσβαση. - + The local filesystem can not be written. Please check permissions. Το τοπικό σύστημα αρχείων δεν είναι εγγράψιμο. Παρακαλούμε ελέγξτε τα δικαιώματα. - + CSync failed to connect through a proxy. Το CSync απέτυχε να συνδεθεί μέσω ενός διαμεσολαβητή. - + CSync could not authenticate at the proxy. Το CSync δεν μπόρεσε να πιστοποιηθεί στο διακομιστή μεσολάβησης. - + CSync failed to lookup proxy or server. Το CSync απέτυχε να διερευνήσει το διαμεσολαβητή ή το διακομιστή. - + CSync failed to authenticate at the %1 server. Το CSync απέτυχε να πιστοποιηθεί στο διακομιστή 1%. - + CSync failed to connect to the network. Το CSync απέτυχε να συνδεθεί με το δίκτυο. - + A network connection timeout happened. Διακοπή σύνδεσης δικτύου. - + A HTTP transmission error happened. Ένα σφάλμα μετάδοσης HTTP συνέβη. - + CSync failed due to not handled permission deniend. Το CSync απέτυχε λόγω απόρριψης μη-διαχειρίσιμων δικαιωμάτων. - + CSync failed to access Το CSync απέτυχε να αποκτήσει πρόσβαση - + CSync tried to create a directory that already exists. Το CSync προσπάθησε να δημιουργήσει ένα κατάλογο που υπάρχει ήδη. - - + + CSync: No space on %1 server available. CSync: Δεν υπάρχει διαθέσιμος χώρος στο διακομιστή 1%. - + CSync unspecified error. Άγνωστο σφάλμα CSync. - + Aborted by the user Ματαιώθηκε από το χρήστη - + An internal error number %1 happened. Συνέβη εσωτερικό σφάλμα με αριθμό %1. - + The item is not synced because of previous errors: %1 Το αντικείμενο δεν είναι συγχρονισμένο λόγω προηγούμενων σφαλμάτων: %1 - + Symbolic links are not supported in syncing. Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό. - + File is listed on the ignore list. Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση. - + File contains invalid characters that can not be synced cross platform. Το αρχείο περιέχει άκυρους χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα. - + Unable to initialize a sync journal. Αδυναμία προετοιμασίας αρχείου συγχρονισμού. - + Cannot open the sync journal Αδυναμία ανοίγματος του αρχείου συγχρονισμού - + Not allowed because you don't have permission to add sub-directories in that directory Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε υπο-καταλόγους σε αυτό τον κατάλογο - + Not allowed because you don't have permission to add parent directory Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε στο γονεϊκό κατάλογο - + Not allowed because you don't have permission to add files in that directory Δεν επιτρέπεται επειδή δεν έχεται δικαιώματα να προσθέσετε αρχεία σε αυτόν τον κατάλογο - + Not allowed to upload this file because it is read-only on the server, restoring Δεν επιτρέπεται να μεταφορτώσετε αυτό το αρχείο επειδή είναι μόνο για ανάγνωση στο διακομιστή, αποκατάσταση σε εξέλιξη - - + + Not allowed to remove, restoring Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη - + Move not allowed, item restored Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε - + Move not allowed because %1 is read-only Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση - + the destination ο προορισμός - + the source η προέλευση @@ -2028,8 +2041,8 @@ It is not advisable to use it. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2166,6 +2179,14 @@ It is not advisable to use it. Ενημερωμένο + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2406,7 +2427,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Εάν δεν έχετε ένα διακομιστή ownCloud ακόμα, δείτε στην διεύθυνση <a href="https://owncloud.com">owncloud.com</a> για περισσότερες πληροφορίες. @@ -2415,15 +2436,10 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> <p><small>Δημιουργήθηκε από την διασκευή Git <a href="%1">%2</a> στο %3, %4 χρησιμοποιώντας Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts index 8be9fd82df..4de08f897a 100644 --- a/translations/mirall_en.ts +++ b/translations/mirall_en.ts @@ -65,17 +65,22 @@ - + + Selective Sync... + + + + Account Maintenance - + Edit Ignored Files - + Modify Account @@ -91,7 +96,7 @@ - + Pause @@ -106,110 +111,110 @@ - + Storage Usage - + Retrieving usage information... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. - + Resume - + Confirm Folder Remove - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> - + Confirm Folder Reset - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. - + Sync Running - + No account configured. - + The syncing operation is running.<br/>Do you want to terminate it? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. @@ -354,24 +359,24 @@ Total time left %5 - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? - + Remove All Files? - + Remove all files - + Keep files @@ -389,52 +394,52 @@ Are you sure you want to perform this operation? - + Undefined State. - + Waits to start syncing. - + Preparing for sync. - + Sync is running. - + Last Sync was successful. - + Last Sync was successful, but with warnings on individual files. - + Setup Error. - + User Abort. - + Sync is paused. - + %1 (Sync is paused) @@ -461,8 +466,8 @@ Are you sure you want to perform this operation? Mirall::FolderWizard - - + + Add Folder @@ -470,67 +475,67 @@ Are you sure you want to perform this operation? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. - + Enter the path to the local folder. - + The directory alias is a descriptive name for this sync connection. - + No valid local folder selected! - + You have no permission to write to the selected folder! - + The local path %1 is already an upload folder. Please pick another one! - + An already configured folder is contained in the current entry. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. - + An already configured folder contains the currently entered folder. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. - + The alias can not be empty. Please provide a descriptive alias word. - + The alias <i>%1</i> is already in use. Please pick another alias. - + Select the source folder @@ -538,51 +543,59 @@ Are you sure you want to perform this operation? Mirall::FolderWizardRemotePath - + Add Remote Folder - + Enter the name of the new folder: - + Folder was successfully created on %1. - + Failed to create the folder on %1. Please check manually. - + Choose this to sync the entire account - + This folder is already being synced. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> @@ -1330,7 +1343,7 @@ It is not advisable to use it. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash @@ -1346,17 +1359,17 @@ It is not advisable to use it. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. - + This folder must not be renamed. Please name it back to Shared. - + The file was renamed but is part of a read only share. The original file was restored. @@ -1781,229 +1794,229 @@ It is not advisable to use it. Mirall::SyncEngine - + Success. - + CSync failed to create a lock file. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. - + CSync failed to write the journal file. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. - + CSync could not detect the filesystem type. - + CSync got an error while processing internal trees. - + CSync failed to reserve memory. - + CSync fatal parameter error. - + CSync processing step update failed. - + CSync processing step reconcile failed. - + CSync processing step propagate failed. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> - + A remote file can not be written. Please check the remote access. - + The local filesystem can not be written. Please check permissions. - + CSync failed to connect through a proxy. - + CSync could not authenticate at the proxy. - + CSync failed to lookup proxy or server. - + CSync failed to authenticate at the %1 server. - + CSync failed to connect to the network. - + A network connection timeout happened. - + A HTTP transmission error happened. - + CSync failed due to not handled permission deniend. - + CSync failed to access - + CSync tried to create a directory that already exists. - - + + CSync: No space on %1 server available. - + CSync unspecified error. - + Aborted by the user - + An internal error number %1 happened. - + The item is not synced because of previous errors: %1 - + Symbolic links are not supported in syncing. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2019,8 +2032,8 @@ It is not advisable to use it. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2157,6 +2170,14 @@ It is not advisable to use it. + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2397,7 +2418,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! @@ -2406,15 +2427,10 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts index b5fe839f1d..a7fef2613d 100644 --- a/translations/mirall_es.ts +++ b/translations/mirall_es.ts @@ -63,17 +63,22 @@ Formulario - + + Selective Sync... + + + + Account Maintenance Mantenimiento de Cuenta - + Edit Ignored Files Editar archivos ignorados - + Modify Account Modificar cuenta @@ -89,7 +94,7 @@ - + Pause Pausar @@ -104,111 +109,111 @@ Agregar carpeta... - + Storage Usage Uso de Almacenamiento - + Retrieving usage information... Obteniendo información de uso - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Nota:</b> Algunas carpetas, incluyendo unidades de red o carpetas compartidas, pueden tener límites diferentes. - + Resume Continuar - + Confirm Folder Remove Confirmar la eliminación de la carpeta - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Realmente desea dejar de sincronizar la carpeta <i>%1</i>?</p><p><b>Note:</b> Esto no eliminará los archivos de su cliente.</p> - + Confirm Folder Reset Confirme que desea restablecer la carpeta - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Realmente desea restablecer la carpeta <i>%1</i> y reconstruir la base de datos de cliente?</p><p><b>Nota:</b> Esta función es para mantenimiento únicamente. No se eliminarán archivos, pero se puede causar alto tráfico en la red y puede tomar varios minutos u horas para terminar, dependiendo del tamaño de la carpeta. Únicamente utilice esta opción si así lo indica su administrador.</p> - + Discovering %1 Descubriendo %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) de %2 espacio usado en el servidor. - + No connection to %1 at <a href="%2">%3</a>. No hay conexión a %1 en <a href="%2">%3</a>. - + No %1 connection configured. No hay ninguna conexión de %1 configurada. - + Sync Running Sincronización en curso - + No account configured. No se ha configurado la cuenta. - + The syncing operation is running.<br/>Do you want to terminate it? La sincronización está en curso.<br/>¿Desea interrumpirla? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 de %4) quedan %5 a una velocidad de %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 de %2, archivo %3 de %4 Tiempo restante %5 - + Connected to <a href="%1">%2</a>. Conectado a <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Conectado a <a href="%1">%2</a> como <i>%3</i>. - + Currently there is no storage usage information available. Actualmente no hay información disponible sobre el uso de almacenamiento. @@ -353,7 +358,7 @@ Tiempo restante %5 Actividad en la Sincronización - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -362,17 +367,17 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q Está seguro de que desea realizar esta operación? - + Remove All Files? Eliminar todos los archivos? - + Remove all files Eliminar todos los archivos - + Keep files Conservar archivos @@ -390,52 +395,52 @@ Está seguro de que desea realizar esta operación? Un antiguo registro (journal) de sincronización '%1' se ha encontrado, pero no se ha podido eliminar. Por favor asegúrese que ninguna aplicación la está utilizando. - + Undefined State. Estado no definido. - + Waits to start syncing. Esperando el inicio de la sincronización. - + Preparing for sync. Preparándose para sincronizar. - + Sync is running. Sincronización en funcionamiento. - + Last Sync was successful. La última sincronización fue exitosa. - + Last Sync was successful, but with warnings on individual files. La última sincronización fue exitosa pero con advertencias para archivos individuales. - + Setup Error. Error de configuración. - + User Abort. Interrumpir. - + Sync is paused. La sincronización está en pausa. - + %1 (Sync is paused) %1 (Sincronización en pausa) @@ -462,8 +467,8 @@ Está seguro de que desea realizar esta operación? Mirall::FolderWizard - - + + Add Folder Añadir carpeta @@ -471,67 +476,67 @@ Está seguro de que desea realizar esta operación? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Haga clic para seleccionar una carpeta local para sincronizar. - + Enter the path to the local folder. Ingrese la ruta de la carpeta local. - + The directory alias is a descriptive name for this sync connection. El alias de la carpeta es un nombre descriptivo para esta conexión de sincronización. - + No valid local folder selected! carpeta local no válida seleccionada - + You have no permission to write to the selected folder! Usted no tiene permiso para escribir en la carpeta seleccionada! - + The local path %1 is already an upload folder. Please pick another one! La ruta local %1 es realmente la carpetas de subidas. Por favor seleccione otra! - + An already configured folder is contained in the current entry. Ya hay una carpeta configurada dentro de la entrada actual. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. La carpeta seleccionada es un link simbólico. Ya existe una carpeta configurada en la carpeta a la que apunta este link. - + An already configured folder contains the currently entered folder. Una carpeta ya configurada contiene la carpeta introducida. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. La carpeta seleccionada es un enlace simbólico. La carpeta raiz actualmente configurada ya contiene la carpeta seleccionada en su jerarquía. - + The alias can not be empty. Please provide a descriptive alias word. El alias no puede estar en blanco. Por favor, proporcione un alias descriptivo. - + The alias <i>%1</i> is already in use. Please pick another alias. El alias <i>%1</i> está en uso. Por favor, introduce otro. - + Select the source folder Seleccione la carpeta de origen. @@ -539,51 +544,59 @@ Está seguro de que desea realizar esta operación? Mirall::FolderWizardRemotePath - + Add Remote Folder Agregar carpeta remota - + Enter the name of the new folder: Introduzca el nombre de la nueva carpeta: - + Folder was successfully created on %1. Carpeta fue creada con éxito en %1. - + Failed to create the folder on %1. Please check manually. Fallo al crear la carpeta %1. Por favor revíselo manualmente. - + Choose this to sync the entire account Escoja esto para sincronizar la cuenta entera - + This folder is already being synced. Este directorio ya se ha soncronizado. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. Ya ha sincronizado <i>%1</i>, el cual es la carpeta de <i>%2</i>. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. Todavía se están sincronizando ficheros. La sincronización de de otras carpetas <b>no</b> está soportada. Si quieres sincronizar múltiples carpetas, por favor revisa la carpeta raíz configurada. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Atención:</b> @@ -1335,7 +1348,7 @@ No se recomienda usarlo. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash El archivo %1 no se puede renombrar a %2 por causa de un conflicto con el nombre de un archivo local @@ -1351,17 +1364,17 @@ No se recomienda usarlo. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Esta carpeta no debe ser renombrada. Ha sido renombrada a su nombre original - + This folder must not be renamed. Please name it back to Shared. Esta carpeta no debe ser renombrada. Favor de renombrar a Compartida. - + The file was renamed but is part of a read only share. The original file was restored. El archivo fue renombrado, pero es parte de una carpeta compartida en modo de solo lectura. El archivo original ha sido recuperado. @@ -1789,229 +1802,229 @@ Intente sincronizar los archivos nuevamente. Mirall::SyncEngine - + Success. Completado con éxito. - + CSync failed to create a lock file. CSync no pudo crear un fichero de bloqueo. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync falló al cargar o crear el archivo de diario. Asegúrese de tener permisos de lectura y escritura en el directorio local de sincronización. - + CSync failed to write the journal file. CSync falló al escribir el archivo de diario. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>El %1 complemente para csync no se ha podido cargar.<br/>Por favor, verifique la instalación</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. La hora del sistema en este cliente es diferente de la hora del sistema en el servidor. Por favor use un servicio de sincronización de hora (NTP) en los servidores y clientes para que las horas se mantengan idénticas. - + CSync could not detect the filesystem type. CSync no pudo detectar el tipo de sistema de archivos. - + CSync got an error while processing internal trees. CSync encontró un error mientras procesaba los árboles de datos internos. - + CSync failed to reserve memory. Fallo al reservar memoria para Csync - + CSync fatal parameter error. Error fatal de parámetro en CSync. - + CSync processing step update failed. El proceso de actualización de CSync ha fallado. - + CSync processing step reconcile failed. Falló el proceso de composición de CSync - + CSync processing step propagate failed. Error en el proceso de propagación de CSync - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>El directorio de destino no existe.</p><p>Por favor verifique la configuración de sincronización.</p> - + A remote file can not be written. Please check the remote access. No se pudo escribir en un archivo remoto. Por favor, compruebe el acceso remoto. - + The local filesystem can not be written. Please check permissions. No se puede escribir en el sistema de archivos local. Por favor, compruebe los permisos. - + CSync failed to connect through a proxy. CSync falló al realizar la conexión a través del proxy - + CSync could not authenticate at the proxy. CSync no pudo autenticar el proxy. - + CSync failed to lookup proxy or server. CSync falló al realizar la búsqueda del proxy - + CSync failed to authenticate at the %1 server. CSync: Falló la autenticación con el servidor %1. - + CSync failed to connect to the network. CSync: Falló la conexión con la red. - + A network connection timeout happened. Se sobrepasó el tiempo de espera de la conexión de red. - + A HTTP transmission error happened. Ha ocurrido un error de transmisión HTTP. - + CSync failed due to not handled permission deniend. CSync: Falló debido a un permiso denegado. - + CSync failed to access Error al acceder CSync - + CSync tried to create a directory that already exists. CSync trató de crear un directorio que ya existe. - - + + CSync: No space on %1 server available. CSync: No queda espacio disponible en el servidor %1. - + CSync unspecified error. Error no especificado de CSync - + Aborted by the user Interrumpido por el usuario - + An internal error number %1 happened. Ha ocurrido un error interno número %1. - + The item is not synced because of previous errors: %1 El elemento no está sincronizado por errores previos: %1 - + Symbolic links are not supported in syncing. Los enlaces simbolicos no estan sopertados. - + File is listed on the ignore list. El fichero está en la lista de ignorados - + File contains invalid characters that can not be synced cross platform. El fichero contiene caracteres inválidos que no pueden ser sincronizados con la plataforma. - + Unable to initialize a sync journal. No se pudo inicializar un registro (journal) de sincronización. - + Cannot open the sync journal No es posible abrir el diario de sincronización - + Not allowed because you don't have permission to add sub-directories in that directory No está permitido, porque no tiene permisos para añadir subcarpetas en este directorio. - + Not allowed because you don't have permission to add parent directory No está permitido porque no tiene permisos para añadir un directorio - + Not allowed because you don't have permission to add files in that directory No está permitido, porque no tiene permisos para crear archivos en este directorio - + Not allowed to upload this file because it is read-only on the server, restoring No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando. - - + + Not allowed to remove, restoring No está permitido borrar, restaurando. - + Move not allowed, item restored No está permitido mover, elemento restaurado. - + Move not allowed because %1 is read-only No está permitido mover, porque %1 es solo lectura. - + the destination destino - + the source origen @@ -2027,9 +2040,9 @@ Intente sincronizar los archivos nuevamente. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - <p>Versión %1 Para más información, visite <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distribuido por %4 y bajo la licencia GNU General Public License (GPL) Versión 2.0.<br>%5 y el logo %5 son marcas registradas de %4 en los Estados Unidos de América, otros países, o en ambos.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2165,6 +2178,14 @@ Intente sincronizar los archivos nuevamente. Actualizado + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2405,7 +2426,7 @@ Intente sincronizar los archivos nuevamente. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Si aún no tiene un servidor ownCloud, visite <a href="https://owncloud.com">owncloud.com</a> para obtener más información. @@ -2414,15 +2435,10 @@ Intente sincronizar los archivos nuevamente. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> <p><small>Construido desde la revisión Git <a href="%1">%2</a> el %3, %4 usando Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts index 747a00a1db..4a7a614529 100644 --- a/translations/mirall_es_AR.ts +++ b/translations/mirall_es_AR.ts @@ -63,17 +63,22 @@ Formulario - + + Selective Sync... + + + + Account Maintenance Mantenimiento de cuenta - + Edit Ignored Files Editar Archivos ignorados - + Modify Account Modificar Cuenta @@ -89,7 +94,7 @@ - + Pause Pausar @@ -104,110 +109,110 @@ Agregar directorio... - + Storage Usage Uso del Almacenamiento - + Retrieving usage information... Obteniendo información del uso... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Nota:</b> Algunas carpetas, incluidas las montadas en red o las carpetas compartidas, pueden tener diferentes límites. - + Resume Continuar - + Confirm Folder Remove Confirmá la eliminación del directorio - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>¿Realmente deseas detener la sincronización de la carpeta <i>%1</i>?</p><p><b>Nota:</b>Estp no removerá los archivos desde tu cliente.</p> - + Confirm Folder Reset Confirme el reseteo de la carpeta - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>¿Realmente deseas resetear el directorio <i>%1</i> y reconstruir la base de datos del cliente?</p><p><b>Nota:</b> Esta función está designada para propósitos de mantenimiento solamente. Ningún archivo será eliminado, pero puede causar un tráfico de datos significante y tomar varios minutos o horas para completarse, dependiendo del tamaño del directorio. Sólo use esta opción si es aconsejado por su administrador.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. No hay ninguna conexión de %1 configurada. - + Sync Running Sincronización en curso - + No account configured. No hay cuenta configurada. - + The syncing operation is running.<br/>Do you want to terminate it? La sincronización está en curso.<br/>¿Querés interrumpirla? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. Conectado a <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Conectado a <a href="%1">%2</a> como <i>%3</i>. - + Currently there is no storage usage information available. Actualmente no hay información disponible acerca del uso del almacenamiento. @@ -352,7 +357,7 @@ Total time left %5 Actividad de Sync - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -361,17 +366,17 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o ¿Estás seguro de que querés realizar esta operación? - + Remove All Files? ¿Borrar todos los archivos? - + Remove all files Borrar todos los archivos - + Keep files Conservar archivos @@ -389,52 +394,52 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o Una antigua sincronización con journaling '%1' fue encontrada, pero no se pudo eliminar. Por favor, asegurate que ninguna aplicación la está utilizando. - + Undefined State. Estado no definido. - + Waits to start syncing. Esperando el comienzo de la sincronización. - + Preparing for sync. Preparando la sincronización. - + Sync is running. Sincronización en funcionamiento. - + Last Sync was successful. La última sincronización fue exitosa. - + Last Sync was successful, but with warnings on individual files. El último Sync fue exitoso, pero hubo advertencias en archivos individuales. - + Setup Error. Error de configuración. - + User Abort. Interrumpir. - + Sync is paused. La sincronización está en pausa. - + %1 (Sync is paused) %1 (Sincronización en pausa) @@ -461,8 +466,8 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o Mirall::FolderWizard - - + + Add Folder gregar directorio @@ -470,67 +475,67 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Clic para seleccionar un directorio local a sincornizar - + Enter the path to the local folder. Ingrese el path al directorio local. - + The directory alias is a descriptive name for this sync connection. El alias de directorio es un nombre descriptivo para esta conexión de sincronización - + No valid local folder selected! ¡No se ha seleccionado un directorio local válido! - + You have no permission to write to the selected folder! ¡No tenés permisos para escribir el directorio seleccionado! - + The local path %1 is already an upload folder. Please pick another one! El path local %1 ya es un directorio actualizado. ¡Por favor seleccione otro! - + An already configured folder is contained in the current entry. Hay un directorio sincronizado en de la selección actual. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. - + An already configured folder contains the currently entered folder. Un directorio configurado ya está contenido en el ingresado. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. El directorio seleccionado es un vínculo simbólico. Un directorio ya configurado es el padre del actual y es contenido por el directorio que este vínculo apunta. - + The alias can not be empty. Please provide a descriptive alias word. El campo "alias" no puede quedar vacío. Por favor, escribí un texto descriptivo. - + The alias <i>%1</i> is already in use. Please pick another alias. El alias <i>%1</i> ya está en uso. Por favor, seleccione otro. - + Select the source folder Seleccioná el directorio origen @@ -538,51 +543,59 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o Mirall::FolderWizardRemotePath - + Add Remote Folder Agregar directorio remoto - + Enter the name of the new folder: Ingresá el nombre del directorio nuevo: - + Folder was successfully created on %1. El directorio fue creado con éxito en %1. - + Failed to create the folder on %1. Please check manually. Fallo al crear el directorio en %1. Por favor chequee manualmente. - + Choose this to sync the entire account Seleccioná acá para sincronizar la cuenta completa - + This folder is already being synced. Este folder ya está siendo sincronizado. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. Ya estás sincronizando <i>%1</i>, el cual es el directorio de <i>%2</i>. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Advertencia:</b> @@ -1332,7 +1345,7 @@ It is not advisable to use it. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash @@ -1348,17 +1361,17 @@ It is not advisable to use it. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. - + This folder must not be renamed. Please name it back to Shared. - + The file was renamed but is part of a read only share. The original file was restored. @@ -1784,229 +1797,229 @@ Intente sincronizar estos nuevamente. Mirall::SyncEngine - + Success. Éxito. - + CSync failed to create a lock file. Se registró un error en CSync cuando se intentaba crear un archivo de bloqueo. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. - + CSync failed to write the journal file. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>No fue posible cargar el plugin de %1 para csync.<br/>Por favor, verificá la instalación</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. La hora del sistema en este cliente es diferente de la hora del sistema en el servidor. Por favor, usá un servicio de sincronización (NTP) de hora en las máquinas cliente y servidor para que las horas se mantengan iguales. - + CSync could not detect the filesystem type. CSync no pudo detectar el tipo de sistema de archivos. - + CSync got an error while processing internal trees. CSync tuvo un error mientras procesaba los árboles de datos internos. - + CSync failed to reserve memory. CSync falló al reservar memoria. - + CSync fatal parameter error. Error fatal de parámetro en CSync. - + CSync processing step update failed. Falló el proceso de actualización de CSync. - + CSync processing step reconcile failed. Falló el proceso de composición de CSync - + CSync processing step propagate failed. Proceso de propagación de CSync falló - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>El directorio de destino %1 no existe.</p> Por favor, comprobá la configuración de sincronización. </p> - + A remote file can not be written. Please check the remote access. No se puede escribir un archivo remoto. Revisá el acceso remoto. - + The local filesystem can not be written. Please check permissions. No se puede escribir en el sistema de archivos local. Revisá los permisos. - + CSync failed to connect through a proxy. CSync falló al tratar de conectarse a través de un proxy - + CSync could not authenticate at the proxy. CSync no pudo autenticar el proxy. - + CSync failed to lookup proxy or server. CSync falló al realizar la busqueda del proxy. - + CSync failed to authenticate at the %1 server. CSync: fallo al autenticarse en el servidor %1. - + CSync failed to connect to the network. CSync: fallo al conectarse a la red - + A network connection timeout happened. - + A HTTP transmission error happened. Ha ocurrido un error de transmisión HTTP. - + CSync failed due to not handled permission deniend. CSync: Falló debido a un permiso denegado. - + CSync failed to access CSync falló al acceder - + CSync tried to create a directory that already exists. Csync trató de crear un directorio que ya existía. - - + + CSync: No space on %1 server available. CSync: No hay más espacio disponible en el servidor %1. - + CSync unspecified error. Error no especificado de CSync - + Aborted by the user Interrumpido por el usuario - + An internal error number %1 happened. - + The item is not synced because of previous errors: %1 - + Symbolic links are not supported in syncing. Los vínculos simbólicos no está soportados al sincronizar. - + File is listed on the ignore list. El archivo está en la lista de ignorados. - + File contains invalid characters that can not be synced cross platform. El archivo contiene caracteres inválidos que no pueden ser sincronizados entre plataforma. - + Unable to initialize a sync journal. Imposible inicializar un diario de sincronización. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2022,8 +2035,8 @@ Intente sincronizar estos nuevamente. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2160,6 +2173,14 @@ Intente sincronizar estos nuevamente. actualizado + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2401,7 +2422,7 @@ Intente sincronizar estos nuevamente. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Si todavía no tenés un servidor ownCloud, visitá <a href="https://owncloud.com">owncloud.com</a> para obtener más información. @@ -2410,15 +2431,10 @@ Intente sincronizar estos nuevamente. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts index 6453d5b586..51c69cab6e 100644 --- a/translations/mirall_et.ts +++ b/translations/mirall_et.ts @@ -63,17 +63,22 @@ Vorm - + + Selective Sync... + + + + Account Maintenance Konto hooldus - + Edit Ignored Files Redigeeri ignoreeritud faile - + Modify Account Muuda kontot @@ -89,7 +94,7 @@ - + Pause Paus @@ -104,111 +109,111 @@ Lisa kataloog... - + Storage Usage Mahu kasutus - + Retrieving usage information... Otsin kasutuse informatsiooni... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Märkus:</b> Mõned kataloogid, sealhulgas võrgust ühendatud või jagatud kataloogid, võivad omada erinevaid limiite. - + Resume Taasta - + Confirm Folder Remove Kinnita kausta eemaldamist - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Kas tõesti soovid peatada kataloogi <i>%1</i> sünkroniseerimist?.</p><p><b>Märkus:</b> See ei eemalda faile sinu kliendist.</p> - + Confirm Folder Reset Kinnita kataloogi algseadistus - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Kas tõesti soovid kataloogi <i>%1</i> algseadistada ning uuesti luua oma kliendi andmebaasi?</p><p><b>See funktsioon on mõeldud peamiselt ainult hooldustöödeks. Märkus:</b>Kuigi ühtegi faili ei eemaldata, siis see võib põhjustada märkimisväärset andmeliiklust ja võtta mitu minutit või tundi, sõltuvalt kataloogi suurusest. Kasuta seda võimalust ainult siis kui seda soovitab süsteemihaldur.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) %2-st serveri mahust on kasutuses. - + No connection to %1 at <a href="%2">%3</a>. Ühendus puudub %1 <a href="%2">%3</a>. - + No %1 connection configured. Ühtegi %1 ühendust pole seadistatud. - + Sync Running Sünkroniseerimine on käimas - + No account configured. Ühtegi kontot pole seadistatud - + The syncing operation is running.<br/>Do you want to terminate it? Sünkroniseerimine on käimas.<br/>Kas sa soovid seda lõpetada? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 of %4) %5 jäänud kiirusel %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 of %2, fail %3 of %4 Aega kokku jäänud %5 - + Connected to <a href="%1">%2</a>. Ühendatud <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Ühendatud <a href="%1">%2</a> kui <i>%3</i>. - + Currently there is no storage usage information available. Hetkel pole mahu kasutuse info saadaval. @@ -353,7 +358,7 @@ Aega kokku jäänud %5 Sünkroniseerimise tegevus - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -362,17 +367,17 @@ See võib olla põhjustatud kataloogi ümberseadistusest või on toimunud kõiki Oled kindel, et soovid seda operatsiooni teostada? - + Remove All Files? Kustutada kõik failid? - + Remove all files Kustutada kõik failid - + Keep files Säilita failid @@ -390,52 +395,52 @@ Oled kindel, et soovid seda operatsiooni teostada? Leiti vana sünkroniseeringu zurnaal '%1', kuid selle eemaldamine ebaõnnenstus. Palun veendu, et seda kasutaks ükski programm. - + Undefined State. Määramata staatus. - + Waits to start syncing. Ootab sünkroniseerimise alustamist. - + Preparing for sync. Valmistun sünkroniseerima. - + Sync is running. Sünkroniseerimine on käimas. - + Last Sync was successful. Viimane sünkroniseerimine oli edukas. - + Last Sync was successful, but with warnings on individual files. Viimane sünkroniseering oli edukas, kuid mõned failid põhjustasid tõrkeid. - + Setup Error. Seadistamise viga. - + User Abort. Kasutaja tühistamine. - + Sync is paused. Sünkroniseerimine on peatatud. - + %1 (Sync is paused) %1 (Sünkroniseerimine on peatatud) @@ -462,8 +467,8 @@ Oled kindel, et soovid seda operatsiooni teostada? Mirall::FolderWizard - - + + Add Folder Lisa kaust @@ -471,67 +476,67 @@ Oled kindel, et soovid seda operatsiooni teostada? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Klõpsa valimaks kohalikku sünkroniseeritavat kataloogi. - + Enter the path to the local folder. Sisesta otsingutee kohaliku kataloogini. - + The directory alias is a descriptive name for this sync connection. Kataloogi alias on kirjeldav nimi selle sünkroniseeringu ühenduse jaoks. - + No valid local folder selected! Ühtegi toimivat kohalikku kausta pole valitud! - + You have no permission to write to the selected folder! Sul puuduvad õigused valitud kataloogi kirjutamiseks! - + The local path %1 is already an upload folder. Please pick another one! Kohalik kataloog %1 juba on üleslaaditav kataloog. Palun vali mõni teine! - + An already configured folder is contained in the current entry. Antud kataloogis juba sidaldub eelnevalt seadistatud kataloog. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. Valitud kataloog on sümboolne link. Juba eelnevalt seadistatud kataloog sisaldub kataloogis, millele antud link viitab. - + An already configured folder contains the currently entered folder. Eelnevalt seadistatud kataloog juba sisaldab praegu sisestatud kataloogi. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. Valitud kataloog on sümboolne link. Juba eelnevalt seadistatud kataloog on praegu valitud kataloogi ülemkataloog, sisaldades kataloogi, millele antud link viitab. - + The alias can not be empty. Please provide a descriptive alias word. Alias ei saa olla tühi. Palun sisesta kirjeldav sõna. - + The alias <i>%1</i> is already in use. Please pick another alias. Alias <i>%1</i> on juba kasutuses. Palun vali mõni teine alias. - + Select the source folder Vali algne kaust @@ -539,51 +544,59 @@ Oled kindel, et soovid seda operatsiooni teostada? Mirall::FolderWizardRemotePath - + Add Remote Folder Lisa võrgukataloog - + Enter the name of the new folder: Sisesta uue kataloogi nimi: - + Folder was successfully created on %1. %1 - kaust on loodud. - + Failed to create the folder on %1. Please check manually. Kausta loomine ebaõnnestus - %1. Palun kontrolli käsitsi. - + Choose this to sync the entire account Vali see sünkroniseering tervele kontole - + This folder is already being synced. Seda kataloogi juba sünkroniseeritakse. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. Sa juba sünkroniseerid <i>%1</i>, mis on <i>%2</i> ülemkataloog. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. Sa juba sünkroniseerid kõiki oma faile. Teise kataloogi sünkroniseering <b>ei ole</b> toetatud. Kui soovid sünkroniseerida mitut kataloogi, palun eemalda hektel seadistatud sünkroniseeritav juurkataloog. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Hoiatus:</b> @@ -1335,7 +1348,7 @@ Selle kasutamine pole soovitatav. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash Faili %1 ei saa ümber nimetada %2-ks, kuna on konflikt kohaliku faili nimega @@ -1351,17 +1364,17 @@ Selle kasutamine pole soovitatav. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Kausta ei tohi ümber nimetada. Kausta algne nimi taastati. - + This folder must not be renamed. Please name it back to Shared. Kausta nime ei tohi muuta. Palun pane selle nimeks tagasi Shared. - + The file was renamed but is part of a read only share. The original file was restored. Fail oli ümber nimetatud, kuid see on osa kirjutamisõiguseta jagamisest. Algne fail taastati. @@ -1789,229 +1802,229 @@ Proovi neid uuesti sünkroniseerida. Mirall::SyncEngine - + Success. Korras. - + CSync failed to create a lock file. CSync lukustusfaili loomine ebaõnnestus. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. Csync ei suutnud avada või luua registri faili. Tee kindlaks et sul on õigus lugeda ja kirjutada kohalikus sünkrooniseerimise kataloogis - + CSync failed to write the journal file. CSync ei suutnud luua registri faili. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Ei suuda laadida csync lisa %1.<br/>Palun kontrolli paigaldust!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Kliendi arvuti kellaeg erineb serveri omast. Palun kasuta õige aja hoidmiseks kella sünkroniseerimise teenust (NTP) nii serveris kui kliendi arvutites, et kell oleks kõikjal õige. - + CSync could not detect the filesystem type. CSync ei suutnud tuvastada failisüsteemi tüüpi. - + CSync got an error while processing internal trees. CSync sai vea sisemiste andmestruktuuride töötlemisel. - + CSync failed to reserve memory. CSync ei suutnud mälu reserveerida. - + CSync fatal parameter error. CSync parameetri saatuslik viga. - + CSync processing step update failed. CSync uuendusprotsess ebaõnnestus. - + CSync processing step reconcile failed. CSync tasakaalustuse protsess ebaõnnestus. - + CSync processing step propagate failed. CSync edasikandeprotsess ebaõnnestus. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Sihtkataloogi ei eksisteeri.</p><p>Palun kontrolli sünkroniseeringu seadistust</p> - + A remote file can not be written. Please check the remote access. Eemalolevasse faili ei saa kirjutada. Palun kontrolli kaugühenduse ligipääsu. - + The local filesystem can not be written. Please check permissions. Kohalikku failissüsteemi ei saa kirjutada. Palun kontrolli õiguseid. - + CSync failed to connect through a proxy. CSync ühendus läbi puhverserveri ebaõnnestus. - + CSync could not authenticate at the proxy. CSync ei suutnud puhverserveris autoriseerida. - + CSync failed to lookup proxy or server. Csync ei suuda leida puhverserverit. - + CSync failed to authenticate at the %1 server. CSync autoriseering serveris %1 ebaõnnestus. - + CSync failed to connect to the network. CSync võrguga ühendumine ebaõnnestus. - + A network connection timeout happened. Toimus võrgukatkestus. - + A HTTP transmission error happened. HTTP ülekande viga. - + CSync failed due to not handled permission deniend. CSync ebaõnnestus ligipääsu puudumisel. - + CSync failed to access CSyncile ligipääs ebaõnnestus - + CSync tried to create a directory that already exists. Csync proovis tekitada kataloogi, mis oli juba olemas. - - + + CSync: No space on %1 server available. CSync: Serveris %1 on ruum otsas. - + CSync unspecified error. CSync tuvastamatu viga. - + Aborted by the user Kasutaja poolt tühistatud - + An internal error number %1 happened. Tekkis sisemine viga number %1. - + The item is not synced because of previous errors: %1 Üksust ei sünkroniseeritud eelnenud vigade tõttu: %1 - + Symbolic links are not supported in syncing. Sümboolsed lingid ei ole sünkroniseerimisel toetatud. - + File is listed on the ignore list. Fail on märgitud ignoreeritavate nimistus. - + File contains invalid characters that can not be synced cross platform. Fail sisaldab sobimatuid sümboleid, mida ei saa sünkroniseerida erinevate platvormide vahel. - + Unable to initialize a sync journal. Ei suuda lähtestada sünkroniseeringu zurnaali. - + Cannot open the sync journal Ei suuda avada sünkroniseeringu zurnaali - + Not allowed because you don't have permission to add sub-directories in that directory Pole lubatud, kuna sul puuduvad õigused lisada sellesse kataloogi lisada alam-kataloogi - + Not allowed because you don't have permission to add parent directory Pole lubatud, kuna sul puuduvad õigused lisada ülemkataloog - + Not allowed because you don't have permission to add files in that directory Pole lubatud, kuna sul puuduvad õigused sellesse kataloogi faile lisada - + Not allowed to upload this file because it is read-only on the server, restoring Pole lubatud üles laadida, kuna tegemist on ainult-loetava serveriga, taastan - - + + Not allowed to remove, restoring Eemaldamine pole lubatud, taastan - + Move not allowed, item restored Liigutamine pole lubatud, üksus taastatud - + Move not allowed because %1 is read-only Liigutamien pole võimalik kuna %1 on ainult lugemiseks - + the destination sihtkoht - + the source allikas @@ -2027,8 +2040,8 @@ Proovi neid uuesti sünkroniseerida. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2165,6 +2178,14 @@ Proovi neid uuesti sünkroniseerida. Ajakohane + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2405,7 +2426,7 @@ Proovi neid uuesti sünkroniseerida. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Kui sul poole veel oma ownCloud serverit, vaata <a href="https://owncloud.com">owncloud.com</a> rohkema info saamiseks. @@ -2414,15 +2435,10 @@ Proovi neid uuesti sünkroniseerida. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> <p><small>Loodud Git revisjonist<a href="%1">%2</a> %3, %4 kasutades Qt %5.</small><p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts index 0e50c7e494..490dd82b50 100644 --- a/translations/mirall_eu.ts +++ b/translations/mirall_eu.ts @@ -63,17 +63,22 @@ Formularioa - + + Selective Sync... + + + + Account Maintenance Kontuaren Mantenua - + Edit Ignored Files Editatu Baztertutako Fitxategiak - + Modify Account Aldatu Kontua @@ -89,7 +94,7 @@ - + Pause Pausarazi @@ -104,111 +109,111 @@ Gehitu Karpeta... - + Storage Usage Biltegiratze Erabilera - + Retrieving usage information... Erabileraren informazioa eskuratzen... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Oharra:</b>Karpeta batzuk, sarekoa edo partekatutakoak, muga ezberdinak izan ditzazkete. - + Resume Berrekin - + Confirm Folder Remove Baieztatu karpetaren ezabatzea - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Bentan nahi duzu karpetaren sinkronizazioa gelditu? <i>%1</i>?</p><p><b>Oharra:</b>Honek ez du fitxategiak zure bezerotik ezabatuko.</p> - + Confirm Folder Reset Baieztatu Karpetaren Leheneratzea - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Benetan nahi duzu <i>%1</i> karpeta leheneratu eta zure bezeroaren datu basea berreraiki?</p><p><b>Oharra:</p> Funtzio hau mantenurako bakarrik diseinauta izan da. Ez da fitxategirik ezabatuko, baina honek datu trafiko handia sor dezake eta minutu edo ordu batzuk behar izango ditu burutzeko, karpetaren tamainaren arabera. Erabili aukera hau bakarrik zure kudeatzaileak esanez gero.</p> - + Discovering %1 Aurkitzen %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) tik %2 zerbitzariko lekua erabilia - + No connection to %1 at <a href="%2">%3</a>. Ez dago %1-ra konexiorik hemendik <a href="%2">%3</a>. - + No %1 connection configured. Ez dago %1 konexiorik konfiguratuta. - + Sync Running Sinkronizazioa martxan da - + No account configured. Ez da konturik konfiguratu. - + The syncing operation is running.<br/>Do you want to terminate it? Sinkronizazio martxan da.<br/>Bukatu nahi al duzu? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 %2-tik %1, %4-tik %3 fitxategi Geratzen den denbora %5 - + Connected to <a href="%1">%2</a>. <a href="%1">%2</a>ra konektatuta. - + Connected to <a href="%1">%2</a> as <i>%3</i>. <a href="%1">%2</a>ra konektatuta <i>%3</i> erabiltzailearekin. - + Currently there is no storage usage information available. Orain ez dago eskuragarri biltegiratze erabileraren informazioa. @@ -353,7 +358,7 @@ Geratzen den denbora %5 Sinkronizazio Jarduerak - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -362,17 +367,17 @@ Izan daiteke karpeta isilpean birkonfiguratu delako edo fitxategi guztiak eskuz Ziur zaude eragiketa hau egin nahi duzula? - + Remove All Files? Ezabatu Fitxategi Guztiak? - + Remove all files Ezabatu fitxategi guztiak - + Keep files Mantendu fitxategiak @@ -390,52 +395,52 @@ Ziur zaude eragiketa hau egin nahi duzula? Aurkitu da '%1' sinkronizazio erregistro zaharra, baina ezin da ezabatu. Ziurtatu aplikaziorik ez dela erabiltzen ari. - + Undefined State. Definitu gabeko egoera. - + Waits to start syncing. Itxoiten sinkronizazioa hasteko. - + Preparing for sync. Sinkronizazioa prestatzen. - + Sync is running. Sinkronizazioa martxan da. - + Last Sync was successful. Azkeneko sinkronizazioa ongi burutu zen. - + Last Sync was successful, but with warnings on individual files. Azkenengo sinkronizazioa ongi burutu zen, baina banakako fitxategi batzuetan abisuak egon dira. - + Setup Error. Konfigurazio errorea. - + User Abort. Erabiltzaileak bertan behera utzi. - + Sync is paused. Sinkronizazioa pausatuta dago. - + %1 (Sync is paused) %1 (Sinkronizazioa pausatuta dago) @@ -462,8 +467,8 @@ Ziur zaude eragiketa hau egin nahi duzula? Mirall::FolderWizard - - + + Add Folder Gehitu Karpeta @@ -471,67 +476,67 @@ Ziur zaude eragiketa hau egin nahi duzula? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Klikatu sinkronizatzeko bertako karpeta bat sinkronizatzeko. - + Enter the path to the local folder. Sartu bertako karpeta berriaren bidea: - + The directory alias is a descriptive name for this sync connection. Direktorioaren ezizena sinkronizazio konexioaren izen deskriptiboa da. - + No valid local folder selected! Ez da bertako karpeta egokirik hautatu! - + You have no permission to write to the selected folder! Ez daukazu hautatutako karpetan idazteko baimenik! - + The local path %1 is already an upload folder. Please pick another one! %1 sarbidean badago kargatzeko karpeta bat. Hautatu beste bat! - + An already configured folder is contained in the current entry. Karpeta honek dagoeneko konfiguratuta dagoen beste karpeta bat du barnean - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. Hautatutako karpeta esteka sinboliko bat da. Eta konfituratutako karpeta dagoeneko badago esteka apuntatzen duen karpetan. - + An already configured folder contains the currently entered folder. Karpeta batek dagoeneko barnean du orain sartutako karpeta. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. Hautatutako karpeta esteka sinboliko bat da. Eta konfiguratutako karpeta estekak apuntatzen duen karpetaren gurasoa da. - + The alias can not be empty. Please provide a descriptive alias word. Ezizena ezin da hutsa izan. Mesedez jarri hitz esanguratsu bat. - + The alias <i>%1</i> is already in use. Please pick another alias. <i>%1</i> ezizena dagoeneko erabiltzen ari da. Hautatu beste ezizen bat. - + Select the source folder Hautatu jatorrizko karpeta @@ -539,51 +544,59 @@ Ziur zaude eragiketa hau egin nahi duzula? Mirall::FolderWizardRemotePath - + Add Remote Folder Gehitu Urruneko Karpeta - + Enter the name of the new folder: Sartu karpeta berriaren izena: - + Folder was successfully created on %1. %1-en karpeta ongi sortu da. - + Failed to create the folder on %1. Please check manually. Huts egin du %1-(e)an karpeta sortzen. Egiaztatu eskuz. - + Choose this to sync the entire account Hautatu hau kontu osoa sinkronizatzeko - + This folder is already being synced. Karpeta hau dagoeneko sinkronizatzen ari da. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. Dagoeneko <i>%1</i> sinkronizatzen ari zara, <i>%2</i>-ren guraso karpeta dena. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. Dagoeneko fitxategi guztiak sinkronizatzen ari zara. <b>Ezin<b> da sinkronizatu beste karpeta bat. Hainbat karpeta batera sinkronizatu nahi baduzu ezaba ezazu orain konfiguratuta duzun sinkronizazio karpeta nagusia. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Abisua:</b> @@ -1334,7 +1347,7 @@ It is not advisable to use it. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash @@ -1350,17 +1363,17 @@ It is not advisable to use it. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Karpeta hau ezin da berrizendatu. Bere jatorrizko izenera berrizendatu da. - + This folder must not be renamed. Please name it back to Shared. Karpeta hau ezin da berrizendatu. Mesedez jarri berriz Shared izena. - + The file was renamed but is part of a read only share. The original file was restored. @@ -1786,229 +1799,229 @@ Saiatu horiek berriz sinkronizatzen. Mirall::SyncEngine - + Success. Arrakasta. - + CSync failed to create a lock file. CSyncek huts egin du lock fitxategia sortzean. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. - + CSync failed to write the journal file. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>csyncen %1 plugina ezin da kargatu.<br/>Mesedez egiaztatu instalazioa!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Bezero honetako sistemaren ordua zerbitzariarenaren ezberdina da. Mesedez erabili sinkronizazio zerbitzari bat (NTP) zerbitzari eta bezeroan orduak berdinak izan daitezen. - + CSync could not detect the filesystem type. CSyncek ezin du fitxategi sistema mota antzeman. - + CSync got an error while processing internal trees. CSyncek errorea izan du barne zuhaitzak prozesatzerakoan. - + CSync failed to reserve memory. CSyncek huts egin du memoria alokatzean. - + CSync fatal parameter error. CSync parametro larri errorea. - + CSync processing step update failed. CSync prozesatzearen eguneratu urratsak huts egin du. - + CSync processing step reconcile failed. CSync prozesatzearen berdinkatze urratsak huts egin du. - + CSync processing step propagate failed. CSync prozesatzearen hedatu urratsak huts egin du. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Helburu direktorioa ez da existitzen.</p><p>Egiazt6atu sinkronizazio konfigurazioa.</p> - + A remote file can not be written. Please check the remote access. Urruneko fitxategi bat ezin da idatzi. Mesedez egiaztatu urreneko sarbidea. - + The local filesystem can not be written. Please check permissions. Ezin da idatzi bertako fitxategi sisteman. Mesedez egiaztatu baimenak. - + CSync failed to connect through a proxy. CSyncek huts egin du proxiaren bidez konektatzean. - + CSync could not authenticate at the proxy. CSyncek ezin izan du proxya autentikatu. - + CSync failed to lookup proxy or server. CSyncek huts egin du zerbitzaria edo proxia bilatzean. - + CSync failed to authenticate at the %1 server. CSyncek huts egin du %1 zerbitzarian autentikatzean. - + CSync failed to connect to the network. CSyncek sarera konektatzean huts egin du. - + A network connection timeout happened. - + A HTTP transmission error happened. HTTP transmisio errore bat gertatu da. - + CSync failed due to not handled permission deniend. CSyncek huts egin du kudeatu gabeko baimen ukapen bat dela eta. - + CSync failed to access - + CSync tried to create a directory that already exists. CSyncek dagoeneko existitzen zen karpeta bat sortzen saiatu da. - - + + CSync: No space on %1 server available. CSync: Ez dago lekurik %1 zerbitzarian. - + CSync unspecified error. CSyncen zehaztugabeko errorea. - + Aborted by the user Erabiltzaileak bertan behera utzita - + An internal error number %1 happened. - + The item is not synced because of previous errors: %1 - + Symbolic links are not supported in syncing. Esteka sinbolikoak ezin dira sinkronizatu. - + File is listed on the ignore list. Fitxategia baztertutakoen zerrendan dago. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. Ezin izan da sinkronizazio egunerokoa hasieratu. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2024,8 +2037,8 @@ Saiatu horiek berriz sinkronizatzen. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2162,6 +2175,14 @@ Saiatu horiek berriz sinkronizatzen. Eguneratua + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2402,7 +2423,7 @@ Saiatu horiek berriz sinkronizatzen. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! ownCloud zerbitzaririk ez baduzu, ikusi <a href="https://owncloud.com">owncloud.com</a> informazio gehiago eskuratzeko. @@ -2411,15 +2432,10 @@ Saiatu horiek berriz sinkronizatzen. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts index 5f0239e731..ed212a6b8b 100644 --- a/translations/mirall_fa.ts +++ b/translations/mirall_fa.ts @@ -63,17 +63,22 @@ فرم - + + Selective Sync... + + + + Account Maintenance - + Edit Ignored Files ویرایش فایل های در نظر گرفته نشده - + Modify Account ویرایش حساب کاربری @@ -89,7 +94,7 @@ - + Pause توقف کردن @@ -104,110 +109,110 @@ افزودن پوشه... - + Storage Usage - + Retrieving usage information... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. - + Resume از سر گیری - + Confirm Folder Remove قبول کردن پاک شدن پوشه - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> - + Confirm Folder Reset - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. - + Sync Running همگام سازی در حال اجراست - + No account configured. - + The syncing operation is running.<br/>Do you want to terminate it? عملیات همگام سازی در حال اجراست.<br/>آیا دوست دارید آن را متوقف کنید؟ - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. @@ -352,24 +357,24 @@ Total time left %5 فعالیت همگام سازی - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? - + Remove All Files? - + Remove all files - + Keep files نگه داشتن فایل ها @@ -387,52 +392,52 @@ Are you sure you want to perform this operation? - + Undefined State. موقعیت تعریف نشده - + Waits to start syncing. صبر کنید تا همگام سازی آغاز شود - + Preparing for sync. - + Sync is running. همگام سازی در حال اجراست - + Last Sync was successful. آخرین همگام سازی موفقیت آمیز بود - + Last Sync was successful, but with warnings on individual files. - + Setup Error. خطا در پیکر بندی. - + User Abort. خارج کردن کاربر. - + Sync is paused. همگام سازی فعلا متوقف شده است - + %1 (Sync is paused) @@ -459,8 +464,8 @@ Are you sure you want to perform this operation? Mirall::FolderWizard - - + + Add Folder ایجاد پوشه @@ -468,67 +473,67 @@ Are you sure you want to perform this operation? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. - + Enter the path to the local folder. - + The directory alias is a descriptive name for this sync connection. - + No valid local folder selected! - + You have no permission to write to the selected folder! شما اجازه نوشتن در پوشه های انتخاب شده را ندارید! - + The local path %1 is already an upload folder. Please pick another one! - + An already configured folder is contained in the current entry. در حال حاضر یک پوشه پیکربندی شده در ورودی فعلی موجود است. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. - + An already configured folder contains the currently entered folder. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. - + The alias can not be empty. Please provide a descriptive alias word. نام مستعار نمی تواند خالی باشد. لطفا یک کلمه مستعار توصیفی ارائه دهید. - + The alias <i>%1</i> is already in use. Please pick another alias. - + Select the source folder پوشه ی اصلی را انتخاب کنید @@ -536,51 +541,59 @@ Are you sure you want to perform this operation? Mirall::FolderWizardRemotePath - + Add Remote Folder افزودن پوشه از راه دور - + Enter the name of the new folder: - + Folder was successfully created on %1. پوشه با موفقیت ایجاد شده است %1. - + Failed to create the folder on %1. Please check manually. - + Choose this to sync the entire account - + This folder is already being synced. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>اخطار:</b> @@ -1328,7 +1341,7 @@ It is not advisable to use it. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash @@ -1344,17 +1357,17 @@ It is not advisable to use it. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. - + This folder must not be renamed. Please name it back to Shared. - + The file was renamed but is part of a read only share. The original file was restored. @@ -1779,229 +1792,229 @@ It is not advisable to use it. Mirall::SyncEngine - + Success. موفقیت - + CSync failed to create a lock file. CSync موفق به ایجاد یک فایل قفل شده، نشد. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. - + CSync failed to write the journal file. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>ماژول %1 برای csync نمی تواند بارگذاری شود.<br/>لطفا نصب را بررسی کنید!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. سیستم زمان بر روی این مشتری با سیستم زمان بر روی سرور متفاوت است.لطفا از خدمات هماهنگ سازی زمان (NTP) بر روی ماشین های سرور و کلاینت استفاده کنید تا زمان ها یکسان باقی بمانند. - + CSync could not detect the filesystem type. CSync نوع فایل های سیستم را نتوانست تشخیص بدهد. - + CSync got an error while processing internal trees. CSync هنگام پردازش درختان داخلی یک خطا دریافت نمود. - + CSync failed to reserve memory. CSync موفق به رزرو حافظه نشد است. - + CSync fatal parameter error. - + CSync processing step update failed. مرحله به روز روسانی پردازش CSync ناموفق بود. - + CSync processing step reconcile failed. مرحله تطبیق پردازش CSync ناموفق بود. - + CSync processing step propagate failed. مرحله گسترش پردازش CSync ناموفق بود. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>پوشه هدف وجود ندارد.</p><p>لطفا راه اندازی همگام سازی را بررسی کنید.</p> - + A remote file can not be written. Please check the remote access. یک فایل از راه دور نمی تواند نوشته شود. لطفا دسترسی از راه دور را بررسی نمایید. - + The local filesystem can not be written. Please check permissions. بر روی فایل سیستمی محلی نمی توانید چیزی بنویسید.لطفا مجوزش را بررسی کنید. - + CSync failed to connect through a proxy. عدم موفقیت CSync برای اتصال از طریق یک پروکسی. - + CSync could not authenticate at the proxy. - + CSync failed to lookup proxy or server. عدم موفقیت CSync برای مراجعه به پروکسی یا سرور. - + CSync failed to authenticate at the %1 server. عدم موفقیت CSync برای اعتبار دادن در %1 سرور. - + CSync failed to connect to the network. عدم موفقیت CSync برای اتصال به شبکه. - + A network connection timeout happened. - + A HTTP transmission error happened. خطا در انتقال HTTP اتفاق افتاده است. - + CSync failed due to not handled permission deniend. - + CSync failed to access - + CSync tried to create a directory that already exists. CSync برای ایجاد یک پوشه که در حال حاضر موجود است تلاش کرده است. - - + + CSync: No space on %1 server available. CSync: فضا در %1 سرور در دسترس نیست. - + CSync unspecified error. خطای نامشخص CSync - + Aborted by the user - + An internal error number %1 happened. - + The item is not synced because of previous errors: %1 - + Symbolic links are not supported in syncing. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2017,8 +2030,8 @@ It is not advisable to use it. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2155,6 +2168,14 @@ It is not advisable to use it. تا تاریخ + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2395,7 +2416,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! اگر شما هنوز یک سرور ownCloud ندارید، <a href="https://owncloud.com">owncloud.com</a> را برای اطلاعات بیشتر ببینید. @@ -2404,15 +2425,10 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts index e9f709f98a..9f17dfbb44 100644 --- a/translations/mirall_fi.ts +++ b/translations/mirall_fi.ts @@ -63,17 +63,22 @@ Lomake - + + Selective Sync... + + + + Account Maintenance Tilin ylläpito - + Edit Ignored Files Muokkaa sivuutettuja tiedostoja - + Modify Account Muokkaa tiliä @@ -89,7 +94,7 @@ - + Pause Keskeytä @@ -104,111 +109,111 @@ Lisää kansio... - + Storage Usage Tilan käyttö - + Retrieving usage information... Noudetaan käyttötietoja... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Huomio:</b> Joillakin kansioilla, mukaan lukien verkon yli liitetyt tai jaetut kansiot, voivat olla erilaisten rajoitusten piirissä. - + Resume Jatka - + Confirm Folder Remove Vahvista kansion poisto - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Haluatko varmasti lopettaa kansion <i>%i</i> synkronoinnin?</p><p><b>Huomio:</b> Tämä valinta ei poista tiedostoja asiakkaalta.</p> - + Confirm Folder Reset Vahvista kansion alustus - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) / %2 palvelimen tilasta käytössä. - + No connection to %1 at <a href="%2">%3</a>. Ei yhteyttä %1iin osoitteessa <a href="%2">%3</a>. - + No %1 connection configured. %1-yhteyttä ei ole määritelty. - + Sync Running Synkronointi meneillään - + No account configured. Tiliä ei ole määritelty. - + The syncing operation is running.<br/>Do you want to terminate it? Synkronointioperaatio on meneillään.<br/>Haluatko keskeyttää sen? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3/%4) %5 jäljellä nopeudella %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1/%2, tiedosto %3/%4 Aikaa jäljellä yhteensä %5 - + Connected to <a href="%1">%2</a>. Muodosta yhteys - <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Yhdistetty kohteeseen <a href="%1">%2</a> käyttäjänä <i>%3</i>. - + Currently there is no storage usage information available. Tallennustilan käyttötietoja ei ole juuri nyt saatavilla. @@ -353,24 +358,24 @@ Aikaa jäljellä yhteensä %5 Synkronointiaktiviteetti - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? - + Remove All Files? Poistetaanko kaikki tiedostot? - + Remove all files Poista kaikki tiedostot - + Keep files Säilytä tiedostot @@ -388,52 +393,52 @@ Are you sure you want to perform this operation? - + Undefined State. Määrittelemätön tila. - + Waits to start syncing. Odottaa synkronoinnin alkamista. - + Preparing for sync. Valmistellaan synkronointia. - + Sync is running. Synkronointi on meneillään. - + Last Sync was successful. Viimeisin synkronointi suoritettiin onnistuneesti. - + Last Sync was successful, but with warnings on individual files. Viimeisin synkronointi onnistui, mutta yksittäisten tiedostojen kanssa ilmeni varoituksia. - + Setup Error. Asetusvirhe. - + User Abort. - + Sync is paused. Synkronointi on keskeytetty. - + %1 (Sync is paused) %1 (Synkronointi on keskeytetty) @@ -460,8 +465,8 @@ Are you sure you want to perform this operation? Mirall::FolderWizard - - + + Add Folder Lisää kansio @@ -469,67 +474,67 @@ Are you sure you want to perform this operation? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Napsauta valitaksesi synkronoitavan paikalliskansion. - + Enter the path to the local folder. - + The directory alias is a descriptive name for this sync connection. - + No valid local folder selected! - + You have no permission to write to the selected folder! Sinulla ei ole kirjoitusoikeutta valittuun kansioon! - + The local path %1 is already an upload folder. Please pick another one! - + An already configured folder is contained in the current entry. Tässä on jo olemassa asetettu kansio. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. - + An already configured folder contains the currently entered folder. Jo aiemmin määritelty kansio sisältää nyt valitun kansion. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. - + The alias can not be empty. Please provide a descriptive alias word. Alias-nimi ei voi olla tyhjä. Anna kuvaava aliassana. - + The alias <i>%1</i> is already in use. Please pick another alias. Alias <i>%1</i> on jo käytöss. Valitse toinen alias. - + Select the source folder Valitse lähdekansio @@ -537,51 +542,59 @@ Are you sure you want to perform this operation? Mirall::FolderWizardRemotePath - + Add Remote Folder Lisää etäkansio - + Enter the name of the new folder: Anna uuden kansion nimi: - + Folder was successfully created on %1. - + Failed to create the folder on %1. Please check manually. - + Choose this to sync the entire account Valitse tämä synkronoidaksesi koko tilin - + This folder is already being synced. Tätä kansiota synkronoidaan jo. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. Synkronoit jo kansiota <i>%1</i>, ja se on kansion <i>%2</i> yläkansio. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Varoitus:</b> @@ -1331,7 +1344,7 @@ Osoitteen käyttäminen ei ole suositeltavaa. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash @@ -1347,17 +1360,17 @@ Osoitteen käyttäminen ei ole suositeltavaa. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Tätä kansiota ei ole tule nimetä uudelleen. Muutetaan takaisin alkuperäinen nimi. - + This folder must not be renamed. Please name it back to Shared. - + The file was renamed but is part of a read only share. The original file was restored. @@ -1784,229 +1797,229 @@ Osoitteen käyttäminen ei ole suositeltavaa. Mirall::SyncEngine - + Success. Onnistui. - + CSync failed to create a lock file. Csync ei onnistunut luomaan lukitustiedostoa. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. - + CSync failed to write the journal file. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>%1-liitännäistä csyncia varten ei voitu ladata.<br/>Varmista asennuksen toimivuus!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Tämän koneen järjestelmäaika on erilainen verrattuna palvelimen aikaan. Käytä NTP-palvelua kummallakin koneella, jotta kellot pysyvät samassa ajassa. Muuten tiedostojen synkronointi ei toimi. - + CSync could not detect the filesystem type. Csync-synkronointipalvelu ei kyennyt tunnistamaan tiedostojärjestelmän tyyppiä. - + CSync got an error while processing internal trees. Csync-synkronointipalvelussa tapahtui virhe sisäisten puurakenteiden prosessoinnissa. - + CSync failed to reserve memory. CSync ei onnistunut varaamaan muistia. - + CSync fatal parameter error. - + CSync processing step update failed. - + CSync processing step reconcile failed. - + CSync processing step propagate failed. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Kohdekansiota ei ole olemassa.</p><p>Tarkasta synkronointiasetuksesi.</p> - + A remote file can not be written. Please check the remote access. Etätiedostoa ei pystytä kirjoittamaan. Tarkista, että etäpääsy toimii. - + The local filesystem can not be written. Please check permissions. Paikalliseen tiedostojärjestelmään kirjoittaminen epäonnistui. Tarkista kansion oikeudet. - + CSync failed to connect through a proxy. CSync ei onnistunut muodostamaan yhteyttä välityspalvelimen välityksellä. - + CSync could not authenticate at the proxy. - + CSync failed to lookup proxy or server. - + CSync failed to authenticate at the %1 server. - + CSync failed to connect to the network. CSync ei onnistunut yhdistämään verkkoon. - + A network connection timeout happened. Tapahtui verkon aikakatkaisu. - + A HTTP transmission error happened. Tapahtui HTTP-välitysvirhe. - + CSync failed due to not handled permission deniend. - + CSync failed to access - + CSync tried to create a directory that already exists. CSync yritti luoda olemassa olevan kansion. - - + + CSync: No space on %1 server available. CSync: %1-palvelimella ei ole tilaa vapaana. - + CSync unspecified error. CSync - määrittämätön virhe. - + Aborted by the user Keskeytetty käyttäjän toimesta - + An internal error number %1 happened. Ilmeni sisäinen virhe, jonka numero on %1. - + The item is not synced because of previous errors: %1 Kohdetta ei synkronoitu aiempien virheiden vuoksi: %1 - + Symbolic links are not supported in syncing. Symboliset linkit eivät ole tuettuja synkronoinnissa. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory Ei sallittu, koska sinulla ei ole oikeutta lisätä tiedostoja kyseiseen kansioon - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring Poistaminen ei ole sallittua, palautetaan - + Move not allowed, item restored Siirtäminen ei ole sallittua, kohde palautettu - + Move not allowed because %1 is read-only Siirto ei ole sallittu, koska %1 on "vain luku"-tilassa - + the destination kohde - + the source lähde @@ -2022,8 +2035,8 @@ Osoitteen käyttäminen ei ole suositeltavaa. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2160,6 +2173,14 @@ Osoitteen käyttäminen ei ole suositeltavaa. Ajan tasalla + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2400,7 +2421,7 @@ Osoitteen käyttäminen ei ole suositeltavaa. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Jos käytössäsi ei ole vielä ownCloud-palvelinta, lue lisätietoja osoitteessa <a href="https://owncloud.com">owncloud.com</a>. @@ -2409,15 +2430,10 @@ Osoitteen käyttäminen ei ole suositeltavaa. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts index 311cad54f6..a08092707f 100644 --- a/translations/mirall_fr.ts +++ b/translations/mirall_fr.ts @@ -63,17 +63,22 @@ Formulaire - + + Selective Sync... + + + + Account Maintenance Maintenance du compte - + Edit Ignored Files Modifier les fichiers ignorés - + Modify Account Modifier un compte @@ -89,7 +94,7 @@ - + Pause Mettre en pause @@ -104,111 +109,111 @@ Ajouter un dossier... - + Storage Usage Utilisation du stockage - + Retrieving usage information... Récupération des informations d'utilisation... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Note :</b> Certains fichiers, incluant des dossiers montés depuis le réseau ou des dossiers partagés, peuvent avoir des limites différentes. - + Resume Reprendre - + Confirm Folder Remove Confirmer le retrait du dossier - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Voulez-vous réellement arrêter la synchronisation du dossier <i>%1</i> ?</p><p><b>Note : </b> Cela ne supprimera pas les fichiers sur votre client.</p> - + Confirm Folder Reset Confirmation de la réinitialisation du dossier - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Voulez-vous réellement réinitialiser le dossier <i>%1</i> et reconstruire votre base de données cliente ?</p><p><b>Note :</b> Cette fonctionnalité existe pour des besoins de maintenance uniquement. Aucun fichier ne sera supprimé, mais cela peut causer un trafic de données conséquent et peut durer de plusieurs minutes à plusieurs heures, en fonction de la taille du dossier. Utilisez cette option uniquement sur avis de votre administrateur.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) de %2 d'espace utilisé sur le serveur. - + No connection to %1 at <a href="%2">%3</a>. Aucune connexion à %1 à <a href="%2">%3</a>. - + No %1 connection configured. Aucune connexion à %1 configurée - + Sync Running Synchronisation en cours - + No account configured. Aucun compte configuré. - + The syncing operation is running.<br/>Do you want to terminate it? La synchronisation est en cours.<br/>Voulez-vous y mettre un terme? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 de %4) %5 restant à un débit de %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 de %2, fichier %3 de %4 Temps restant total %5 - + Connected to <a href="%1">%2</a>. Connecté à <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Connecté à <a href="%1">%2</a> en tant que <i>%3</i>. - + Currently there is no storage usage information available. Actuellement aucune information d'utilisation de stockage n'est disponible. @@ -353,7 +358,7 @@ Temps restant total %5 Activité de synchronisation - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -362,17 +367,17 @@ Cela est peut-être du à une reconfiguration silencieuse du dossier, ou parce q Voulez-vous réellement effectuer cette opération ? - + Remove All Files? Supprimer tous les fichiers ? - + Remove all files Supprimer tous les fichiers - + Keep files Garder les fichiers @@ -390,52 +395,52 @@ Voulez-vous réellement effectuer cette opération ? Une synchronisation antérieure du journal de %1 a été trouvée, mais ne peut être supprimée. Veuillez vous assurer qu’aucune application n'est utilisée en ce moment. - + Undefined State. Statut indéfini. - + Waits to start syncing. En attente de synchronisation. - + Preparing for sync. Préparation de la synchronisation. - + Sync is running. La synchronisation est en cours. - + Last Sync was successful. Dernière synchronisation effectuée avec succès - + Last Sync was successful, but with warnings on individual files. La dernière synchronisation s'est achevée avec succès mais avec des messages d'avertissement sur des fichiers individuels. - + Setup Error. Erreur d'installation. - + User Abort. Abandon par l'utilisateur. - + Sync is paused. La synchronisation est en pause. - + %1 (Sync is paused) %1 (Synchronisation en pause) @@ -462,8 +467,8 @@ Voulez-vous réellement effectuer cette opération ? Mirall::FolderWizard - - + + Add Folder Ajouter le dossier @@ -471,67 +476,67 @@ Voulez-vous réellement effectuer cette opération ? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Cliquez pour choisir un dossier local à synchroniser. - + Enter the path to the local folder. Entrez le chemin du dossier local. - + The directory alias is a descriptive name for this sync connection. L'alias du dossier est un nom descriptif pour cette synchronisation. - + No valid local folder selected! Aucun dossier valide sélectionné ! - + You have no permission to write to the selected folder! Vous n'avez pas les permissions d'écrire dans le dossier selectionné - + The local path %1 is already an upload folder. Please pick another one! Le chemin d'accès local %1 est déjà un dossier de téléchargement. Veuillez en choisir un autre ! - + An already configured folder is contained in the current entry. L'entrée sélectionnée contient déjà un dossier configuré. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. Le dossier sélectionné est un lien symbolique. Une configuration du dossier existe déjà dans le dossier portant vers ce même lien. - + An already configured folder contains the currently entered folder. Le dossier saisi est déjà contenu dans un dossier configuré. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. Le dossier sélectionné est un lien symbolique. Un dossier est déjà configuré et est parent du dossier vers lequel ce lien pointe. - + The alias can not be empty. Please provide a descriptive alias word. L'alias ne peut pas être vide. Veuillez fournir un nom d'alias explicite. - + The alias <i>%1</i> is already in use. Please pick another alias. L'alias <i>%1</i> est déja utilisé. Veuillez choisir un autre alias. - + Select the source folder Sélectionnez le dossier source @@ -539,51 +544,59 @@ Voulez-vous réellement effectuer cette opération ? Mirall::FolderWizardRemotePath - + Add Remote Folder Ajouter un dossier distant - + Enter the name of the new folder: Saisissez le nom du nouveau dossier : - + Folder was successfully created on %1. Le dossier a été créé sur %1 - + Failed to create the folder on %1. Please check manually. Échec à la création du dossier sur %1. Veuillez vérifier manuellement. - + Choose this to sync the entire account Sélectionner ceci pour synchroniser l'ensemble du compte - + This folder is already being synced. Ce dossier est déjà en cours de synchronisation. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. Vous synchronisez déja <i>%1</i>, qui est un dossier parent de <i>%2</i>. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. Vous êtes déjà en cours de synchronisation de tous vos fichiers. Synchroniser un autre dossier n'est <b>pas</b> possible actuellement. Si vous voulez synchroniser de multiples dossiers, veuillez supprimer la synchronisation en cours du dossier racine. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Attention :</b> @@ -1335,7 +1348,7 @@ Il est déconseillé de l'utiliser. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash Le fichier %1 ne peut pas être renommé en %2 à cause d'un conflit local de nom de fichier @@ -1351,17 +1364,17 @@ Il est déconseillé de l'utiliser. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Ce dossier ne doit pas être renommé. Il sera renommé avec son nom original. - + This folder must not be renamed. Please name it back to Shared. Ce dossier ne doit pas être renommé. Veuillez le nommer Partagé uniquement. - + The file was renamed but is part of a read only share. The original file was restored. Le fichier a été renommé mais appartient à un partage en lecture seule. Le fichier original a été restauré. @@ -1789,229 +1802,229 @@ Il est déconseillé de l'utiliser. Mirall::SyncEngine - + Success. Succès. - + CSync failed to create a lock file. CSync n'a pas pu créer le fichier de verrouillage. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync n’a pu charger ou créer le fichier de journalisation. Veuillez vérifier que vous possédez les droits en lecture/écriture dans le répertoire de synchronisation local. - + CSync failed to write the journal file. CSync n’a pu écrire le fichier de journalisation. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Le plugin %1 pour csync n'a pas pu être chargé.<br/>Merci de vérifier votre installation !</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. L'heure du client est différente de l'heure du serveur. Veuillez utiliser un service de synchronisation du temps (NTP) sur le serveur et le client afin que les horloges soient à la même heure. - + CSync could not detect the filesystem type. CSync n'a pas pu détecter le type de système de fichier. - + CSync got an error while processing internal trees. CSync obtient une erreur pendant le traitement des arbres internes. - + CSync failed to reserve memory. Erreur lors de l'allocation mémoire par CSync. - + CSync fatal parameter error. Erreur fatale CSync : mauvais paramètre. - + CSync processing step update failed. Erreur CSync lors de l'opération de mise à jour - + CSync processing step reconcile failed. Erreur CSync lors de l'opération d'harmonisation - + CSync processing step propagate failed. Erreur CSync lors de l'opération de propagation - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Le répertoire cible n'existe pas.</p><p>Veuillez vérifier la configuration de la synchronisation.</p> - + A remote file can not be written. Please check the remote access. Un fichier distant ne peut être écrit. Veuillez vérifier l’accès distant. - + The local filesystem can not be written. Please check permissions. Le système de fichiers local n'est pas accessible en écriture. Veuillez vérifier les permissions. - + CSync failed to connect through a proxy. CSync n'a pu établir une connexion à travers un proxy. - + CSync could not authenticate at the proxy. CSync ne peut s'authentifier auprès du proxy. - + CSync failed to lookup proxy or server. CSync n'a pu trouver un proxy ou serveur auquel se connecter. - + CSync failed to authenticate at the %1 server. CSync n'a pu s'authentifier auprès du serveur %1. - + CSync failed to connect to the network. CSync n'a pu établir une connexion au réseau. - + A network connection timeout happened. - + A HTTP transmission error happened. Une erreur de transmission HTTP s'est produite. - + CSync failed due to not handled permission deniend. CSync a échoué en raison d'une erreur de permission non prise en charge. - + CSync failed to access Echec de CSync pour accéder - + CSync tried to create a directory that already exists. CSync a tenté de créer un répertoire déjà présent. - - + + CSync: No space on %1 server available. CSync : Aucun espace disponibla sur le serveur %1. - + CSync unspecified error. Erreur CSync inconnue. - + Aborted by the user Abandonné par l'utilisateur - + An internal error number %1 happened. Une erreur interne numéro %1 s'est produite. - + The item is not synced because of previous errors: %1 Cet élément n'a pas été synchronisé en raison des erreurs précédentes : %1 - + Symbolic links are not supported in syncing. Les liens symboliques ne sont pas supportés par la synchronisation. - + File is listed on the ignore list. Le fichier est présent dans la liste de fichiers à ignorer. - + File contains invalid characters that can not be synced cross platform. Le fichier contient des caractères invalides qui ne peuvent être synchronisés entre plate-formes. - + Unable to initialize a sync journal. Impossible d'initialiser un journal de synchronisation. - + Cannot open the sync journal Impossible d'ouvrir le journal de synchronisation - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory Non autorisé parce-que vous n'avez pas la permission d'ajouter des fichiers dans ce dossier - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only Déplacement non autorisé car %1 est en mode lecture seule - + the destination la destination - + the source la source @@ -2027,8 +2040,8 @@ Il est déconseillé de l'utiliser. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2165,6 +2178,14 @@ Il est déconseillé de l'utiliser. À jour + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2405,7 +2426,7 @@ Il est déconseillé de l'utiliser. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Si vous n'avez pas encore de serveur ownCloud, consultez <a href="https://owncloud.com">owncloud.com</a> pour obtenir plus d'informations. @@ -2414,15 +2435,10 @@ Il est déconseillé de l'utiliser. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> <p><small>Construit à partir de la révision Git <a href="%1">%2</a> du %3, %4 en utilisant Qt %5.</small><p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts index 95a0630674..e3ba0f8353 100644 --- a/translations/mirall_gl.ts +++ b/translations/mirall_gl.ts @@ -63,17 +63,22 @@ Formulario - + + Selective Sync... + + + + Account Maintenance Mantemento da conta - + Edit Ignored Files Editar ficheiros ignorados - + Modify Account Modificar a conta @@ -89,7 +94,7 @@ - + Pause Pausa @@ -104,111 +109,111 @@ Engadir un cartafol... - + Storage Usage Uso do almacenamento - + Retrieving usage information... Recuperando información de uso... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Nota:</b> Algúns cartafoles, como os cartafoles de rede montados ou os compartidos, poden ten diferentes límites. - + Resume Continuar - + Confirm Folder Remove Confirmar a eliminación do cartafol - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Confirma que quere deter a sincronización do cartafol <i>%1</i>?</p><p><b>Nota:</b> Isto non retirará os ficheiros no seu cliente.</p> - + Confirm Folder Reset Confirmar o restabelecemento do cartafol - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Confirma que quere restabelecer o cartafol <i>%1</i> e reconstruír as súa base datos no cliente?</p><p><b>Nota:</b> Esta función está deseñada só para fins de mantemento. Non se retirará ningún ficheiro, porén, isto pode xerar un tráfico de datos significativo e levarlle varios minutos ou horas en completarse, dependendo do tamaño do cartafol. Utilice esta opción só se o aconsella o administrador.</p> - + Discovering %1 Atopando %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. Espazo usado do servidor %1 (%3%) de %2. - + No connection to %1 at <a href="%2">%3</a>. Sen conexión con %1 en <a href="%2">%3</a>. - + No %1 connection configured. Non se configurou a conexión %1. - + Sync Running Sincronización en proceso - + No account configured. Non hai contas configuradas. - + The syncing operation is running.<br/>Do you want to terminate it? Estase realizando a sincronización.<br/>Quere interrompela e rematala? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 de %4) restan %5 a unha taxa de %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 de %2, ficheiro %3 of %4 Tempo total restante %5 - + Connected to <a href="%1">%2</a>. Conectado a <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Conectado a <a href="%1">%2</a> como <i>%3</i>. - + Currently there is no storage usage information available. Actualmente non hai dispoñíbel ningunha información sobre o uso do almacenamento. @@ -353,7 +358,7 @@ Tempo total restante %5 Actividade de sincronización - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -362,17 +367,17 @@ Isto podería ser debido a que o cartafol foi reconfigurado en silencio, ou a qu Confirma que quere realizar esta operación? - + Remove All Files? Retirar todos os ficheiros? - + Remove all files Retirar todos os ficheiros - + Keep files Manter os ficheiros @@ -390,52 +395,52 @@ Confirma que quere realizar esta operación? Atopouse un rexistro de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningunha aplicación. - + Undefined State. Estado sen definir. - + Waits to start syncing. Agardando polo comezo da sincronización. - + Preparing for sync. Preparando para sincronizar. - + Sync is running. Estase sincronizando. - + Last Sync was successful. A última sincronización fíxose correctamente. - + Last Sync was successful, but with warnings on individual files. A última sincronización fíxose correctamente, mais con algún aviso en ficheiros individuais. - + Setup Error. Erro de configuración. - + User Abort. Interrompido polo usuario. - + Sync is paused. Sincronización en pausa. - + %1 (Sync is paused) %1 (sincronización en pausa) @@ -462,8 +467,8 @@ Confirma que quere realizar esta operación? Mirall::FolderWizard - - + + Add Folder Engadir un cartafol @@ -471,67 +476,67 @@ Confirma que quere realizar esta operación? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Prema para escoller un cartafol local para sincronizar. - + Enter the path to the local folder. Escriba a ruta ao cartafol local. - + The directory alias is a descriptive name for this sync connection. O alias de directorio é un nome descritivo para esta conexión de sincronización. - + No valid local folder selected! Non seleccionou ningún cartafol local correcto! - + You have no permission to write to the selected folder! Vostede non ten permiso para escribir neste cartafol! - + The local path %1 is already an upload folder. Please pick another one! A ruta local %1 xa é un cartafol de envío. Escolla outro! - + An already configured folder is contained in the current entry. Xa hai un cartafol configurado que xa está dentro da entrada actual. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. O cartafol seleccionado é unha ligazón simbólica. Xa hai un cartafol configurado no cartafol ao que apunta esta ligazón. - + An already configured folder contains the currently entered folder. Xa hai un cartafol configurado que contén o cartafol que foi indicado. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. O cartafol seleccionado é unha ligazón simbólica. Un cartafol xa configurado é o pai do seleccionado actualmente e contén o cartafol ao que apunta esta ligazón. - + The alias can not be empty. Please provide a descriptive alias word. O alcume non pode deixarse baleiro. Déalle un alcume que sexa descritivo. - + The alias <i>%1</i> is already in use. Please pick another alias. O alcume <i>%1</> xa está a seren usado. Escolla outro alcume. - + Select the source folder Escolla o cartafol de orixe @@ -539,51 +544,59 @@ Confirma que quere realizar esta operación? Mirall::FolderWizardRemotePath - + Add Remote Folder Engadir un cartafol remoto - + Enter the name of the new folder: Introduza o nome do novo cartafol: - + Folder was successfully created on %1. Creouse correctamente o cartafol en %1. - + Failed to create the folder on %1. Please check manually. Non foi posíbel crear o cartafol en %1. Compróbeo manualmente. - + Choose this to sync the entire account Escolla isto para sincronizar toda a conta - + This folder is already being synced. Este cartafol xa está sincronizado. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. Xa está a sincronizar <i>%1</i>, é o cartafol pai de <i>%2</i>. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. Xa se están a sincronizar todos os ficheiros. Isto <b>non</b> é compatíbel co sincronización doutro cartafol. Se quere sincronizar varios cartafoles, retire a sincronización do cartafol raíz configurado actualmente. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Aviso:</b> @@ -1335,7 +1348,7 @@ Recomendámoslle que non o use. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash Non é posíbel renomear o ficheiro %1 como %2 por mor dunha colisión co nome dun ficheiro local @@ -1351,17 +1364,17 @@ Recomendámoslle que non o use. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Non é posíbel renomear este cartafol. Non se lle cambiou o nome, mantense o orixinal. - + This folder must not be renamed. Please name it back to Shared. Non é posíbel renomear este cartafol. Devólvalle o nome ao compartido. - + The file was renamed but is part of a read only share. The original file was restored. O ficheiro foi renomeado mais é parte dunha compartición de só lectura. O ficheiro orixinal foi restaurado. @@ -1789,229 +1802,229 @@ Tente sincronizalos de novo. Mirall::SyncEngine - + Success. Correcto. - + CSync failed to create a lock file. Produciuse un fallo en CSync ao crear un ficheiro de bloqueo. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. Produciuse un fallo do Csync ao cargar ou crear o ficheiro de rexistro. Asegúrese de que ten permisos de lectura e escritura no directorio de sincronización local. - + CSync failed to write the journal file. Produciuse un fallo en CSync ao escribir o ficheiro de rexistro. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Non foi posíbel cargar o engadido %1 para CSync.<br/>Verifique a instalación!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. A diferenza de tempo neste cliente e diferente do tempo do sistema no servidor. Use o servido de sincronización de tempo (NTP) no servidor e nas máquinas cliente para que os tempos se manteñan iguais. - + CSync could not detect the filesystem type. CSync non pode detectar o tipo de sistema de ficheiros. - + CSync got an error while processing internal trees. CSync tivo un erro ao procesar árbores internas. - + CSync failed to reserve memory. Produciuse un fallo ao reservar memoria para CSync. - + CSync fatal parameter error. Produciuse un erro fatal de parámetro CSync. - + CSync processing step update failed. Produciuse un fallo ao procesar o paso de actualización de CSync. - + CSync processing step reconcile failed. Produciuse un fallo ao procesar o paso de reconciliación de CSync. - + CSync processing step propagate failed. Produciuse un fallo ao procesar o paso de propagación de CSync. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Non existe o directorio de destino.</p><p>Comprobe a configuración da sincronización.</p> - + A remote file can not be written. Please check the remote access. Non é posíbel escribir un ficheiro remoto. Comprobe o acceso remoto. - + The local filesystem can not be written. Please check permissions. Non é posíbel escribir no sistema de ficheiros local. Comprobe os permisos. - + CSync failed to connect through a proxy. CSYNC no puido conectarse a través dun proxy. - + CSync could not authenticate at the proxy. CSync non puido autenticarse no proxy. - + CSync failed to lookup proxy or server. CSYNC no puido atopar o servidor proxy. - + CSync failed to authenticate at the %1 server. CSync non puido autenticarse no servidor %1. - + CSync failed to connect to the network. CSYNC no puido conectarse á rede. - + A network connection timeout happened. Excedeuse do tempo de espera para a conexión á rede. - + A HTTP transmission error happened. Produciuse un erro na transmisión HTTP. - + CSync failed due to not handled permission deniend. Produciuse un fallo en CSync por mor dun permiso denegado. - + CSync failed to access Produciuse un fallo ao acceder a CSync - + CSync tried to create a directory that already exists. CSYNC tenta crear un directorio que xa existe. - - + + CSync: No space on %1 server available. CSync: Non hai espazo dispoñíbel no servidor %1. - + CSync unspecified error. Produciuse un erro non especificado de CSync - + Aborted by the user Interrompido polo usuario - + An internal error number %1 happened. Produciuse un erro interno número %1 - + The item is not synced because of previous errors: %1 Este elemento non foi sincronizado por mor de erros anteriores: %1 - + Symbolic links are not supported in syncing. As ligazóns simbolicas non son admitidas nas sincronizacións - + File is listed on the ignore list. O ficheiro está na lista de ignorados. - + File contains invalid characters that can not be synced cross platform. O ficheiro conten caracteres incorrectos que non poden sincronizarse entre distintas plataformas. - + Unable to initialize a sync journal. Non é posíbel iniciar un rexistro de sincronización. - + Cannot open the sync journal Non foi posíbel abrir o rexistro de sincronización - + Not allowed because you don't have permission to add sub-directories in that directory Non está permitido xa que non ten permiso para engadir subdirectorios nese directorio - + Not allowed because you don't have permission to add parent directory Non está permitido xa que non ten permiso para engadir un directorio pai - + Not allowed because you don't have permission to add files in that directory Non está permitido xa que non ten permiso para engadir ficheiros nese directorio - + Not allowed to upload this file because it is read-only on the server, restoring Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando - - + + Not allowed to remove, restoring Non está permitido retiralo, restaurando - + Move not allowed, item restored Nos está permitido movelo, elemento restaurado - + Move not allowed because %1 is read-only Bon está permitido movelo xa que %1 é só de lectura - + the destination o destino - + the source a orixe @@ -2027,9 +2040,9 @@ Tente sincronizalos de novo. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - <p>Versión %1 Para obter máis información vexa <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distribuído por %4 e licenciado baixo a Licenza Pública Xeral (GPL) Versión 2.0.<br>Os logotipos %5 e %5 son marcas rexistradas de %4 nos<br>Estados Unidos de Norte América e/ou outros países.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2165,6 +2178,14 @@ Tente sincronizalos de novo. Actualizado + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2405,7 +2426,7 @@ Tente sincronizalos de novo. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Se aínda non ten un servidor ownCloud, vexa <a href="https://owncloud.com">owncloud.com</a> para obter máis información. @@ -2414,15 +2435,10 @@ Tente sincronizalos de novo. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> <p><small>Construído a partir de la revisión Git <a href="%1">%2</a> on %3, %4 usando Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts index e65a6261d0..bdeeb6b6f0 100644 --- a/translations/mirall_hu.ts +++ b/translations/mirall_hu.ts @@ -63,17 +63,22 @@ Űrlap - + + Selective Sync... + + + + Account Maintenance Fiókkarbantartás - + Edit Ignored Files Kihagyott fájlok szerkesztése - + Modify Account Fiók módosítása @@ -89,7 +94,7 @@ - + Pause Szünet @@ -104,110 +109,110 @@ - + Storage Usage Tárhelyhasználat - + Retrieving usage information... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. - + Resume Folytatás - + Confirm Folder Remove Könyvtár törlésének megerősítése - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> - + Confirm Folder Reset - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. - + Sync Running Szinkronizálás fut - + No account configured. Nincs beállított kapcsolat. - + The syncing operation is running.<br/>Do you want to terminate it? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. @@ -352,24 +357,24 @@ Total time left %5 - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? - + Remove All Files? El legyen távolítva az összes fájl? - + Remove all files Összes fájl eltávolítása - + Keep files Fájlok megtartása @@ -387,52 +392,52 @@ Are you sure you want to perform this operation? - + Undefined State. Ismeretlen állapot. - + Waits to start syncing. Várakozás a szinkronizálás elindítására. - + Preparing for sync. Előkészítés szinkronizációhoz. - + Sync is running. Szinkronizálás fut. - + Last Sync was successful. Legutolsó szinkronizálás sikeres volt. - + Last Sync was successful, but with warnings on individual files. - + Setup Error. Beállítás hiba. - + User Abort. - + Sync is paused. Szinkronizálás megállítva. - + %1 (Sync is paused) @@ -459,8 +464,8 @@ Are you sure you want to perform this operation? Mirall::FolderWizard - - + + Add Folder Mappa hozzáadása @@ -468,67 +473,67 @@ Are you sure you want to perform this operation? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. - + Enter the path to the local folder. - + The directory alias is a descriptive name for this sync connection. - + No valid local folder selected! - + You have no permission to write to the selected folder! - + The local path %1 is already an upload folder. Please pick another one! - + An already configured folder is contained in the current entry. Egy már beállított mappa szerepel a jelen bejegyzésben. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. - + An already configured folder contains the currently entered folder. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. - + The alias can not be empty. Please provide a descriptive alias word. Az álnév nem lehet üres. Adjon meg egy leíró álnevet. - + The alias <i>%1</i> is already in use. Please pick another alias. - + Select the source folder Forrás könyvtár kiválasztása @@ -536,51 +541,59 @@ Are you sure you want to perform this operation? Mirall::FolderWizardRemotePath - + Add Remote Folder Távoli mappa hozzáadása - + Enter the name of the new folder: Adja meg az új mappa nevét: - + Folder was successfully created on %1. A mappa sikeresen létrehozva: %1. - + Failed to create the folder on %1. Please check manually. - + Choose this to sync the entire account - + This folder is already being synced. Ez a mappa már szinkronizálva van. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> @@ -1328,7 +1341,7 @@ It is not advisable to use it. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash @@ -1344,17 +1357,17 @@ It is not advisable to use it. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. - + This folder must not be renamed. Please name it back to Shared. - + The file was renamed but is part of a read only share. The original file was restored. @@ -1779,229 +1792,229 @@ It is not advisable to use it. Mirall::SyncEngine - + Success. Sikerült. - + CSync failed to create a lock file. A CSync nem tudott létrehozni lock fájlt. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. - + CSync failed to write the journal file. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Az %1 beépülőmodul a csync-hez nem tölthető be.<br/>Ellenőrizze a telepítést!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. A helyi rendszeridő különbözik a kiszolgáló rendszeridejétől. Használjon időszinkronizációs szolgáltatást (NTP) a rendszerén és a szerveren is, hogy az idő mindig megeggyezzen. - + CSync could not detect the filesystem type. A CSync nem tudta megállapítani a fájlrendszer típusát. - + CSync got an error while processing internal trees. A CSync hibába ütközött a belső adatok feldolgozása közben. - + CSync failed to reserve memory. Hiba a CSync memórifoglalásakor. - + CSync fatal parameter error. CSync hibás paraméterhiba. - + CSync processing step update failed. CSync frissítés feldolgozása meghíusult. - + CSync processing step reconcile failed. CSync egyeztetési lépés meghíusult. - + CSync processing step propagate failed. CSync propagálási lépés meghíusult. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>A célmappa nem létezik.</p><p>Ellenőrizze a sync beállításait.</p> - + A remote file can not be written. Please check the remote access. Egy távoli fájl nem írható. Kérlek, ellenőrizd a távoli elérést. - + The local filesystem can not be written. Please check permissions. A helyi fájlrendszer nem írható. Kérlek, ellenőrizd az engedélyeket. - + CSync failed to connect through a proxy. CSync proxy kapcsolódási hiba. - + CSync could not authenticate at the proxy. - + CSync failed to lookup proxy or server. A CSync nem találja a proxy kiszolgálót. - + CSync failed to authenticate at the %1 server. A CSync nem tuja azonosítani magát a %1 kiszolgálón. - + CSync failed to connect to the network. CSync hálózati kapcsolódási hiba. - + A network connection timeout happened. - + A HTTP transmission error happened. HTTP átviteli hiba történt. - + CSync failed due to not handled permission deniend. CSync hiba, nincs kezelési jogosultság. - + CSync failed to access - + CSync tried to create a directory that already exists. A CSync megpróbált létrehozni egy már létező mappát. - - + + CSync: No space on %1 server available. CSync: Nincs szabad tárhely az %1 kiszolgálón. - + CSync unspecified error. CSync ismeretlen hiba. - + Aborted by the user - + An internal error number %1 happened. - + The item is not synced because of previous errors: %1 - + Symbolic links are not supported in syncing. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2017,8 +2030,8 @@ It is not advisable to use it. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2155,6 +2168,14 @@ It is not advisable to use it. Frissítve + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2395,7 +2416,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! @@ -2404,15 +2425,10 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts index 4b58ea728d..eba422c815 100644 --- a/translations/mirall_it.ts +++ b/translations/mirall_it.ts @@ -63,17 +63,22 @@ Modulo - + + Selective Sync... + + + + Account Maintenance Gestione account - + Edit Ignored Files Modifica file ignorati - + Modify Account Modifica account @@ -89,7 +94,7 @@ - + Pause Pausa @@ -104,111 +109,111 @@ Aggiungi cartella... - + Storage Usage Utilizzo archiviazione - + Retrieving usage information... Recupero delle informazioni di utilizzo in corso... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Nota:</b> alcune cartelle, incluse le cartelle montate o condivise in rete, potrebbero avere limiti diversi. - + Resume Riprendi - + Confirm Folder Remove Conferma la rimozione della cartella - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Vuoi davvero fermare la sincronizzazione della cartella <i>%1</i>?</p><p><b>Nota:</b> ciò non rimuoverà i file dal tuo client.</p> - + Confirm Folder Reset Conferma il ripristino della cartella - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Vuoi davvero ripristinare la cartella <i>%1</i> e ricostruire il database del client?</p><p><b>Nota:</b> questa funzione è destinata solo a scopi di manutenzione. Nessun file sarà rimosso, ma può causare un significativo traffico di dati e richiedere diversi minuti oppure ore, in base alla dimensione della cartella. Utilizza questa funzione solo se consigliata dal tuo amministratore.</p> - + Discovering %1 Rilevamento %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) di %2 spazio in uso sul server. - + No connection to %1 at <a href="%2">%3</a>. Nessuna connessione a %1 su <a href="%2">%3</a>. - + No %1 connection configured. Nessuna connessione di %1 configurata. - + Sync Running La sincronizzazione è in corso - + No account configured. Nessun account configurato. - + The syncing operation is running.<br/>Do you want to terminate it? L'operazione di sincronizzazione è in corso.<br/>Vuoi terminarla? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 di %4). %5 rimanenti a una velocità di %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 di %2, file %3 di %4 Totale tempo rimanente %5 - + Connected to <a href="%1">%2</a>. Connesso a <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Connesso a <a href="%1">%2</a> come <i>%3</i>. - + Currently there is no storage usage information available. Non ci sono informazioni disponibili sull'utilizzo dello spazio di archiviazione. @@ -353,7 +358,7 @@ Totale tempo rimanente %5 Sincronizza attività - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -362,17 +367,17 @@ Ciò potrebbe accadere in caso di riconfigurazione della cartella o di rimozione Sei sicuro di voler eseguire questa operazione? - + Remove All Files? Vuoi rimuovere tutti i file? - + Remove all files Rimuovi tutti i file - + Keep files Mantieni i file @@ -390,52 +395,52 @@ Sei sicuro di voler eseguire questa operazione? È stato trovato un vecchio registro di sincronizzazione '%1', ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando. - + Undefined State. Stato non definito. - + Waits to start syncing. Attende l'inizio della sincronizzazione. - + Preparing for sync. Preparazione della sincronizzazione. - + Sync is running. La sincronizzazione è in corso. - + Last Sync was successful. L'ultima sincronizzazione è stato completata correttamente. - + Last Sync was successful, but with warnings on individual files. Ultima sincronizzazione avvenuta, ma con avvisi relativi a singoli file. - + Setup Error. Errore di configurazione. - + User Abort. Interrotto dall'utente. - + Sync is paused. La sincronizzazione è sospesa. - + %1 (Sync is paused) %1 (La sincronizzazione è sospesa) @@ -462,8 +467,8 @@ Sei sicuro di voler eseguire questa operazione? Mirall::FolderWizard - - + + Add Folder Aggiungi cartella @@ -471,67 +476,67 @@ Sei sicuro di voler eseguire questa operazione? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Fai clic per selezionare una cartella locale da sincronizzare. - + Enter the path to the local folder. Digita il percorso della cartella locale. - + The directory alias is a descriptive name for this sync connection. L'alias della cartella è un nome descrittivo per questa connessione di sincronizzazione. - + No valid local folder selected! Non è stata selezionata una cartella valida! - + You have no permission to write to the selected folder! Non hai i permessi di scrittura per la cartella selezionata! - + The local path %1 is already an upload folder. Please pick another one! Il percorso locale %1 è già una cartella di caricamento. Selezionane un altro! - + An already configured folder is contained in the current entry. Una cartella già configurata è contenuta nella voce corrente. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. La cartella selezionata è un collegamento simbolico. Una cartella già configurata è contenuta nella cartella alla quale punta questo collegamento. - + An already configured folder contains the currently entered folder. Una cartella già configurata contiene la cartella appena digitata. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. La cartella selezionata è un collegamento simbolico. Una cartella già configurata è contenuta nella cartella alla quale punta questo collegamento. - + The alias can not be empty. Please provide a descriptive alias word. L'alias non può essere vuoto. Fornisci un alias significativo. - + The alias <i>%1</i> is already in use. Please pick another alias. L'alias <i>%1</i> è già in uso. Scegli un altro alias. - + Select the source folder Seleziona la cartella di origine @@ -539,51 +544,59 @@ Sei sicuro di voler eseguire questa operazione? Mirall::FolderWizardRemotePath - + Add Remote Folder Aggiungi cartella remota - + Enter the name of the new folder: Digita il nome della nuova cartella: - + Folder was successfully created on %1. La cartella è stata creata correttamente su %1. - + Failed to create the folder on %1. Please check manually. Non è stato possibile creare la cartella su %1. Controlla manualmente. - + Choose this to sync the entire account Selezionala per sincronizzare l'intero account - + This folder is already being synced. Questa cartella è già sincronizzata. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. Stai già sincronizzando <i>%1</i>, che è la cartella superiore di <i>%2</i>. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. Stai già sincronizzando tutti i tuoi file. La sincronizzazione di un'altra cartella <b>non</b> è supportata. Se vuoi sincronizzare più cartelle, rimuovi la configurazione della cartella principale di sincronizzazione. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Avviso:</b> @@ -1334,7 +1347,7 @@ Non è consigliabile utilizzarlo. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash Il file %1 non può essere rinominato in %2 a causa di un conflitto con il nome di un file locale @@ -1350,17 +1363,17 @@ Non è consigliabile utilizzarlo. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Questa cartella non può essere rinominata. Il nome originale è stato ripristinato. - + This folder must not be renamed. Please name it back to Shared. Questa cartella non può essere rinominata. Ripristina il nome Shared. - + The file was renamed but is part of a read only share. The original file was restored. Il file è stato rinominato, ma è parte di una condivisione in sola lettura. Il file originale è stato ripristinato. @@ -1788,229 +1801,229 @@ Prova a sincronizzare nuovamente. Mirall::SyncEngine - + Success. Successo. - + CSync failed to create a lock file. CSync non è riuscito a creare il file di lock. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync non è riuscito a caricare o a creare il file di registro. Assicurati di avere i permessi di lettura e scrittura nella cartella di sincronizzazione locale. - + CSync failed to write the journal file. CSync non è riuscito a scrivere il file di registro. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Il plugin %1 per csync non può essere caricato.<br/>Verifica l'installazione!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. L'ora di sistema su questo client è diversa dall'ora di sistema del server. Usa un servizio di sincronizzazione dell'orario (NTP) sul server e sulle macchine client in modo che l'ora sia la stessa. - + CSync could not detect the filesystem type. CSync non è riuscito a individuare il tipo di filesystem. - + CSync got an error while processing internal trees. Errore di CSync durante l'elaborazione degli alberi interni. - + CSync failed to reserve memory. CSync non è riuscito a riservare la memoria. - + CSync fatal parameter error. Errore grave di parametro di CSync. - + CSync processing step update failed. La fase di aggiornamento di CSync non è riuscita. - + CSync processing step reconcile failed. La fase di riconciliazione di CSync non è riuscita. - + CSync processing step propagate failed. La fase di propagazione di CSync non è riuscita. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>La cartella di destinazione non esiste.</p><p>Controlla la configurazione della sincronizzazione.</p> - + A remote file can not be written. Please check the remote access. Un file remoto non può essere scritto. Controlla l'accesso remoto. - + The local filesystem can not be written. Please check permissions. Il filesystem locale non può essere scritto. Controlla i permessi. - + CSync failed to connect through a proxy. CSync non è riuscito a connettersi tramite un proxy. - + CSync could not authenticate at the proxy. CSync non è in grado di autenticarsi al proxy. - + CSync failed to lookup proxy or server. CSync non è riuscito a trovare un proxy o server. - + CSync failed to authenticate at the %1 server. CSync non è riuscito ad autenticarsi al server %1. - + CSync failed to connect to the network. CSync non è riuscito a connettersi alla rete. - + A network connection timeout happened. Si è verificato un timeout della connessione di rete. - + A HTTP transmission error happened. Si è verificato un errore di trasmissione HTTP. - + CSync failed due to not handled permission deniend. Problema di CSync dovuto alla mancata gestione dei permessi. - + CSync failed to access CSync non è riuscito ad accedere - + CSync tried to create a directory that already exists. CSync ha cercato di creare una cartella già esistente. - - + + CSync: No space on %1 server available. CSync: spazio insufficiente sul server %1. - + CSync unspecified error. Errore non specificato di CSync. - + Aborted by the user Interrotto dall'utente - + An internal error number %1 happened. SI è verificato un errore interno numero %1. - + The item is not synced because of previous errors: %1 L'elemento non è sincronizzato a causa dell'errore precedente: %1 - + Symbolic links are not supported in syncing. I collegamenti simbolici non sono supportati dalla sincronizzazione. - + File is listed on the ignore list. Il file è stato aggiunto alla lista ignorati. - + File contains invalid characters that can not be synced cross platform. Il file contiene caratteri non validi che non possono essere sincronizzati su diverse piattaforme. - + Unable to initialize a sync journal. Impossibile inizializzare il registro di sincronizzazione. - + Cannot open the sync journal Impossibile aprire il registro di sincronizzazione - + Not allowed because you don't have permission to add sub-directories in that directory Non consentito poiché non disponi dei permessi per aggiungere sottocartelle in quella cartella - + Not allowed because you don't have permission to add parent directory Non consentito poiché non disponi dei permessi per aggiungere la cartella superiore - + Not allowed because you don't have permission to add files in that directory Non consentito poiché non disponi dei permessi per aggiungere file in quella cartella - + Not allowed to upload this file because it is read-only on the server, restoring Il caricamento di questo file non è consentito poiché è in sola lettura sul server, ripristino - - + + Not allowed to remove, restoring Rimozione non consentita, ripristino - + Move not allowed, item restored Spostamento non consentito, elemento ripristinato - + Move not allowed because %1 is read-only Spostamento non consentito poiché %1 è in sola lettura - + the destination la destinazione - + the source l'origine @@ -2026,9 +2039,9 @@ Prova a sincronizzare nuovamente. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - <p>Versione %1 Per ulteriori informazioni, visita <a href='%2'>%3</a>. </p><p>Copyright ownCloud, Inc.<p><p>Distribuito da %4 e sotto licenza GNU General Public License (GPL) versione 2.0.<br>%5 e il logo di %5 sono marchi registrati di %4 negli Stati Uniti, in altri paesi, o entrambi.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2164,6 +2177,14 @@ Prova a sincronizzare nuovamente. Aggiornato + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2404,7 +2425,7 @@ Prova a sincronizzare nuovamente. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Se non hai ancora un server ownCloud, visita <a href="https://owncloud.com">owncloud.com</a> per ulteriori informazioni. @@ -2413,15 +2434,10 @@ Prova a sincronizzare nuovamente. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> <p><small>Compilato dalla revisione Git <a href="%1">%2</a> il %3, %4 utilizzando Qt %5.</small><p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts index b6b607ce82..7dd0335d51 100644 --- a/translations/mirall_ja.ts +++ b/translations/mirall_ja.ts @@ -63,17 +63,22 @@ フォーム - + + Selective Sync... + + + + Account Maintenance アカウントの管理 - + Edit Ignored Files 除外ファイルリストを編集 - + Modify Account アカウントを修正 @@ -89,7 +94,7 @@ - + Pause 一時停止 @@ -104,111 +109,111 @@ フォルダーを追加… - + Storage Usage ストレージ利用状況 - + Retrieving usage information... 利用状況を取得中... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>注:</b> 外部ネットワークストレージや共有フォルダーを含むフォルダーの場合は、容量の上限値が異なる可能性があります。 - + Resume 再開 - + Confirm Folder Remove フォルダーの削除を確認 - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>フォルダー<i>%1</i>の同期を本当に止めますか？</p><p><b>注:</b> これによりクライアントからファイルが削除されることはありません。</p> - + Confirm Folder Reset フォルダーのリセットを確認 - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>本当にフォルダー <i>%1</i> をリセットしてクライアントのデータベースを再構築しますか?</p><p><b>注意:</b>この機能は保守目的のためだけにデザインされています。ファイルは削除されませんが、完了するまでにデータ通信が明らかに増大し、数分、あるいはフォルダーのサイズによっては数時間かかります。このオプションは管理者に指示された場合にのみ使用してください。 - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) / %2 使用中のサーバー領域 - + No connection to %1 at <a href="%2">%3</a>. <a href="%2">%3</a> に %1 への接続がありません。 - + No %1 connection configured. %1 の接続は設定されていません。 - + Sync Running 同期を実行中 - + No account configured. アカウントが未設定です。 - + The syncing operation is running.<br/>Do you want to terminate it? 同期作業を実行中です。<br/>終了しますか？ - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%4 中 %3) 残り時間 %5 利用帯域 %6/s - + %1 of %2, file %3 of %4 Total time left %5 %2 のうち %1 , ファイル %4 のうち %3 残り時間 %5 - + Connected to <a href="%1">%2</a>. <a href="%1">%2</a> へ接続しました。 - + Connected to <a href="%1">%2</a> as <i>%3</i>. <a href="%1">%2</a> に <i>%3</i> として接続 - + Currently there is no storage usage information available. 現在、利用できるストレージ利用状況はありません。 @@ -353,7 +358,7 @@ Total time left %5 同期アクティビティ - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -362,17 +367,17 @@ Are you sure you want to perform this operation? 本当にこの操作を実行しますか？ - + Remove All Files? すべてのファイルを削除しますか？ - + Remove all files すべてのファイルを削除 - + Keep files ファイルを残す @@ -390,52 +395,52 @@ Are you sure you want to perform this operation? 古い同期ジャーナル '%1' が見つかりましたが、削除できませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。 - + Undefined State. 未定義の状態。 - + Waits to start syncing. 同期開始を待機中 - + Preparing for sync. 同期の準備中。 - + Sync is running. 同期を実行中です。 - + Last Sync was successful. 最後の同期は成功しました。 - + Last Sync was successful, but with warnings on individual files. 最新の同期は成功しました。しかし、いくつかのファイルで問題がありました。 - + Setup Error. 設定エラー。 - + User Abort. ユーザーによる中止。 - + Sync is paused. 同期を一時停止しました。 - + %1 (Sync is paused) %1 (同期を一時停止) @@ -462,8 +467,8 @@ Are you sure you want to perform this operation? Mirall::FolderWizard - - + + Add Folder フォルダーを追加 @@ -471,67 +476,67 @@ Are you sure you want to perform this operation? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. 同期したいローカルフォルダーをクリックしてください。 - + Enter the path to the local folder. ローカルフォルダーのパスを入力してください。 - + The directory alias is a descriptive name for this sync connection. このディレクトリのエイリアスは、この同期接続用の記述名です。 - + No valid local folder selected! 有効なローカルフォルダーが選択されていません！ - + You have no permission to write to the selected folder! 選択されたフォルダーに書き込み権限がありません - + The local path %1 is already an upload folder. Please pick another one! ローカルパス %1 はアップロードフォルダーです。他のフォルダーを選択してください。 - + An already configured folder is contained in the current entry. すでに設定済みのフォルダーは現在のエントリー内に含まれています。 - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. 選択したフォルダーはシンボリックリンクです。このリンクの参照先のフォルダーには、すでに登録されているフォルダーが含まれます。 - + An already configured folder contains the currently entered folder. すでに設定済みのフォルダーには、現在入力されたフォルダーが含まれています。 - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. 選択されたフォルダーはシンボリックリンクです。このリンクが指している参照元フォルダーを含んだ親フォルダがすでに登録されています。 - + The alias can not be empty. Please provide a descriptive alias word. エイリアスは空白にすることはできません。適切な単語をエイリアスとして提供してください。 - + The alias <i>%1</i> is already in use. Please pick another alias. エイリアス <i>%1</i> はすでに使われています。他のエイリアスを選択してください。 - + Select the source folder ソースフォルダーを選択 @@ -539,51 +544,59 @@ Are you sure you want to perform this operation? Mirall::FolderWizardRemotePath - + Add Remote Folder リモートフォルダーを追加 - + Enter the name of the new folder: 新しいフォルダー名を入力: - + Folder was successfully created on %1. %1 にフォルダーが作成されました。 - + Failed to create the folder on %1. Please check manually. %1 にフォルダーを作成できませんでした。手作業で確認してください。 - + Choose this to sync the entire account アカウント全体を同期する場合はこちらを選択 - + This folder is already being synced. このフォルダーはすでに同期されています。 - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. <i>%1</i>は、<i>%2</i>の親フォルダーですでに同期しています。 - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. すべてのファイルはすでに同期されています。他のフォルダーの同期は<b>サポートしていません</>。複数のフォルダーを同期したい場合は、現在設定されているルートフォルダー同期設定を削除してください。 + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>警告:</b> @@ -1333,7 +1346,7 @@ It is not advisable to use it. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash ファイル %1 はローカルファイル名が衝突しているため %2 に名前を変更できません @@ -1349,17 +1362,17 @@ It is not advisable to use it. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. このフォルダー名は変更できません。元の名前に戻します。 - + This folder must not be renamed. Please name it back to Shared. このフォルダー名は変更できません。名前を Shared に戻してください。 - + The file was renamed but is part of a read only share. The original file was restored. ファイルの名前が変更されましたが、読み込み専用の共有の一部です。オリジナルのファイルが復元されました。 @@ -1787,229 +1800,229 @@ It is not advisable to use it. Mirall::SyncEngine - + Success. 成功。 - + CSync failed to create a lock file. CSyncがロックファイルの作成に失敗しました。 - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSyncはジャーナルファイルの読み込みや作成に失敗しました。ローカルの同期ディレクトリに読み書きの権限があるか確認してください。 - + CSync failed to write the journal file. CSyncはジャーナルファイルの書き込みに失敗しました。 - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>csync 用の %1 プラグインをロードできませんでした。<br/>インストール状態を確認してください！</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. このクライアントのシステム時刻はサーバーのシステム時刻と異なります。時刻が同じになるように、クライアントとサーバーの両方で時刻同期サービス(NTP)を実行してください。 - + CSync could not detect the filesystem type. CSyncはファイルシステムタイプを検出できませんでした。 - + CSync got an error while processing internal trees. CSyncは内部ツリーの処理中にエラーに遭遇しました。 - + CSync failed to reserve memory. CSyncで使用するメモリの確保に失敗しました。 - + CSync fatal parameter error. CSyncの致命的なパラメータエラーです。 - + CSync processing step update failed. CSyncの処理ステップの更新に失敗しました。 - + CSync processing step reconcile failed. CSyncの処理ステップの調停に失敗しました。 - + CSync processing step propagate failed. CSyncの処理ステップの伝播に失敗しました。 - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>ターゲットディレクトリは存在しません。</p><p>同期設定を確認してください。</p> - + A remote file can not be written. Please check the remote access. リモートファイルは書き込みできません。リモートアクセスをチェックしてください。 - + The local filesystem can not be written. Please check permissions. ローカルファイルシステムは書き込みができません。パーミッションをチェックしてください。 - + CSync failed to connect through a proxy. CSyncがプロキシ経由での接続に失敗しました。 - + CSync could not authenticate at the proxy. CSyncはそのプロキシで認証できませんでした。 - + CSync failed to lookup proxy or server. CSyncはプロキシもしくはサーバーの参照に失敗しました。 - + CSync failed to authenticate at the %1 server. CSyncは %1 サーバーでの認証に失敗しました。 - + CSync failed to connect to the network. CSyncはネットワークへの接続に失敗しました。 - + A network connection timeout happened. ネットワーク接続のタイムアウトが発生しました。 - + A HTTP transmission error happened. HTTPの伝送エラーが発生しました。 - + CSync failed due to not handled permission deniend. CSyncは対応できないパーミッション拒否が原因で失敗しました。 - + CSync failed to access CSync はアクセスに失敗しました - + CSync tried to create a directory that already exists. CSyncはすでに存在するディレクトリを作成しようとしました。 - - + + CSync: No space on %1 server available. CSync: %1 サーバーには利用可能な空き領域がありません。 - + CSync unspecified error. CSyncの未指定のエラーです。 - + Aborted by the user ユーザーによって中止されました - + An internal error number %1 happened. 内部エラー番号 %1 が発生しました。 - + The item is not synced because of previous errors: %1 このアイテムは、以前にエラーが発生していたため同期させません: %1 - + Symbolic links are not supported in syncing. 同期の際にシンボリックリンクはサポートしていません - + File is listed on the ignore list. ファイルは除外リストに登録されています。 - + File contains invalid characters that can not be synced cross platform. ファイルに無効な文字が含まれているため、クロスプラットフォーム環境での同期ができません。 - + Unable to initialize a sync journal. 同期ジャーナルの初期化ができません。 - + Cannot open the sync journal 同期ジャーナルを開くことができません - + Not allowed because you don't have permission to add sub-directories in that directory そのディレクトリにサブディレクトリを追加する権限がありません - + Not allowed because you don't have permission to add parent directory 親ディレクトリを追加する権限がありません - + Not allowed because you don't have permission to add files in that directory そのディレクトリにファイルを追加する権限がありません - + Not allowed to upload this file because it is read-only on the server, restoring サーバーでは読み取り専用となっているため、このファイルをアップロードすることはできません、復元しています - - + + Not allowed to remove, restoring 削除できません、復元しています - + Move not allowed, item restored 移動できません、項目を復元しました - + Move not allowed because %1 is read-only %1 は読み取り専用のため移動できません - + the destination 移動先 - + the source 移動元 @@ -2025,8 +2038,8 @@ It is not advisable to use it. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2163,6 +2176,14 @@ It is not advisable to use it. 最新です + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2403,7 +2424,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! ownCloudサーバーをまだ所有していない場合は、<a href="https://owncloud.com">owncloud.com</a>で詳細を参照してください。 @@ -2412,15 +2433,10 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> <p><small><a href="%1">%2</a> %3, %4 のGitリビジョンからのビルド Qt %5 を利用</small><p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts index 289bc199ce..97ec414615 100644 --- a/translations/mirall_nl.ts +++ b/translations/mirall_nl.ts @@ -63,17 +63,22 @@ Formulier - + + Selective Sync... + + + + Account Maintenance Accountonderhoud - + Edit Ignored Files Bewerk genegeerde bestanden - + Modify Account Aanpassen account @@ -89,7 +94,7 @@ - + Pause Pauze @@ -104,111 +109,111 @@ Map toevoegen... - + Storage Usage Gebruik opslagruimte - + Retrieving usage information... Gebruiksinformatie wordt opgehaald ... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Opmerking:</b> Sommige mappen, waaronder netwerkmappen en gedeelde mappen, kunnen andere limieten hebben. - + Resume Hervatten - + Confirm Folder Remove Bevestig het verwijderen van de map - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Weet u zeker dat u de synchronisatie van map <i>%1</i> wilt stoppen?</p><p><b>Opmerking:</b> Dit zal de bestanden niet van uw computer verwijderen.</p> - + Confirm Folder Reset Bevestig map reset - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Wilt u map <i>%1</i> echt resetten en de database opnieuw opbouwen?</p><p><b>Let op:</b> Deze functie is alleen ontworpen voor onderhoudsdoeleinden. Hoewel er geen bestanden worden verwijderd, kan dit een aanzienlijke hoeveelheid dataverkeer tot gevolg hebben en minuten tot zelfs uren duren, afhankelijk van de omvang van de map. Gebruik deze functie alleen als dit wordt geadviseerd door uw applicatiebeheerder.</p> - + Discovering %1 %1 onderzoeken - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) van %2 serverruimte in gebruik. - + No connection to %1 at <a href="%2">%3</a>. Geen verbinding naar %1 op <a href="%2">%3</a>. - + No %1 connection configured. Geen %1 connectie geconfigureerd. - + Sync Running Bezig met synchroniseren - + No account configured. Geen account ingesteld. - + The syncing operation is running.<br/>Do you want to terminate it? Bezig met synchroniseren.<br/>Wil je stoppen met synchroniseren? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 of %4) %5 over bij een snelheid van %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 van %2, file %3 van %4 Totaal resterende tijd %5 - + Connected to <a href="%1">%2</a>. Verbonden met <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Verbonden met <a href="%1">%2</a> als <i>%3</i>. - + Currently there is no storage usage information available. Er is nu geen informatie over het gebruik van de opslagruimte beschikbaar. @@ -353,7 +358,7 @@ Totaal resterende tijd %5 Synchronisatie-activiteit - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -362,17 +367,17 @@ Dit kan komen doordat de map ongemerkt opnieuw geconfigureerd is of doordat alle Weet u zeker dat u deze bewerking wilt uitvoeren? - + Remove All Files? Verwijder alle bestanden? - + Remove all files Verwijder alle bestanden - + Keep files Bewaar bestanden @@ -390,52 +395,52 @@ Weet u zeker dat u deze bewerking wilt uitvoeren? Een oud synchronisatieverslag '%1' is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt. - + Undefined State. Ongedefiniëerde staat - + Waits to start syncing. In afwachting van synchronisatie. - + Preparing for sync. Synchronisatie wordt voorbereid - + Sync is running. Bezig met synchroniseren. - + Last Sync was successful. Laatste synchronisatie was succesvol. - + Last Sync was successful, but with warnings on individual files. Laatste synchronisatie geslaagd, maar met waarschuwingen over individuele bestanden. - + Setup Error. Installatiefout. - + User Abort. Afgebroken door gebruiker. - + Sync is paused. Synchronisatie gepauzeerd. - + %1 (Sync is paused) %1 (Synchronisatie onderbroken) @@ -462,8 +467,8 @@ Weet u zeker dat u deze bewerking wilt uitvoeren? Mirall::FolderWizard - - + + Add Folder Voeg map toe @@ -471,67 +476,67 @@ Weet u zeker dat u deze bewerking wilt uitvoeren? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Klikken om een lokale map te selecteren voor synchronisatie - + Enter the path to the local folder. Geef het pad op naar de lokale map. - + The directory alias is a descriptive name for this sync connection. De directory aliasnaam is een beschrijvende naam voor deze synchronisatieverbinding. - + No valid local folder selected! Geen geldige lokale map geselecteerd! - + You have no permission to write to the selected folder! U heeft geen permissie om te schrijven naar de geselecteerde map! - + The local path %1 is already an upload folder. Please pick another one! Het lokale pad %1 is al een uploadmap. Kies een andere. - + An already configured folder is contained in the current entry. Er bestaat een al eerder geconfigureerde map in de huidige opdracht. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. De gekozen map is een symbolic link. De map waarnaar deze link verwijst bevat een reeds geconfigureerde map. - + An already configured folder contains the currently entered folder. Een reeds geconfigureerde map bevat de nu ingevoerde map. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. De gekozen map is een symbolic link. Een reeds geconfigureerde map is de bovenliggende map van de gekozen map, waarnaar de link verwijst. - + The alias can not be empty. Please provide a descriptive alias word. De alias kan niet leeg zijn. Voer een beschrijvende alias in. - + The alias <i>%1</i> is already in use. Please pick another alias. De alias <i>%1</i> is al in gebruik. Kies een andere. - + Select the source folder Selecteer de bronmap @@ -539,51 +544,59 @@ Weet u zeker dat u deze bewerking wilt uitvoeren? Mirall::FolderWizardRemotePath - + Add Remote Folder Voeg externe map toe - + Enter the name of the new folder: Voer de naam in van de nieuwe map: - + Folder was successfully created on %1. Map is succesvol aangemaakt op %1. - + Failed to create the folder on %1. Please check manually. Aanmaken van de map op %1 mislukt. Controleer handmatig. - + Choose this to sync the entire account Kies dit om uw volledige account te synchroniseren - + This folder is already being synced. Deze map is al gesynchroniseerd. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. U synchroniseert <i>%1</i> al, dat is de bovenliggende map van <i>%2</i>. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. U bent al uw bestanden al aan het synchroniseren.Het synchroniseren van een andere map wordt <b>niet</b> ondersteund. Als u meerdere mappen wilt synchroniseren moet u de nu geconfigureerde synchronisatie hoofdmap verwijderen. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Waarschuwing:</b> @@ -1335,7 +1348,7 @@ We adviseren deze site niet te gebruiken. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash Bestand %1 kan niet worden hernoemd naar %2, omdat de naam conflicteert met een lokaal bestand @@ -1351,17 +1364,17 @@ We adviseren deze site niet te gebruiken. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Deze map mag niet worden hernoemd. De naam van de map is teruggezet naar de originele naam. - + This folder must not be renamed. Please name it back to Shared. Deze map mag niet worden hernoemd. Verander de naam terug in Gedeeld. - + The file was renamed but is part of a read only share. The original file was restored. Het bestand is hernoemd, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet. @@ -1789,229 +1802,229 @@ Probeer opnieuw te synchroniseren. Mirall::SyncEngine - + Success. Succes. - + CSync failed to create a lock file. CSync kon geen lock file maken. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync kon het journal bestand niet maken of lezen. Controleer of u de juiste lees- en schrijfrechten in de lokale syncmap hebt. - + CSync failed to write the journal file. CSync kon het journal bestand niet wegschrijven. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>De %1 plugin voor csync kon niet worden geladen.<br/>Verifieer de installatie!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. De systeemtijd van deze client wijkt af van de systeemtijd op de server. Gebruik een tijdsynchronisatieservice (NTP) op zowel de server als de client, zodat de machines dezelfde systeemtijd hebben. - + CSync could not detect the filesystem type. CSync kon het soort bestandssysteem niet bepalen. - + CSync got an error while processing internal trees. CSync kreeg een fout tijdens het verwerken van de interne mappenstructuur. - + CSync failed to reserve memory. CSync kon geen geheugen reserveren. - + CSync fatal parameter error. CSync fatale parameter fout. - + CSync processing step update failed. CSync verwerkingsstap bijwerken mislukt. - + CSync processing step reconcile failed. CSync verwerkingsstap verzamelen mislukt. - + CSync processing step propagate failed. CSync verwerkingsstap doorzetten mislukt. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>De doelmap bestaat niet.</p><p>Controleer de synchinstellingen.</p> - + A remote file can not be written. Please check the remote access. Een extern bestand kon niet worden weggeschreven. Controleer de externe rechten. - + The local filesystem can not be written. Please check permissions. Er kan niet worden geschreven naar het lokale bestandssysteem. Controleer de schrijfrechten. - + CSync failed to connect through a proxy. CSync kon niet verbinden via een proxy. - + CSync could not authenticate at the proxy. CSync kon niet authenticeren bij de proxy. - + CSync failed to lookup proxy or server. CSync kon geen proxy of server vinden. - + CSync failed to authenticate at the %1 server. CSync kon niet authenticeren bij de %1 server. - + CSync failed to connect to the network. CSync kon niet verbinden met het netwerk. - + A network connection timeout happened. Er trad een netwerk time-out op. - + A HTTP transmission error happened. Er trad een HTTP transmissiefout plaats. - + CSync failed due to not handled permission deniend. CSync mislukt omdat de benodigde toegang werd geweigerd. - + CSync failed to access CSync kreeg geen toegang - + CSync tried to create a directory that already exists. CSync probeerde een al bestaande directory aan te maken. - - + + CSync: No space on %1 server available. CSync: Geen ruimte op %1 server beschikbaar. - + CSync unspecified error. CSync ongedefinieerde fout. - + Aborted by the user Afgebroken door de gebruiker - + An internal error number %1 happened. Interne fout nummer %1 opgetreden. - + The item is not synced because of previous errors: %1 Dit onderwerp is niet gesynchroniseerd door eerdere fouten: %1 - + Symbolic links are not supported in syncing. Symbolic links worden niet ondersteund bij het synchroniseren. - + File is listed on the ignore list. De file is opgenomen op de negeerlijst. - + File contains invalid characters that can not be synced cross platform. Bestand bevat ongeldige karakters die niet tussen platformen gesynchroniseerd kunnen worden. - + Unable to initialize a sync journal. Niet in staat om een synchornisatie journaal te starten. - + Cannot open the sync journal Kan het sync journal niet openen - + Not allowed because you don't have permission to add sub-directories in that directory Niet toegestaan, omdat u geen rechten hebt om sub-directories aan te maken in die directory - + Not allowed because you don't have permission to add parent directory Niet toegestaan, omdat u geen rechten hebt om een bovenliggende directories toe te voegen - + Not allowed because you don't have permission to add files in that directory Niet toegestaan, omdat u geen rechten hebt om bestanden in die directory toe te voegen - + Not allowed to upload this file because it is read-only on the server, restoring Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen - - + + Not allowed to remove, restoring Niet toegestaan te verwijderen, herstellen - + Move not allowed, item restored Verplaatsen niet toegestaan, object hersteld - + Move not allowed because %1 is read-only Verplaatsen niet toegestaan omdat %1 alleen-lezen is - + the destination bestemming - + the source bron @@ -2027,9 +2040,9 @@ Probeer opnieuw te synchroniseren. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - <p>Versie %1 Voor meer informatie bezoekt u <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Gedistribueerd door %4 en verstrekt onder de GNU General Public License (GPL) Versie 2.0.<br>%5 en het %5 logo zijn geregistreerde handelsmerken van %4 in de Verenigde Staten, andere landen, of beide.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2165,6 +2178,14 @@ Probeer opnieuw te synchroniseren. Bijgewerkt + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2405,7 +2426,7 @@ Probeer opnieuw te synchroniseren. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Bezoek <a href="https://owncloud.com">owncloud.com</a> als u nog geen ownCloud-server heeft. @@ -2414,15 +2435,10 @@ Probeer opnieuw te synchroniseren. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> <p><small>Gebouwd vanaf Git revisie <a href="%1">%2</a> op %3, %4 gebruik makend van Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts index 84509841dd..deb287c3a6 100644 --- a/translations/mirall_pl.ts +++ b/translations/mirall_pl.ts @@ -63,17 +63,22 @@ Formularz - + + Selective Sync... + + + + Account Maintenance Utrzymanie Konta. - + Edit Ignored Files Edytuj pliki ignorowane - + Modify Account Zmień Konto @@ -89,7 +94,7 @@ - + Pause Wstrzymaj @@ -104,111 +109,111 @@ Dodaj katalog... - + Storage Usage Użycie zasobów - + Retrieving usage information... Pobieranie informacji o użyciu - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Uwaga:</b> Niektóre foldery, włączając podłączone w sieci lub współdzielone mogą mieć różne limity. - + Resume Wznów - + Confirm Folder Remove Potwierdź usunięcie katalogu - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Czy naprawdę chcesz przerwać synchronizację folderu <i>%1</i>?</p><p><b>Uwaga:</b> Ta czynność nie usunie plików z klienta.</p> - + Confirm Folder Reset Potwierdź reset folderu - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Czy rzeczywiście chcesz zresetować folder <i>%1</i> i przebudować bazę klientów?</p><p><b>Uwaga:</b> Ta funkcja została przewidziana wyłącznie do czynności technicznych. Nie zostaną usunięte żadne pliki, ale może to spowodować znaczący wzrost ruchu sieciowego i potrwać kilka minut lub godzin, w zależności od rozmiaru folderu. Używaj tej opcji wyłącznie, jeśli Twój administrator doradził Ci takie działanie.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) z %2 przestrzeni na serwerze w użyciu. - + No connection to %1 at <a href="%2">%3</a>. Brak połączenia do %1 na <a href="%2">%3</a>. - + No %1 connection configured. Połączenie %1 nie skonfigurowane. - + Sync Running Synchronizacja uruchomiona - + No account configured. Brak skonfigurowanych kont. - + The syncing operation is running.<br/>Do you want to terminate it? Operacja synchronizacji jest uruchomiona.<br>Czy chcesz ją zakończyć? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 z %4) %5 pozostało z %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 z %2, plik %3 z %4 Pozostało czasu %5 - + Connected to <a href="%1">%2</a>. Podłączony do <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Podłączony do <a href="%1">%2</a> jako <i>%3</i>. - + Currently there is no storage usage information available. Obecnie nie ma dostępnych informacji o wykorzystaniu pamięci masowej. @@ -353,7 +358,7 @@ Pozostało czasu %5 Aktywności synchronizacji - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -362,17 +367,17 @@ Mogło się tak zdarzyć z powodu niezauważonej rekonfiguracji folderu, lub te Czy jesteś pewien/pewna, że chcesz wykonać tę operację? - + Remove All Files? Usunąć wszystkie pliki? - + Remove all files Usuń wszystkie pliki - + Keep files Pozostaw pliki @@ -390,52 +395,52 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację? Stary sync journal '%1' został znaleziony, lecz nie mógł być usunięty. Proszę się upewnić, że żaden program go obecnie nie używa. - + Undefined State. Niezdefiniowany stan - + Waits to start syncing. Czekają na uruchomienie synchronizacji. - + Preparing for sync. Przygotowuję do synchronizacji - + Sync is running. Synchronizacja w toku - + Last Sync was successful. Ostatnia synchronizacja zakończona powodzeniem. - + Last Sync was successful, but with warnings on individual files. Ostatnia synchronizacja udana, ale istnieją ostrzeżenia z pojedynczymi plikami. - + Setup Error. Błąd ustawień. - + User Abort. Użytkownik anulował. - + Sync is paused. Synchronizacja wstrzymana - + %1 (Sync is paused) %1 (Synchronizacja jest zatrzymana) @@ -462,8 +467,8 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację? Mirall::FolderWizard - - + + Add Folder Dodaj folder @@ -471,67 +476,67 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Kliknij, aby wybrać folder lokalny do synchronizacji. - + Enter the path to the local folder. Wpisz ścieżkę do folderu lokalnego. - + The directory alias is a descriptive name for this sync connection. Alias katalogu jest nazwą opisową dla tego połączenia synchronizacji. - + No valid local folder selected! Nie wybrano poprawnego lokalnego katalogu! - + You have no permission to write to the selected folder! Nie masz uprawnień, aby zapisywać w tym katalogu! - + The local path %1 is already an upload folder. Please pick another one! Ścieżka lokalna %1 już istnieje w zdalnym folderze. Proszę wybrać inną! - + An already configured folder is contained in the current entry. Folder jest już skonfigurowany w bieżącym wpisie. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. Zaznaczony folder jest linkiem symbolicznym. Skonfigurowany folder jest tym, na który wskazuje ten link. - + An already configured folder contains the currently entered folder. Folder już skonfigurowany zawiera katalogi aktualnie wprowadzone. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. Zaznaczony folder jest linkiem symbolicznym. Skonfigurowany już folder jest nadrzędnym w stosunku do folderu na który wskazuje ten link. - + The alias can not be empty. Please provide a descriptive alias word. Alias nie może być pusty. Proszę wprowadzić alias. - + The alias <i>%1</i> is already in use. Please pick another alias. Alias <i>%1</i> jest już używany. Wprowadź inny alias. - + Select the source folder Wybierz katalog źródłowy @@ -539,51 +544,59 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację? Mirall::FolderWizardRemotePath - + Add Remote Folder Dodaj zdalny katalog - + Enter the name of the new folder: Wpisz nazwę dla nowego katalogu: - + Folder was successfully created on %1. Folder został utworzony pomyślnie na %1 - + Failed to create the folder on %1. Please check manually. Nie udało się utworzyć folderu na %1. Proszę sprawdzić ręcznie. - + Choose this to sync the entire account Wybierz to, aby zsynchronizować całe konto - + This folder is already being synced. Ten katalog jest już synchronizowany. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. Synchronizujesz już <i>%1</i>, który jest folderem nadrzędnym <i>%2</i>. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. Już aktualizujesz wszystkie pliku. Synchronizacja innego folderu <b>nie</b> jest wspierana. Jeśli chcesz synchronizować wiele folderów, proszę usuń aktualnie skonfigurowaną synchronizację folderu głównego. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Ostrzeżenie:</b> @@ -1335,7 +1348,7 @@ Niezalecane jest jego użycie. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash Plik %1 nie może być nazwany %2 z powodu kolizji z lokalną nazwą pliku @@ -1351,17 +1364,17 @@ Niezalecane jest jego użycie. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Folder ten nie może być zmieniony. Został zmieniony z powrotem do pierwotnej nazwy. - + This folder must not be renamed. Please name it back to Shared. Nie wolno zmieniać nazwy tego folderu. Proszę zmień nazwę z powrotem na Shared. - + The file was renamed but is part of a read only share. The original file was restored. Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Przywrócono oryginalny plik @@ -1789,229 +1802,229 @@ Niezalecane jest jego użycie. Mirall::SyncEngine - + Success. Sukces. - + CSync failed to create a lock file. CSync nie mógł utworzyć pliku blokady. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync nie powiodło się załadowanie lub utworzenie pliku dziennika. Upewnij się, że masz prawa do odczytu i zapisu do lokalnego katalogu synchronizacji. - + CSync failed to write the journal file. CSync nie udało się zapisać pliku dziennika. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Wtyczka %1 do csync nie może być załadowana.<br/>Sprawdź poprawność instalacji!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Czas systemowy na tym kliencie różni się od czasu systemowego na serwerze. Użyj usługi synchronizacji czasu (NTP) na serwerze i kliencie, aby czas na obu urządzeniach był taki sam. - + CSync could not detect the filesystem type. CSync nie może wykryć typu systemu plików. - + CSync got an error while processing internal trees. CSync napotkał błąd podczas przetwarzania wewnętrznych drzew. - + CSync failed to reserve memory. CSync nie mógł zarezerwować pamięci. - + CSync fatal parameter error. Krytyczny błąd parametru CSync. - + CSync processing step update failed. Aktualizacja procesu przetwarzania CSync nie powiodła się. - + CSync processing step reconcile failed. Scalenie w procesie przetwarzania CSync nie powiodło się. - + CSync processing step propagate failed. Propagacja w procesie przetwarzania CSync nie powiodła się. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Katalog docelowy nie istnieje.</p><p>Sprawdź ustawienia synchronizacji.</p> - + A remote file can not be written. Please check the remote access. Zdalny plik nie może zostać zapisany. Sprawdź dostęp zdalny. - + The local filesystem can not be written. Please check permissions. Nie można zapisywać na lokalnym systemie plików. Sprawdź uprawnienia. - + CSync failed to connect through a proxy. CSync nie mógł połączyć się przez proxy. - + CSync could not authenticate at the proxy. CSync nie mógł się uwierzytelnić przez proxy. - + CSync failed to lookup proxy or server. CSync nie mógł odnaleźć serwera proxy. - + CSync failed to authenticate at the %1 server. CSync nie mógł uwierzytelnić się na serwerze %1. - + CSync failed to connect to the network. CSync nie mógł połączyć się z siecią. - + A network connection timeout happened. Upłynął limit czasu połączenia. - + A HTTP transmission error happened. Wystąpił błąd transmisji HTTP. - + CSync failed due to not handled permission deniend. CSync nie obsługiwane, odmowa uprawnień. - + CSync failed to access Synchronizacja nieudana z powodu braku dostępu - + CSync tried to create a directory that already exists. CSync próbował utworzyć katalog, który już istnieje. - - + + CSync: No space on %1 server available. CSync: Brak dostępnego miejsca na serwerze %1. - + CSync unspecified error. Nieokreślony błąd CSync. - + Aborted by the user Anulowane przez użytkownika - + An internal error number %1 happened. Wystąpił błąd wewnętrzny numer %1. - + The item is not synced because of previous errors: %1 Ten element nie jest zsynchronizowane z powodu poprzednich błędów: %1 - + Symbolic links are not supported in syncing. Linki symboliczne nie są wspierane przy synchronizacji. - + File is listed on the ignore list. Plik jest na liście plików ignorowanych. - + File contains invalid characters that can not be synced cross platform. Plik zawiera nieprawidłowe znaki, które nie mogą być synchronizowane wieloplatformowo. - + Unable to initialize a sync journal. Nie można zainicjować synchronizacji dziennika. - + Cannot open the sync journal Nie można otworzyć dziennika synchronizacji - + Not allowed because you don't have permission to add sub-directories in that directory Nie masz uprawnień do dodawania podkatalogów w tym katalogu. - + Not allowed because you don't have permission to add parent directory Nie masz uprawnień by dodać katalog nadrzędny - + Not allowed because you don't have permission to add files in that directory Nie masz uprawnień by dodać pliki w tym katalogu - + Not allowed to upload this file because it is read-only on the server, restoring Wgrywanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie - - + + Not allowed to remove, restoring Brak uprawnień by usunąć, przywracanie - + Move not allowed, item restored Przenoszenie niedozwolone, obiekt przywrócony - + Move not allowed because %1 is read-only Przenoszenie niedozwolone, ponieważ %1 jest tylko do odczytu - + the destination docelowy - + the source źródło @@ -2027,8 +2040,8 @@ Niezalecane jest jego użycie. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2165,6 +2178,14 @@ Niezalecane jest jego użycie. Aktualne + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2406,7 +2427,7 @@ Kliknij ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Jeśli nie masz jeszcze serwera ownCloud, wejdź na <a href="https://owncloud.com">owncloud.com</a> aby dowiedzieć się jak go zainstalować. @@ -2415,15 +2436,10 @@ Kliknij ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> <p><small>Zbudowane z rewizji Git <a href="%1">%2</a> na %3, %4 przy użyciu Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts index a01aa355be..8b423224c3 100644 --- a/translations/mirall_pt.ts +++ b/translations/mirall_pt.ts @@ -63,17 +63,22 @@ Formulário - + + Selective Sync... + + + + Account Maintenance Manutenção da Conta - + Edit Ignored Files Editar ficheiros ignorados - + Modify Account Modificar conta @@ -89,7 +94,7 @@ - + Pause Pausa @@ -104,111 +109,111 @@ Adicionar Pasta... - + Storage Usage Utilização do armazenamento - + Retrieving usage information... A obter estatísticas de utilização... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Nota:</b> Algumas pastas, incluindo pastas partilhadas ou montadas na rede, podem ter limites diferentes. - + Resume Resumir - + Confirm Folder Remove Confirme a remoção da pasta - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Quer mesmo parar a sincronização da pasta <i>%1</i>?</p><b>Nota:</b> Isto não irá remover os ficheiros no seu cliente.</p> - + Confirm Folder Reset Confirmar reposição da pasta - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Deseja mesmo repor a pasta <i>%1</i> e reconstruir a base de dados do seu cliente?</p><p><b>Nota:</b> Esta função é desenhada apenas para efeitos de manutenção. Os ficheiros não irão ser removidos, mas este processo pode aumentar o tráfego de dados e demorar alguns minutos ou horas a completar, dependendo do tamanho da pasta. Utilize esta funcionalidade apenas se aconselhado pelo seu administrador.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) de %2 de espaço utilizado. - + No connection to %1 at <a href="%2">%3</a>. Sem ligação a %1 em <a href="%2">%3</a>. - + No %1 connection configured. %1 sem ligação configurada. - + Sync Running A sincronização está a decorrer - + No account configured. Nenhuma conta configurada. - + The syncing operation is running.<br/>Do you want to terminate it? A operação de sincronização está a ser executada.<br/>Deseja terminar? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 de %4) %5 faltando a uma taxa de %6/s - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. Conectado a <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Conectado a <a href="%1">%2</a> como <i>%3</i>. - + Currently there is no storage usage information available. Histórico de utilização de armazenamento não disponível. @@ -353,7 +358,7 @@ Total time left %5 Actividade de sincronicação - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -361,17 +366,17 @@ Are you sure you want to perform this operation? Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha "Manter os ficheiros". Se quer apagar os seus dados, escolha "Remover todos os ficheiros". - + Remove All Files? Remover todos os ficheiros? - + Remove all files Remover todos os ficheiros - + Keep files Manter os ficheiros @@ -389,52 +394,52 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q Não foi possível remover o antigo 'journal sync' '%1'. Por favor certifique-se que nenhuma aplicação o está a utilizar. - + Undefined State. Estado indefinido. - + Waits to start syncing. A aguardar o inicio da sincronização. - + Preparing for sync. A preparar para sincronização. - + Sync is running. A sincronização está a correr. - + Last Sync was successful. A última sincronização foi efectuada com sucesso. - + Last Sync was successful, but with warnings on individual files. A última sincronização foi efectuada com sucesso, mas existem avisos sobre alguns ficheiros. - + Setup Error. Erro na instalação. - + User Abort. Cancelado pelo utilizador. - + Sync is paused. A sincronização está em pausa. - + %1 (Sync is paused) %1 (Sincronização em pausa) @@ -461,8 +466,8 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q Mirall::FolderWizard - - + + Add Folder Acrescentar pasta @@ -470,67 +475,67 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Escolha a pasta local a sincronizar. - + Enter the path to the local folder. Localização da pasta. - + The directory alias is a descriptive name for this sync connection. O pseudónimo do directório é um nome descritivo para esta conexão de sincronização. - + No valid local folder selected! Pasta local seleccionada inválida! - + You have no permission to write to the selected folder! Não tem permissões de escrina na pasta seleccionada! - + The local path %1 is already an upload folder. Please pick another one! A pasta local %1 já é uma pasta de sincronização. por favor escolha outra! - + An already configured folder is contained in the current entry. Uma pasta anteriormente configurada está contida na introdução actual. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. O directório seleccionado é uma hiperligação simbólica. Um directório já configurado está contido no directório para a qual a hiperligação está apontada. - + An already configured folder contains the currently entered folder. Uma pasta anteriormente configurada está contida nos dados introduzidos. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. A pasta seleccionada é um link simbólico. Uma pasta já configurada está contida na pasta para onde este link está a apontar. - + The alias can not be empty. Please provide a descriptive alias word. O pseudónimo não pode estar vazio. Por favor introduza um nome descritivo para o pseudónimo ou alias - + The alias <i>%1</i> is already in use. Please pick another alias. O descritivo <i>%1</i> já está em uso. Por favor escolha outro. - + Select the source folder Selecione a pasta de origem @@ -538,51 +543,59 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q Mirall::FolderWizardRemotePath - + Add Remote Folder Adicionar pasta remota - + Enter the name of the new folder: Introduza o nome da nova pasta: - + Folder was successfully created on %1. Pasta criada com sucesso em %1. - + Failed to create the folder on %1. Please check manually. Impossível criar a pasta em %1. Por favor valide manualmente. - + Choose this to sync the entire account Escolha para sincronizar a sua conta - + This folder is already being synced. Esta pasta já está a ser sincronizada. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. Já está a sincronizar <i>%1</i>, que é uma pasta 'parente' de <i>%2</i>. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. Já está a sincronizar todos os seus ficheiros. Sincronizar outra pasta<b>não</b> é suportado. Se deseja sincronizar múltiplas pastas, por favor altere a configuração da pasta raiz de sincronização. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Atenção:</b> @@ -1332,7 +1345,7 @@ It is not advisable to use it. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash O ficheiro %1 nao pode ser renomeado para %2 devido a conflito com nome de ficheiro local @@ -1348,17 +1361,17 @@ It is not advisable to use it. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Esta pasta não pode ser renomeada. A alterar para nome original. - + This folder must not be renamed. Please name it back to Shared. Esta pasta não pode ser renomeada. Por favor renomeie para o seu nome original: Shared. - + The file was renamed but is part of a read only share. The original file was restored. O ficheiro foi renomeado mas faz parte de uma partilha só de leitura. O ficheiro original foi restaurado. @@ -1786,230 +1799,230 @@ Por favor tente sincronizar novamente. Mirall::SyncEngine - + Success. Sucesso - + CSync failed to create a lock file. CSync falhou a criação do ficheiro de lock. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync falhou no carregamento ou criação do ficheiro jornal. Confirme que tem permissões de escrita e leitura no directório de sincronismo local. - + CSync failed to write the journal file. CSync falhou a escrever o ficheiro do jornal. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>O plugin %1 para o CSync não foi carregado.<br/>Por favor verifique a instalação!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. A data/hora neste cliente é difere da data/hora do servidor. Por favor utilize um servidor de sincronização horária (NTP), no servidor e nos clientes para garantir que a data/hora são iguais. - + CSync could not detect the filesystem type. Csync não conseguiu detectar o tipo de sistema de ficheiros. - + CSync got an error while processing internal trees. Csync obteve um erro enquanto processava as árvores internas. - + CSync failed to reserve memory. O CSync falhou a reservar memória - + CSync fatal parameter error. Parametro errado, CSync falhou - + CSync processing step update failed. O passo de processamento do CSyn falhou - + CSync processing step reconcile failed. CSync: Processo de reconciliação falhou. - + CSync processing step propagate failed. CSync: O processo de propagação falhou. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>A pasta de destino não existe.</p><p>Por favor verifique a configuração da sincronização.</p> - + A remote file can not be written. Please check the remote access. Não é possivel escrever num ficheiro remoto. Por favor verifique o acesso remoto. - + The local filesystem can not be written. Please check permissions. Não é possivel escrever no sistema de ficheiros local. Por favor verifique as permissões. - + CSync failed to connect through a proxy. CSync: Erro a ligar através do proxy - + CSync could not authenticate at the proxy. CSync: erro ao autenticar-se no servidor proxy. - + CSync failed to lookup proxy or server. CSync: Erro a contactar o proxy ou o servidor. - + CSync failed to authenticate at the %1 server. CSync: Erro a autenticar no servidor %1 - + CSync failed to connect to the network. CSync: Erro na conecção à rede - + A network connection timeout happened. Houve um erro de timeout de rede. - + A HTTP transmission error happened. Ocorreu um erro de transmissão HTTP - + CSync failed due to not handled permission deniend. CSync: Erro devido a permissões de negação não tratadas. - + CSync failed to access CSync: falha no acesso - + CSync tried to create a directory that already exists. O CSync tentou criar uma pasta que já existe. - - + + CSync: No space on %1 server available. CSync: Não ha espaço disponível no servidor %1 - + CSync unspecified error. CSync: erro não especificado - + Aborted by the user Cancelado pelo utilizador - + An internal error number %1 happened. Ocorreu um erro interno número %1. - + The item is not synced because of previous errors: %1 O item não está sincronizado devido a erros anteriores: %1 - + Symbolic links are not supported in syncing. Hiperligações simbólicas não são suportadas em sincronização. - + File is listed on the ignore list. O ficheiro está na lista de ficheiros a ignorar. - + File contains invalid characters that can not be synced cross platform. O ficheiro contém caracteres inválidos que não podem ser sincronizados pelas várias plataformas. - + Unable to initialize a sync journal. Impossível inicializar sincronização 'journal'. - + Cannot open the sync journal Impossível abrir o jornal de sincronismo - + Not allowed because you don't have permission to add sub-directories in that directory Não permitido, porque não tem permissão para adicionar sub-directórios ao directório - + Not allowed because you don't have permission to add parent directory Não permitido, porque não tem permissão para adicionar o directório principal - + Not allowed because you don't have permission to add files in that directory Não permitido, porque não tem permissão para adicionar ficheiros no directório - + Not allowed to upload this file because it is read-only on the server, restoring Não é permitido fazer o envio deste ficheiro porque é só de leitura no servidor, restaurando - - + + Not allowed to remove, restoring Não autorizado para remoção, restaurando - + Move not allowed, item restored Mover não foi permitido, item restaurado - + Move not allowed because %1 is read-only Mover não foi autorizado porque %1 é só de leitura - + the destination o destino - + the source a origem @@ -2025,8 +2038,8 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2163,6 +2176,14 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n Actualizado + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2403,7 +2424,7 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Se ainda não tem um servidor ownCloud, visite <a href="https://owncloud.com">owncloud.com</a> para mais informações. @@ -2412,15 +2433,10 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> <p><small>Construído a partir de revisão Git <a href="%1">%2</a> em %3, %4 usando Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts index 1e82959a27..9348a670b0 100644 --- a/translations/mirall_pt_BR.ts +++ b/translations/mirall_pt_BR.ts @@ -63,17 +63,22 @@ Formulário - + + Selective Sync... + + + + Account Maintenance Manutenção de Conta - + Edit Ignored Files Editar Arquivos Ignorados - + Modify Account Modificar Conta @@ -89,7 +94,7 @@ - + Pause Pausa @@ -104,111 +109,111 @@ Adicionar Pasta... - + Storage Usage Uso de Armazenamento - + Retrieving usage information... Recuperando informações sobre o uso... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Nota:</b> Algumas pastas, incluindo as montadas na rede ou pastas compartilhadas, podem ter limites diferentes. - + Resume Resumir - + Confirm Folder Remove Confirma Remoção da Pasta - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Você realmente deseja parar de sincronizar a pasta <i>%1</i>?</p><p><b>Nota:</b> Isso não vai remover os arquivos de seu cliente.</p> - + Confirm Folder Reset Confirme Reiniciar Pasta - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Você realmente deseja redefinir a pasta <i>%1</i> e reconstruir seu banco de dados de clientes?</p><p><b>Nota:</b> Esta função é usada somente para manutenção. Nenhum arquivo será removido, mas isso pode causar significativo tráfego de dados e levar vários minutos ou horas, dependendo do tamanho da pasta. Somente use esta opção se adivertido por seu administrador.</p> - + Discovering %1 Descobrindo %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) de %2 do espaço em uso no servidor. - + No connection to %1 at <a href="%2">%3</a>. Nenhuma conexão para %1 em <a href="%2">%3</a>. - + No %1 connection configured. Nenhuma %1 conexão configurada. - + Sync Running Sincronização Acontecendo - + No account configured. Nenhuma conta configurada. - + The syncing operation is running.<br/>Do you want to terminate it? A operação de sincronização está acontecendo.<br/>Você deseja finaliza-la? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 de %4) %5 faltando a uma taxa de %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 de %2, arquivo %3 de %4 Total de tempo que falta 5% - + Connected to <a href="%1">%2</a>. Conectado à <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Conectado a <a href="%1">%2</a> como <i>%3</i>. - + Currently there is no storage usage information available. Atualmente, não há informações de uso de armazenamento disponível. @@ -353,7 +358,7 @@ Total de tempo que falta 5% Atividade de Sincronização - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -362,17 +367,17 @@ Isso pode ser porque a pasta foi silenciosamente reconfigurada, ou todos os arqu Você tem certeza que quer executar esta operação? - + Remove All Files? Deseja Remover Todos os Arquivos? - + Remove all files Remover todos os arquivos - + Keep files Manter arquivos @@ -390,52 +395,52 @@ Você tem certeza que quer executar esta operação? Uma velha revista de sincronização '%1' foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está a usá-la. - + Undefined State. Estado indefinido. - + Waits to start syncing. Aguardando o inicio da sincronização. - + Preparing for sync. Preparando para sincronização. - + Sync is running. A sincronização está ocorrendo. - + Last Sync was successful. A última sincronização foi feita com sucesso. - + Last Sync was successful, but with warnings on individual files. A última sincronização foi executada com sucesso, mas com advertências em arquivos individuais. - + Setup Error. Erro de Configuração. - + User Abort. Usuário Abortou - + Sync is paused. Sincronização pausada. - + %1 (Sync is paused) %1 (Pausa na Sincronização) @@ -462,8 +467,8 @@ Você tem certeza que quer executar esta operação? Mirall::FolderWizard - - + + Add Folder Adicionar Pasta @@ -471,67 +476,67 @@ Você tem certeza que quer executar esta operação? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Click para selecionar uma pasta local para sincronização. - + Enter the path to the local folder. Entre com o caminha para a pasta local. - + The directory alias is a descriptive name for this sync connection. O apelido da pasta é um nome descritivo para esta conexão de sincronização. - + No valid local folder selected! Pasta local selecionada inválida! - + You have no permission to write to the selected folder! Voce não tem permissão para escrita na pasta selecionada! - + The local path %1 is already an upload folder. Please pick another one! O caminho local %1 já é uma pasta de upload. Por favor, escolha outro! - + An already configured folder is contained in the current entry. Uma pasta configurada já está contida na entrada atual. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. A pasta selecionada é um link simbólico. Uma pasta já configurada está contida na pasta para onde este link está apontando. - + An already configured folder contains the currently entered folder. Uma pasta já configurada contém a pasta atualmente inserida. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. A pasta selecionada é um link simbólico. Uma pasta já configurada é a mãe da atual selecionada que contém uma pasta para onde este link está apontando. - + The alias can not be empty. Please provide a descriptive alias word. O apelido não pode estar vazio. Por favor, forneça um apelido que seja descritivo. - + The alias <i>%1</i> is already in use. Please pick another alias. O alias <i>%1</ i> já está em uso. Por favor, escolha outro alias. - + Select the source folder Selecione a pasta de origem @@ -539,51 +544,59 @@ Você tem certeza que quer executar esta operação? Mirall::FolderWizardRemotePath - + Add Remote Folder Adicionar Pasta Remota - + Enter the name of the new folder: Informe o nome da nova pasta: - + Folder was successfully created on %1. Pasta foi criada com sucesso em %1. - + Failed to create the folder on %1. Please check manually. Falha ao criar a pasta em %1. Por favor, verifique manualmente. - + Choose this to sync the entire account Escolha esta opção para sincronizar a conta inteira - + This folder is already being synced. Esta pasta já está sendo sincronizada. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. Você já está sincronizando <i>%1</i>, que é uma pasta mãe de <i>%2</i>. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. Você já está sincronizando todos os seus arquivos. Sincronizar outra pasta <b>não</ b> é possível. Se você deseja sincronizar várias pastas, por favor, remova a sincronização configurada atualmente para a pasta raiz. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Advertênciia:</b> @@ -1333,7 +1346,7 @@ It is not advisable to use it. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash O arquivo %1 não pode ser renomeado para %2 por causa de um choque com nome de arquivo local @@ -1349,17 +1362,17 @@ It is not advisable to use it. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Esta pasta não pode ser renomeada. Ela será renomeado de volta ao seu nome original. - + This folder must not be renamed. Please name it back to Shared. Esta pasta não pode ser renomeada. Por favor, nomeie-a de volta para Compartilhada. - + The file was renamed but is part of a read only share. The original file was restored. O arquivo foi renomeado mas faz parte de compartilhamento só de leitura. O arquivo original foi restaurado. @@ -1787,229 +1800,229 @@ Tente sincronizar novamente. Mirall::SyncEngine - + Success. Sucesso. - + CSync failed to create a lock file. Falha ao criar o arquivo de trava pelo CSync. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. Csync falhou ao carregar ou criar o arquivo jornal. Certifique-se de ter permissão de escrita no diretório de sincronização local. - + CSync failed to write the journal file. Csync falhou ao tentar gravar o arquivo jornal. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>O plugin %1 para csync não foi carregado.<br/>Por favor verifique a instalação!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. A hora do sistema neste cliente é diferente da hora de sistema no servidor. Por favor, use um serviço de sincronização de tempo (NTP) no servidor e máquinas clientes para que as datas continuam as mesmas. - + CSync could not detect the filesystem type. Tipo de sistema de arquivo não detectado pelo CSync. - + CSync got an error while processing internal trees. Erro do CSync enquanto processava árvores internas. - + CSync failed to reserve memory. CSync falhou ao reservar memória. - + CSync fatal parameter error. Erro fatal de parametro do CSync. - + CSync processing step update failed. Processamento da atualização do CSync falhou. - + CSync processing step reconcile failed. Processamento da conciliação do CSync falhou. - + CSync processing step propagate failed. Processamento da propagação do CSync falhou. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>O diretório de destino não existe.</p> <p>Por favor, verifique a configuração de sincronização. </p> - + A remote file can not be written. Please check the remote access. O arquivo remoto não pode ser escrito. Por Favor, verifique o acesso remoto. - + The local filesystem can not be written. Please check permissions. O sistema de arquivos local não pode ser escrito. Por favor, verifique as permissões. - + CSync failed to connect through a proxy. CSync falhou ao conectar por um proxy. - + CSync could not authenticate at the proxy. Csync não conseguiu autenticação no proxy. - + CSync failed to lookup proxy or server. CSync falhou ao localizar o proxy ou servidor. - + CSync failed to authenticate at the %1 server. CSync falhou ao autenticar no servidor %1. - + CSync failed to connect to the network. CSync falhou ao conectar à rede. - + A network connection timeout happened. Ocorreu uma desconexão de rede. - + A HTTP transmission error happened. Houve um erro na transmissão HTTP. - + CSync failed due to not handled permission deniend. CSync falhou devido a uma negativa de permissão não resolvida. - + CSync failed to access Falha no acesso CSync - + CSync tried to create a directory that already exists. CSync tentou criar um diretório que já existe. - - + + CSync: No space on %1 server available. CSync: Sem espaço disponível no servidor %1. - + CSync unspecified error. Erro não especificado no CSync. - + Aborted by the user Abortado pelo usuário - + An internal error number %1 happened. Ocorreu um erro interno de número %1. - + The item is not synced because of previous errors: %1 O item não está sincronizado devido a erros anteriores: %1 - + Symbolic links are not supported in syncing. Linques simbólicos não são suportados em sincronização. - + File is listed on the ignore list. O arquivo está listado na lista de ignorados. - + File contains invalid characters that can not be synced cross platform. Arquivos que contém caracteres inválidos não podem ser sincronizados através de plataformas. - + Unable to initialize a sync journal. Impossibilitado de iniciar a sincronização. - + Cannot open the sync journal Não é possível abrir o arquivo de sincronização - + Not allowed because you don't have permission to add sub-directories in that directory Não permitido porque você não tem permissão de criar sub-pastas nesta pasta - + Not allowed because you don't have permission to add parent directory Não permitido porque você não tem permissão de criar pastas mãe - + Not allowed because you don't have permission to add files in that directory Não permitido porque você não tem permissão de adicionar arquivos a esta pasta - + Not allowed to upload this file because it is read-only on the server, restoring Não é permitido fazer o upload deste arquivo porque ele é somente leitura no servidor, restaurando - - + + Not allowed to remove, restoring Não é permitido remover, restaurando - + Move not allowed, item restored Não é permitido mover, item restaurado - + Move not allowed because %1 is read-only Não é permitido mover porque %1 é somente para leitura - + the destination o destino - + the source a fonte @@ -2025,9 +2038,9 @@ Tente sincronizar novamente. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - <p>Versão %1 Para mais informações por favor visite <a href='%2'>%3</a>.</p><p>Direitos Autorais ownCloud Inc.</p><p>Distribuido por %4 e licenciado sob a GNU General Public License (GPL) Versão 2.0.<br>%5 e %5 logomarca são marcas registradas de %4 nos Estados Unidos, e outros países ou ambos.<p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2163,6 +2176,14 @@ Tente sincronizar novamente. Até a data + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2403,7 +2424,7 @@ Tente sincronizar novamente. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Se você ainda não tem um servidor ownCloud, acesse <a href="https://owncloud.com">owncloud.com</a> para obter mais informações. @@ -2412,15 +2433,10 @@ Tente sincronizar novamente. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> <p><small>Compilado da revisão Git <a href="%1">%2</a> on %3, %4 usando Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts index 86442aafc6..31521ef328 100644 --- a/translations/mirall_ru.ts +++ b/translations/mirall_ru.ts @@ -63,17 +63,22 @@ Форма - + + Selective Sync... + + + + Account Maintenance Обслуживание учётной записи - + Edit Ignored Files Изменить проигнорированные файлы - + Modify Account Изменить учётную запись @@ -89,7 +94,7 @@ - + Pause Пауза @@ -104,111 +109,111 @@ Добавить папку... - + Storage Usage Использование хранилища - + Retrieving usage information... Получение информации об использовании... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Заметьте:</b> Некоторые папки, включая сетевые или общие, могут иметь разные ограничения. - + Resume Продолжить - + Confirm Folder Remove Подтвердите удаление папки - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Вы действительно хотите прекратить синхронизацию папки <i>%1</i>?</p><p><b>Примечание:</b> Это действие не удалит файлы с клиента.</p> - + Confirm Folder Reset Подтвердить сброс папки - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Вы действительно хотите сбросить папку <i>%1</i> и перестроить клиентскую базу данных?</p><p><b>Важно:</b> Данный функционал предназначен только для технического обслуживания. Файлы не будут удалены, но, в зависимости от размера папки, операция может занять от нескольких минут до нескольких часов и может быть передан большой объем данных. Используйте данную операцию только по рекомендации администратора.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. Используется %1 (%3%) из %2 места на сервере. - + No connection to %1 at <a href="%2">%3</a>. Нет связи с %1 по адресу <a href="%2">%3</a>. - + No %1 connection configured. Нет настроенного подключения %1. - + Sync Running Синхронизация запущена - + No account configured. Учётная запись не настроена. - + The syncing operation is running.<br/>Do you want to terminate it? Синхронизация запущена.<br/>Вы хотите, остановить ее? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 / %4) Осталось %5 на скорости %6/сек. - + %1 of %2, file %3 of %4 Total time left %5 %1 / %2, файл %3 / %4 Оставшееся время: %5 - + Connected to <a href="%1">%2</a>. Соединились с <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Подключён к <a href="%1">%2</a> как <i>%3</i>. - + Currently there is no storage usage information available. В данный момент информация о заполненности хранилища недоступна. @@ -353,7 +358,7 @@ Total time left %5 Журнал синхронизации - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -362,17 +367,17 @@ Are you sure you want to perform this operation? Вы уверены, что хотите выполнить операцию? - + Remove All Files? Удалить все файлы? - + Remove all files Удалить все файлы - + Keep files Сохранить файлы @@ -390,52 +395,52 @@ Are you sure you want to perform this operation? Найден старый журнал синхронизации '%1', и он не может быть удалён. Пожалуйста убедитесь что он не открыт в каком-либо приложении. - + Undefined State. Неопределенное состояние. - + Waits to start syncing. Ожидает, чтобы начать синхронизацию. - + Preparing for sync. Подготовка к синхронизации. - + Sync is running. Идет синхронизация. - + Last Sync was successful. Последняя синхронизация прошла успешно. - + Last Sync was successful, but with warnings on individual files. Последняя синхронизация прошла успешно, но были предупреждения о нескольких файлах. - + Setup Error. Ошибка установки. - + User Abort. Отмена пользователем. - + Sync is paused. Синхронизация приостановлена. - + %1 (Sync is paused) %! (синхронизация приостановлена) @@ -462,8 +467,8 @@ Are you sure you want to perform this operation? Mirall::FolderWizard - - + + Add Folder Добавить папку @@ -471,67 +476,67 @@ Are you sure you want to perform this operation? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Кликните, чтобы выбрать локальную папку для синхронизации. - + Enter the path to the local folder. Введите путь к локальной папке. - + The directory alias is a descriptive name for this sync connection. Псевдоним каталога - наглядное имя для этой синхронизации. - + No valid local folder selected! Локальный каталог не выбран! - + You have no permission to write to the selected folder! У вас нет права записывать в выбранной папке! - + The local path %1 is already an upload folder. Please pick another one! Локальный путь %1 уже загружается на сервер. Пожалуйста, выберите другой! - + An already configured folder is contained in the current entry. В текущей записи уже есть настроенная папка. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. Выбранная папка является симолической ссылкой. В папке, на которую идет ссылка, присутствует папка, которая синхронизируется. - + An already configured folder contains the currently entered folder. В выбранной директории содержится директория, которая уже синхронизируется. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. Выбранная директория является символической ссылкой. Каталог, который уже синхронизируется, содержит ссылку указывающую на выбранную директорию. - + The alias can not be empty. Please provide a descriptive alias word. Псевдоним не может быть пустым. Пожалуйста, укажите описательное слово псевдонима. - + The alias <i>%1</i> is already in use. Please pick another alias. Псевдоним <i>%1</i> уже используется. Выберите другой пожалуйста. - + Select the source folder Выберите исходную папку @@ -539,51 +544,59 @@ Are you sure you want to perform this operation? Mirall::FolderWizardRemotePath - + Add Remote Folder Добавить удалённую папку - + Enter the name of the new folder: Введите имя новой папки: - + Folder was successfully created on %1. Папка была успешно создана на %1. - + Failed to create the folder on %1. Please check manually. Невозможно создать директорию по адресу %1. Пожалуйста, попробуйте вручную. - + Choose this to sync the entire account Выберите это для синхронизации всей учётной записи - + This folder is already being synced. Директория уже синхронизируется. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. Директория <i>%1</i> уже настроена для синхронизации, и она является родительской для директории <i>%2</i>. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. В данный момент включена синхронизация всех файлов. Синхронизация другой директории в этом режиме <b>не</b> поддерживается. При необходимости синхронизировать несколько локальных директорий, сначала удалите синхронизацию корневой папки сервера. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Внимание:</b> @@ -1335,7 +1348,7 @@ It is not advisable to use it. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash Файл %1 не может быть переименован в %2 из-за локальных конфликтов имен @@ -1351,17 +1364,17 @@ It is not advisable to use it. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Эта папка не должна переименовываться. Ей будет присвоено изначальное имя. - + This folder must not be renamed. Please name it back to Shared. Эта папка не должна переименовываться. Пожалуйста, верните ей имя Shared - + The file was renamed but is part of a read only share. The original file was restored. Этот файл был переименован но является частью опубликованной папки с правами только для чтения. Оригинальный файл был восстановлен. @@ -1789,229 +1802,229 @@ It is not advisable to use it. Mirall::SyncEngine - + Success. Успешно. - + CSync failed to create a lock file. CSync не удалось создать файл блокировки. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync не смог загрузить или создать файл журнала. Убедитесь что вы имеете права чтения и записи в локальной директории. - + CSync failed to write the journal file. CSync не смог записать файл журнала. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>%1 плагин для синхронизации не удается загрузить.<br/>Пожалуйста, убедитесь, что он установлен!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Системное время на этом клиенте отличается от времени на сервере. Воспользуйтесь сервисом синхронизации времени (NTP) на серверной и клиентской машинах для установки точного времени. - + CSync could not detect the filesystem type. CSync не удалось обнаружить тип файловой системы. - + CSync got an error while processing internal trees. CSync получил сообщение об ошибке при обработке внутренних деревьев. - + CSync failed to reserve memory. CSync не удалось зарезервировать память. - + CSync fatal parameter error. Фатальная ошибка параметра CSync. - + CSync processing step update failed. Процесс обновления CSync не удался. - + CSync processing step reconcile failed. Процесс согласования CSync не удался. - + CSync processing step propagate failed. Процесс передачи CSync не удался. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Целевая папка не существует.</p><p>Проверьте настройки синхронизации.</p> - + A remote file can not be written. Please check the remote access. Удаленный файл не может быть записан. Пожалуйста, проверьте удаленный доступ. - + The local filesystem can not be written. Please check permissions. Локальная файловая система не доступна для записи. Пожалуйста, проверьте права пользователя. - + CSync failed to connect through a proxy. CSync не удалось подключиться через прокси. - + CSync could not authenticate at the proxy. CSync не удалось авторизоваться на прокси сервере. - + CSync failed to lookup proxy or server. CSync не удалось найти прокси сервер. - + CSync failed to authenticate at the %1 server. CSync не удалось аутентифицироваться на сервере %1. - + CSync failed to connect to the network. CSync не удалось подключиться к сети. - + A network connection timeout happened. Произошёл таймаут соединения сети. - + A HTTP transmission error happened. Произошла ошибка передачи http. - + CSync failed due to not handled permission deniend. CSync упал в связи с отутствием обработки из-за отказа в доступе. - + CSync failed to access CSync не имеет доступа - + CSync tried to create a directory that already exists. CSync пытался создать директорию, которая уже существует. - - + + CSync: No space on %1 server available. CSync: Нет доступного пространства на сервере %1 server. - + CSync unspecified error. Неизвестная ошибка CSync. - + Aborted by the user Прервано пользователем - + An internal error number %1 happened. Произошла внутренняя ошибка номер %1. - + The item is not synced because of previous errors: %1 Путь не синхронизируется из-за произошедших ошибок: %1 - + Symbolic links are not supported in syncing. Синхронизация символических ссылок не поддерживается. - + File is listed on the ignore list. Файл присутствует в списке игнорируемых. - + File contains invalid characters that can not be synced cross platform. Файл содержит недопустимые символы, которые невозможно синхронизировать между платформами. - + Unable to initialize a sync journal. Не удалось инициализировать журнал синхронизации. - + Cannot open the sync journal Не удаётся открыть журнал синхронизации - + Not allowed because you don't have permission to add sub-directories in that directory Недопустимо из-за отсутствия у вас разрешений на добавление подпапок в этой папке - + Not allowed because you don't have permission to add parent directory Недопустимо из-за отсутствия у вас разрешений на добавление родительской папки - + Not allowed because you don't have permission to add files in that directory Недопустимо из-за отсутствия у вас разрешений на добавление файлов в эту папку - + Not allowed to upload this file because it is read-only on the server, restoring Недопустимо отправить этот файл поскольку на севрере он помечен только для чтения, восстанавливаем - - + + Not allowed to remove, restoring Недопустимо удалить, восстанавливаем - + Move not allowed, item restored Перемещение недопустимо, элемент восстановлен - + Move not allowed because %1 is read-only Перемещение недопустимо, поскольку %1 помечен только для чтения - + the destination Назначение - + the source Источник @@ -2027,8 +2040,8 @@ It is not advisable to use it. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2165,6 +2178,14 @@ It is not advisable to use it. Актуальная версия + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2405,7 +2426,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Если у Вас ещё нет сервера ownCloud, обратитесь за дополнительной информацией на <a href="https://owncloud.com">owncloud.com</a> @@ -2414,15 +2435,10 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> <p><small>Собрано из исходников Git <a href="%1">%2</a> %3, %4 используя Qt %5.</small><p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts index f1bb2e85ac..1bd0dc1e3f 100644 --- a/translations/mirall_sk.ts +++ b/translations/mirall_sk.ts @@ -63,17 +63,22 @@ Formulár - + + Selective Sync... + + + + Account Maintenance Údržba účtov - + Edit Ignored Files Upraviť ignorované súbory - + Modify Account Upraviť účet @@ -89,7 +94,7 @@ - + Pause Pauza @@ -104,110 +109,111 @@ Pridať priečinok... - + Storage Usage Využitie úložného priestoru - + Retrieving usage information... Získavam informácie o využití... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Poznámka:<b> Niektoré priečinky, vrátane sieťových alebo zdieľaných, môžu mať odlišné limity. - + Resume Obnovenie - + Confirm Folder Remove Potvrdiť odstránenie priečinka - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Určite chcete zastaviť synchronizáciu priečinka <i>%1</i>?</p><p><b>Poznámka:</b> Toto neodstráni súbory z vášho klienta.</p> - + Confirm Folder Reset Potvrdiť zresetovanie priečinka - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Skutočne chcete zresetovať priečinok <i>%1</i> a opätovne zostaviť klientskú databázu?</p><p><b>Poznámka:</b> Táto funkcia je navrhnutá len pre účely údržby. Žiadne súbory nebudú odstránené, ale môže to spôsobiť značnú dátovú prevádzku a vyžiadať si niekoľko minút alebo hodín pre dokončenie, v závislosti od veľkosti priečinka. Použite túto možnosť pokiaľ máte doporučenie od správcu.</p> - + Discovering %1 - + Objavuje sa %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) z %2 miesta na disku je použité. - + No connection to %1 at <a href="%2">%3</a>. Žiadne spojenie s %1 na <a href="%2">%3</a>. - + No %1 connection configured. Žiadne nakonfigurované %1 spojenie - + Sync Running Prebiehajúca synchronizácia - + No account configured. Žiadny účet nie je nastavený. - + The syncing operation is running.<br/>Do you want to terminate it? Proces synchronizácie práve prebieha.<br/>Chcete ho ukončiť? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 %2 (%3 z %4) %5 zostáva pri rýchlosti %6/s - + %1 of %2, file %3 of %4 Total time left %5 - + %1 z %2, súbor %3 z %4 +Celkom zostáva %5 - + Connected to <a href="%1">%2</a>. Pripojené k <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Pripojené k <a href="%1">%2</a> ako <i>%3</i>. - + Currently there is no storage usage information available. Teraz nie sú k dispozícii žiadne informácie o využití úložiska. @@ -352,7 +358,7 @@ Total time left %5 Aktivita synchronizácie - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -361,17 +367,17 @@ Toto môže byť kvôli tichej rekonfigurácii priečinka, prípadne boli všetk Ste si istý, že chcete uskutočniť danú operáciu? - + Remove All Files? Odstrániť všetky súbory? - + Remove all files Odstrániť všetky súbory - + Keep files Ponechať súbory @@ -389,52 +395,52 @@ Ste si istý, že chcete uskutočniť danú operáciu? Starý synchronizačný žurnál '%1' nájdený, avšak neodstrániteľný. Prosím uistite sa, že žiadna aplikácia ho práve nevyužíva. - + Undefined State. Nedefinovaný stav. - + Waits to start syncing. Čakanie na štart synchronizácie. - + Preparing for sync. Príprava na synchronizáciu. - + Sync is running. Synchronizácia prebieha. - + Last Sync was successful. Posledná synchronizácia sa úspešne skončila. - + Last Sync was successful, but with warnings on individual files. Posledná synchronizácia bola úspešná, ale z varovaniami pre individuálne súbory. - + Setup Error. Chyba pri inštalácii. - + User Abort. Zrušené používateľom. - + Sync is paused. Synchronizácia je pozastavená. - + %1 (Sync is paused) %1 (Synchronizácia je pozastavená) @@ -461,8 +467,8 @@ Ste si istý, že chcete uskutočniť danú operáciu? Mirall::FolderWizard - - + + Add Folder Pridať priečinok @@ -470,67 +476,67 @@ Ste si istý, že chcete uskutočniť danú operáciu? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Kliknutím vyberte lokálny priečinok, ktorý chcete synchronizovať. - + Enter the path to the local folder. Zadajte cestu do lokálneho priečinka. - + The directory alias is a descriptive name for this sync connection. Alias priečinka je popisný názov pre toto synchronizačné spojenie. - + No valid local folder selected! Nebol vybratý lokálny priečinok! - + You have no permission to write to the selected folder! Nemáte oprávnenia pre zápis do daného priečinka! - + The local path %1 is already an upload folder. Please pick another one! Lokálna cesta %1 je už nastavená ako priečinok na odosielanie. Zvoľte prosím iný! - + An already configured folder is contained in the current entry. V aktuálnej položke je už obsiahnutý rovnaký konfigurovaný priečinok. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. Zvolený priečinok je symbolický odkaz. Cieľový priečinok tohoto odkazu už obsahuje nastavený priečinok. - + An already configured folder contains the currently entered folder. V aktuálnom priečinku je už obsiahnutý tento priečinok. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. Zvolený priečinok je symbolický odkaz. Cieľový priečinok tohoto odkazu už obsahuje nastavený priečinok. - + The alias can not be empty. Please provide a descriptive alias word. Alias nesmie byť prázdny. Prosím uveďte názov charakterizujúci alias. - + The alias <i>%1</i> is already in use. Please pick another alias. Alias <i>%1</i> je už použiý. Vyberte si prosím iný alias. - + Select the source folder Vyberte zdrojový priečinok @@ -538,51 +544,59 @@ Ste si istý, že chcete uskutočniť danú operáciu? Mirall::FolderWizardRemotePath - + Add Remote Folder Pridať vzdialený priečinok - + Enter the name of the new folder: Vložiť meno nového priečinka: - + Folder was successfully created on %1. Priečinok bol úspešne vytvorený na %1. - + Failed to create the folder on %1. Please check manually. Na %1 zlyhalo vytvorenie priečinka. Skontrolujte to, prosím, ručne. - + Choose this to sync the entire account Zvoľte pre synchronizáciu celého účtu - + This folder is already being synced. Tento priečinok sa už synchronizuje. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. Priečinok <i>%1</i> už synchronizujete a je nadradený priečinku <i>%2</i>. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. Už synchronizujete všetky vaše súbory. Synchronizácia dalšieho priečinka <b>nie je</b> podporovaná. Ak chcete synchronizovať viac priečinkov, odstránte, prosím, synchronizáciu aktuálneho kořenového priečinka. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Upozornenie:</b> @@ -602,7 +616,7 @@ Ste si istý, že chcete uskutočniť danú operáciu? Server returned wrong content-range - + Server vrátil nesprávnu hodnotu Content-range @@ -620,7 +634,7 @@ Ste si istý, že chcete uskutočniť danú operáciu? General Settings - + Všeobecné nastavenia @@ -805,7 +819,7 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods <p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p> - + <p>Je dostupná nová verzia klienta %1.</p><p><b>%2</b> je dostupná na stiahnutie. Nainštalovaná verzia je %3.</p> @@ -961,7 +975,7 @@ si počas procesu aktualizácie môže vyžiadať dodatočné práva. New version %1 available. Please use the system's update tool to install it. - + Je dostupná nová verzia %1. Prosím, použite nástroj na aktualizáciu systému, aby ste ju nainštalovali. @@ -1217,7 +1231,7 @@ Nie je vhodné ju používať. Skip folders configuration - + Preskočiť konfiguráciu priečinkov @@ -1276,7 +1290,7 @@ Nie je vhodné ju používať. Server returned wrong content-range - + Server vrátil nesprávnu hodnotu Content-range @@ -1297,7 +1311,7 @@ Nie je vhodné ju používať. ; Restoration Failed: - + ; Obnovenie zlyhalo: @@ -1334,7 +1348,7 @@ Nie je vhodné ju používať. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash Súbor %1 nemôže byť premenovaný na %2 z dôvodu, že tento názov je už použitý @@ -1350,17 +1364,17 @@ Nie je vhodné ju používať. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu pôvodné meno. - + This folder must not be renamed. Please name it back to Shared. Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu meno Shared. - + The file was renamed but is part of a read only share. The original file was restored. Súbor bol premenovaný, ale je súčasťou zdieľania len na čítanie. Pôvodný súbor bol obnovený. @@ -1404,7 +1418,7 @@ Nie je vhodné ju používať. The server did not acknowledge the last chunk. (No e-tag were present) - + Server nepotvrdil posledný kúsok. (Nebol prítomný e-tag) @@ -1776,7 +1790,7 @@ Nie je vhodné ju používať. Expiration Date: %1 - + Koniec platnosti: %1 @@ -1787,231 +1801,231 @@ Nie je vhodné ju používať. Mirall::SyncEngine - + Success. Úspech. - + CSync failed to create a lock file. Vytvorenie "zamykacieho" súboru cez "CSync" zlyhalo. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync sa nepodarilo načítať alebo vytvoriť súbor žurnálu. Uistite sa, že máte oprávnenia na čítanie a zápis v lokálnom synchronizovanom priečinku. - + CSync failed to write the journal file. CSync sa nepodarilo zapísať do súboru žurnálu. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>%1 zásuvný modul pre "CSync" nebolo možné načítať.<br/>Prosím skontrolujte inštaláciu!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Systémový čas tohoto klienta je odlišný od systémového času na serveri. Prosím zvážte použitie sieťovej časovej synchronizačnej služby (NTP) na serveri a klientských strojoch, aby bol na nich rovnaký čas. - + CSync could not detect the filesystem type. Detekcia súborového systému vrámci "CSync" zlyhala. - + CSync got an error while processing internal trees. Spracovanie "vnútorných stromov" vrámci "CSync" zlyhalo. - + CSync failed to reserve memory. CSync sa nepodarilo zarezervovať pamäť. - + CSync fatal parameter error. CSync kritická chyba parametrov. - + CSync processing step update failed. CSync sa nepodarilo spracovať krok aktualizácie. - + CSync processing step reconcile failed. CSync sa nepodarilo spracovať krok zladenia. - + CSync processing step propagate failed. CSync sa nepodarilo spracovať krok propagácie. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Cieľový priečinok neexistuje.</p><p>Skontrolujte, prosím, nastavenia synchronizácie.</p> - + A remote file can not be written. Please check the remote access. Vzdialený súbor nie je možné zapísať. Prosím skontrolujte vzdialený prístup. - + The local filesystem can not be written. Please check permissions. Do lokálneho súborového systému nie je možné zapisovať. Prosím skontrolujte povolenia. - + CSync failed to connect through a proxy. CSync sa nepodarilo prihlásiť cez proxy. - + CSync could not authenticate at the proxy. CSync sa nemohol prihlásiť k proxy. - + CSync failed to lookup proxy or server. CSync sa nepodarilo nájsť proxy alebo server. - + CSync failed to authenticate at the %1 server. CSync sa nepodarilo prihlásiť na server %1. - + CSync failed to connect to the network. CSync sa nepodarilo pripojiť k sieti. - + A network connection timeout happened. - + Skončil časový limit sieťového spojenia. - + A HTTP transmission error happened. Chyba HTTP prenosu. - + CSync failed due to not handled permission deniend. CSync zlyhalo. Nedostatočné oprávnenie. - + CSync failed to access CSync nepodaril prístup - + CSync tried to create a directory that already exists. CSync sa pokúsil vytvoriť priečinok, ktorý už existuje. - - + + CSync: No space on %1 server available. CSync: Na serveri %1 nie je žiadne voľné miesto. - + CSync unspecified error. CSync nešpecifikovaná chyba. - + Aborted by the user Zrušené používateľom - + An internal error number %1 happened. Vyskytla sa vnútorná chyba číslo %1. - + The item is not synced because of previous errors: %1 Položka nebola synchronizovaná kvôli predchádzajúcej chybe: %1 - + Symbolic links are not supported in syncing. Symbolické odkazy nie sú podporované pri synchronizácii. - + File is listed on the ignore list. Súbor je zapísaný na zozname ignorovaných. - + File contains invalid characters that can not be synced cross platform. Súbor obsahuje neplatné znaky, ktoré nemôžu byť zosynchronizované medzi platformami. - + Unable to initialize a sync journal. Nemôžem inicializovať synchronizačný žurnál. - + Cannot open the sync journal Nemožno otvoriť sync žurnál - + Not allowed because you don't have permission to add sub-directories in that directory - + Nie je dovolené, pretože nemáte oprávnenie pridávať do tohto adresára podadresáre. - + Not allowed because you don't have permission to add parent directory - + Nie je dovolené, pretože nemáte oprávnenie pridať nadradený adresár. - + Not allowed because you don't have permission to add files in that directory - + Nie je dovolené, pretože nemáte oprávnenie pridávať do tohto adresára súbory. - + Not allowed to upload this file because it is read-only on the server, restoring - + Nie je dovolené tento súbor nahrať, pretože je na serveri iba na čítanie. Obnovuje sa. - - + + Not allowed to remove, restoring - + Nie je dovolené odstrániť. Obnovuje sa. - + Move not allowed, item restored - + Presunutie nie je dovolené. Položka obnovená. - + Move not allowed because %1 is read-only - + Presunutie nie je dovolené, pretože %1 je na serveri iba na čítanie - + the destination - + cieľ - + the source - + zdroj @@ -2025,8 +2039,8 @@ Nie je vhodné ju používať. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2140,17 +2154,17 @@ Nie je vhodné ju používať. Discovering %1 - + Objavuje sa %1 Syncing %1 of %2 (%3 left) - + Synchronizuje sa %1 z %2 (zostáva %3) Syncing %1 (%2 left) - + Synchronizuje sa %1 (zostáva %2) @@ -2163,6 +2177,14 @@ Nie je vhodné ju používať. Až do dnešného dňa + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2403,7 +2425,7 @@ Nie je vhodné ju používať. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Ak ešte nemáte vlastný ownCloud server, na stránke <a href="https://owncloud.com">owncloud.com</a> nájdete viac informácií. @@ -2412,15 +2434,10 @@ Nie je vhodné ju používať. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> <p><small>Zostavené z Git revízie <a href="%1">%2</a> na %3, %4 pomocou Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts index d7c9541e60..d33ea5bed2 100644 --- a/translations/mirall_sl.ts +++ b/translations/mirall_sl.ts @@ -63,17 +63,22 @@ Obrazec - + + Selective Sync... + + + + Account Maintenance Upravljanje računa - + Edit Ignored Files Uredi prezrte datoteke - + Modify Account Spremeni račun @@ -89,7 +94,7 @@ - + Pause Premor @@ -104,110 +109,110 @@ Dodaj mapo ... - + Storage Usage Poraba prostora - + Retrieving usage information... Pridobivanje podatkov o prostoru ... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Opomba:</b> nekatere mape, vključno s priklopljenimi mapami in mapami v souporabi, imajo morda različne omejitve. - + Resume Nadaljuj - + Confirm Folder Remove Potrdi odstranitev mape - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Ali res želite zaustaviti usklajevanje mape <i>%1</i>?</p><p><b>Opomba:</b> s tem mape iz odjemalca ne bodo odstranjene.</p> - + Confirm Folder Reset Potrdi ponastavitev mape - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Ali ste prepričani, da želite mapo <i>%1</i> ponastaviti in ponovno izgraditi podatkovno zbirko?</p><p><b>Opozorilo:</b> Možnost je zasnovana za vzdrževanje. Datoteke sicer ne bodo spremenjene, vendar pa je opravilo lahko zelo dolgotrajno in lahko traja tudi več ur. Trajanje je odvisno od velikosti mape. Možnost uporabite le, če vam to svetuje skrbnik sistema.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) od %2 prostora strežnika je v uporabi. - + No connection to %1 at <a href="%2">%3</a>. Ni povezave z %1 pri <a href="%2">%3</a>. - + No %1 connection configured. Ni nastavljenih %1 povezav. - + Sync Running Usklajevanje je v teku - + No account configured. Ni nastavljenega računa. - + The syncing operation is running.<br/>Do you want to terminate it? Izvaja se usklajevanje.<br/>Ali želite opravilo prekiniti? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. Vzpostavljena je povezava s strežnikom <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Vzpostavljena je povezava z <a href="%1">%2</a> kot <i>%3</i>. - + Currently there is no storage usage information available. Trenutno ni na voljo nobenih podatkov o porabi prostora. @@ -352,7 +357,7 @@ Total time left %5 Dejavnost usklajevanja - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -361,17 +366,17 @@ Mapa je bila morda odstranjena ali pa so bile nastavitve spremenjene. Ali sta prepričani, da želite izvesti to opravilo? - + Remove All Files? Ali naj bodo odstranjene vse datoteke? - + Remove all files Odstrani vse datoteke - + Keep files Ohrani datoteke @@ -389,52 +394,52 @@ Ali sta prepričani, da želite izvesti to opravilo? Obstaja starejši dnevnik usklajevanja '%1', vendar ga ni mogoče odstraniti. Preverite, da datoteka ni v uporabi. - + Undefined State. Nedoločeno stanje. - + Waits to start syncing. V čakanju na začetek usklajevanja. - + Preparing for sync. Poteka priprava za usklajevanje. - + Sync is running. Usklajevanje je v teku. - + Last Sync was successful. Zadnje usklajevanje je bilo uspešno končano. - + Last Sync was successful, but with warnings on individual files. Zadnje usklajevanje je bilo sicer uspešno, vendar z opozorili za posamezne datoteke. - + Setup Error. Napaka nastavitve. - + User Abort. Uporabniška prekinitev. - + Sync is paused. Usklajevanje je začasno v premoru. - + %1 (Sync is paused) %1 (usklajevanje je v premoru) @@ -461,8 +466,8 @@ Ali sta prepričani, da želite izvesti to opravilo? Mirall::FolderWizard - - + + Add Folder Dodaj mapo @@ -470,67 +475,67 @@ Ali sta prepričani, da želite izvesti to opravilo? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Kliknite za izbor krajevne mape za usklajevanje. - + Enter the path to the local folder. Vpišite pot do krajevne mape. - + The directory alias is a descriptive name for this sync connection. Oznaka mape je opisno ime za usklajevano povezavo. - + No valid local folder selected! Ni izbrane veljavne krajevne mape! - + You have no permission to write to the selected folder! Ni ustreznih dovoljenj za pisanje v izbrano mapo! - + The local path %1 is already an upload folder. Please pick another one! Krajevna pot %1 je že mapa za pošiljanje. Izbrati je treba drugo. - + An already configured folder is contained in the current entry. Trenutni vnos določa mapo, ki je že nastavljena. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. Označena mapa je simbolična povezava. V mapi je povezava do že nastavljene mape s povezavo. - + An already configured folder contains the currently entered folder. Trenutno vpisana mapa je že usklajena kot podrejena mapa. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. Izbrana mapa je simbolna povezava. Naslov povezave je nadrejena mapa trenutno izbrane mape. - + The alias can not be empty. Please provide a descriptive alias word. Polje oznake ne sme biti prazno. - + The alias <i>%1</i> is already in use. Please pick another alias. Oznaka <i>%1</i> je že v uporabi. Izbrati je treba drugo. - + Select the source folder Izbor izvorne mape @@ -538,51 +543,59 @@ Ali sta prepričani, da želite izvesti to opravilo? Mirall::FolderWizardRemotePath - + Add Remote Folder Dodaj oddaljeno mapo - + Enter the name of the new folder: Ime nove mape: - + Folder was successfully created on %1. Mapa je uspešno ustvarjena na %1. - + Failed to create the folder on %1. Please check manually. Ustvarjanje mape na %1 je spodletelo. Poskusite jo ustvariti ročno. - + Choose this to sync the entire account Izberite možnost za usklajevanje celotnega računa. - + This folder is already being synced. Ta mapa je že določena za usklajevanje. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. Datoteke se že usklajujejo na ravni mape <i>%1</i>, ki je nadrejena mapi <i>%2</i>. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. Trenutno so v usklajevanju vse datoteke korenske mape. Usklajevanje še ene mape <b>ni</b> podprto. Če želite uskladiti več map, je treba odstraniti trenutno nastavljeno korensko mapo in spremeniti nastavitve. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Opozorilo:</b> @@ -1334,7 +1347,7 @@ Uporaba ni priporočljiva. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash Datoteke %1 ni mogoče preimenovati v %2 zaradi že obstoječe datoteke s tem imenom. @@ -1350,17 +1363,17 @@ Uporaba ni priporočljiva. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Te mape ni dovoljeno preimenovati, zato bo samodejno preimenovana v izvorno ime. - + This folder must not be renamed. Please name it back to Shared. Mape ni dovoljeno preimenovati. Preimenujte jo nazaj na privzeto vrednost. - + The file was renamed but is part of a read only share. The original file was restored. Datoteka je preimenovana, vendar je označena za souporabo le za branje. Obnovljena je izvirna datoteka. @@ -1788,229 +1801,229 @@ Te je treba uskladiti znova. Mirall::SyncEngine - + Success. Uspešno končano. - + CSync failed to create a lock file. Ustvarjanje datoteke zaklepa s CSync je spodletelo. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. Nalaganje ali ustvarjanje dnevniške datoteke s CSync je spodletelo. Za to opravilo so zahtevana posebna dovoljenja krajevne mape za usklajevanje. - + CSync failed to write the journal file. Zapisovanje dnevniške datoteke s CSync je spodletelo. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Vstavka %1 za CSync ni mogoče naložiti.<br/>Preverite namestitev!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Sistemski čas na odjemalcu ni skladen s sistemskim časom na strežniku. Priporočljivo je uporabiti storitev usklajevanja časa (NTP) na strežniku in odjemalcu. S tem omogočimo ujemanje podatkov o času krajevnih in oddaljenih datotek. - + CSync could not detect the filesystem type. Zaznavanje vrste datotečnega sistema s CSync je spodletelo. - + CSync got an error while processing internal trees. Pri obdelavi notranje drevesne strukture s CSync je prišlo do napake. - + CSync failed to reserve memory. Vpisovanje prostora v pomnilniku za CSync je spodletelo. - + CSync fatal parameter error. Usodna napaka parametra CSync. - + CSync processing step update failed. Korak opravila posodobitve CSync je spodletel. - + CSync processing step reconcile failed. Korak opravila poravnave CSync je spodletel. - + CSync processing step propagate failed. Korak opravila razširjanja CSync je spodletel. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Ciljna mapa ne obstaja.</p><p>Preveriti je treba nastavitve usklajevanja.</p> - + A remote file can not be written. Please check the remote access. Oddaljene datoteke ni mogoče zapisati. Najverjetneje je vzrok v oddaljenem dostopu. - + The local filesystem can not be written. Please check permissions. V krajevni datotečni sistem ni mogoče pisati. Najverjetneje je vzrok v neustreznih dovoljenjih. - + CSync failed to connect through a proxy. Povezava CSync preko posredniškega strežnika je spodletel. - + CSync could not authenticate at the proxy. Overitev CSync na posredniškem strežniku je spodletela. - + CSync failed to lookup proxy or server. Poizvedba posredniškega strežnika s CSync je spodletela. - + CSync failed to authenticate at the %1 server. Overitev CSync pri strežniku %1 je spodletela. - + CSync failed to connect to the network. Povezava CSync v omrežje je spodletela. - + A network connection timeout happened. - + A HTTP transmission error happened. Prišlo je do napake med prenosom HTTP. - + CSync failed due to not handled permission deniend. Delovanje CSync je zaradi neustreznih dovoljenj spodletelo. - + CSync failed to access Dostop s CSync je spodletel - + CSync tried to create a directory that already exists. Prišlo je do napake programa CSync zaradi poskusa ustvarjanja mape z že obstoječim imenom. - - + + CSync: No space on %1 server available. Odziv CSync: na strežniku %1 ni razpoložljivega prostora. - + CSync unspecified error. Nedoločena napaka CSync. - + Aborted by the user Opravilo je bilo prekinjeno s strani uporabnika - + An internal error number %1 happened. Prišlo je do notranje napake številka %1. - + The item is not synced because of previous errors: %1 Predmet ni usklajen zaradi predhodne napake: %1 - + Symbolic links are not supported in syncing. Usklajevanje simbolnih povezav ni podprto. - + File is listed on the ignore list. Datoteka je na seznamu prezrtih datotek. - + File contains invalid characters that can not be synced cross platform. Ime datoteke vsebuje neveljavne znake, ki niso podprti na vseh okoljih. - + Unable to initialize a sync journal. Dnevnika usklajevanja ni mogoče začeti. - + Cannot open the sync journal Ni mogoče odpreti dnevnika usklajevanja - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination cilj - + the source vir @@ -2026,8 +2039,8 @@ Te je treba uskladiti znova. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2164,6 +2177,14 @@ Te je treba uskladiti znova. Ni posodobitev + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2404,7 +2425,7 @@ Te je treba uskladiti znova. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! V primeru, da lastnega strežnika ownCloud še nimate, za več podrobnosti o možnostih obiščite spletišče <a href="https://owncloud.com">owncloud.com</a>. @@ -2413,15 +2434,10 @@ Te je treba uskladiti znova. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> <p><small>Zgrajeno s predelavo Git <a href="%1">%2</a> na %3, %4 s podporo Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts index abbecea87a..2dbdc3137d 100644 --- a/translations/mirall_sv.ts +++ b/translations/mirall_sv.ts @@ -63,17 +63,22 @@ Form - + + Selective Sync... + + + + Account Maintenance Hantera ditt konto - + Edit Ignored Files Ändra ignorerade filer - + Modify Account Ändra Konto @@ -89,7 +94,7 @@ - + Pause Paus @@ -104,111 +109,111 @@ Lägg till mapp - + Storage Usage Lagringsutrymme - + Retrieving usage information... Hämtar information om användning... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Notera:</b> Vissa mappar, inklusive nätverksmonterade eller delade mappar, kan ha olika begränsningar - + Resume Återuppta - + Confirm Folder Remove Bekräfta radering av mapp - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Vill du verkligen stoppa synkroniseringen av mappen <i>%1</i>?</p><p><b>Notera:</b> Detta kommer inte att radera filerna från din klient.</p> - + Confirm Folder Reset Bekräfta återställning av mapp - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Vill du verkligen nollställa mappen <i>%1</i> och återställa din databas?</p><p><b>Notera:</b> Denna funktion är endast designad för underhållsuppgifter. Inga filer raderas, men kan skapa mycket datatrafik och ta allt från några minuter till flera timmar att slutföra, beroende på storleken på mappen. Använd endast detta alternativ om du har blivit uppmanad av din systemadministratör.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) av %2 server utrymme används. - + No connection to %1 at <a href="%2">%3</a>. Ingen anslutning till %1 vid <a href="%2">%3</a> - + No %1 connection configured. Ingen %1 anslutning konfigurerad. - + Sync Running Synkronisering pågår - + No account configured. Inget konto är konfigurerat. - + The syncing operation is running.<br/>Do you want to terminate it? En synkronisering pågår.<br/>Vill du avbryta den? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 of %4) %5 återstående. Hastighet %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 av %2, fil %3 av %4 Tid kvar %5 - + Connected to <a href="%1">%2</a>. Ansluten till <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Ansluten till <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. Just nu finns ingen utrymmes information tillgänglig @@ -353,7 +358,7 @@ Tid kvar %5 Synk aktivitet - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -362,17 +367,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file Är du säker på att du vill fortsätta? - + Remove All Files? Ta bort alla filer? - + Remove all files Ta bort alla filer - + Keep files Behåll filer @@ -390,52 +395,52 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file En gammal synkroniseringsjournal '%1' hittades, men kunde inte raderas. Vänligen se till att inga program för tillfället använder den. - + Undefined State. Okänt tillstånd. - + Waits to start syncing. Väntar på att starta synkronisering. - + Preparing for sync. Förbereder synkronisering - + Sync is running. Synkronisering pågår. - + Last Sync was successful. Senaste synkronisering lyckades. - + Last Sync was successful, but with warnings on individual files. Senaste synkning lyckades, men det finns varningar för vissa filer! - + Setup Error. Inställningsfel. - + User Abort. Användare Avbryt - + Sync is paused. Synkronisering är pausad. - + %1 (Sync is paused) %1 (Synk är stoppad) @@ -462,8 +467,8 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file Mirall::FolderWizard - - + + Add Folder Lägg till mapp @@ -471,67 +476,67 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Klicka för att välja en lokal mapp att synka. - + Enter the path to the local folder. Ange sökvägen till den lokala mappen. - + The directory alias is a descriptive name for this sync connection. Katalogens alias är ett beskrivande namn för denna synkroniseringsanslutning. - + No valid local folder selected! Ingen tillåten lokal mapp vald! - + You have no permission to write to the selected folder! Du har inga skrivrättigheter till den valda mappen! - + The local path %1 is already an upload folder. Please pick another one! Den lokala sökvägen %1 är redan en uppladdningsmapp. Välj en annan! - + An already configured folder is contained in the current entry. En redan konfigurerad mapp finns i den aktuella posten. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. Den valda mappen är en symbolisk länk. En redan konfigurerad mapp finns i mappen länken pekar på. - + An already configured folder contains the currently entered folder. En redan konfigurerad mapp innehåller den angivna mappen. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. Den angivna mappen är en symbolisk länk. En redan konfigurerad mapp är förälder till den valda och innehåller mappen länken pekar på. - + The alias can not be empty. Please provide a descriptive alias word. Alias ​​kan inte vara tomt. Ange ett beskrivande ord för alias. - + The alias <i>%1</i> is already in use. Please pick another alias. <i>%1</i> används redan. Välj ett annat alias. - + Select the source folder Välj källmapp @@ -539,51 +544,59 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file Mirall::FolderWizardRemotePath - + Add Remote Folder Lägg till fjärrmapp - + Enter the name of the new folder: Ange ett namn på den nya mappen: - + Folder was successfully created on %1. Mappen skapades på %1. - + Failed to create the folder on %1. Please check manually. Det gick inte att skapa mappen på %1. Kontrollera manuellt. - + Choose this to sync the entire account Välj detta för att synka allt - + This folder is already being synced. Denna mappen synkas redan. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. Du synkar redan <i>%1</i>, vilket är övermapp till <i>%2</i> - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. Du synkroniserar redan alla dina filer. Synkronisering av en annan mapp stöds <b>ej</b>. Om du vill synka flera mappar, ta bort den för tillfället konfigurerade rotmappen från synk. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Varning:</b> @@ -1335,7 +1348,7 @@ Det är inte lämpligt använda den. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash Filen %1 kan inte döpas om till %2 på grund av ett lokalt filnamn @@ -1351,17 +1364,17 @@ Det är inte lämpligt använda den. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Denna mapp får inte byta namn. Den kommer att döpas om till sitt ursprungliga namn. - + This folder must not be renamed. Please name it back to Shared. Denna mapp får ej döpas om. Vänligen döp den till Delad igen. - + The file was renamed but is part of a read only share. The original file was restored. En fil döptes om men är en del av en endast-läsbar delning. Original filen återställdes. @@ -1789,229 +1802,229 @@ Försök att synka dessa igen. Mirall::SyncEngine - + Success. Lyckades. - + CSync failed to create a lock file. CSync misslyckades med att skapa en låsfil. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync misslyckades att skapa en journal fil. Se till att du har läs och skriv rättigheter i den lokala synk katalogen. - + CSync failed to write the journal file. CSynk misslyckades att skriva till journal filen. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Plugin %1 för csync kunde inte laddas.<br/>Var god verifiera installationen!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Systemtiden på denna klientdator är annorlunda än systemtiden på servern. Använd en tjänst för tidssynkronisering (NTP) på servern och alla klientdatorer så att tiden är lika. - + CSync could not detect the filesystem type. CSync kunde inte upptäcka filsystemtyp. - + CSync got an error while processing internal trees. CSYNC fel vid intern bearbetning. - + CSync failed to reserve memory. CSync misslyckades att reservera minne. - + CSync fatal parameter error. CSync fatal parameter fel. - + CSync processing step update failed. CSync processteg update misslyckades. - + CSync processing step reconcile failed. CSync processteg reconcile misslyckades. - + CSync processing step propagate failed. CSync processteg propagate misslyckades. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Målmappen finns inte</p><p>Vänligen, kontroller inställningen för sync.</p> - + A remote file can not be written. Please check the remote access. En fil på servern kan inte skapas. Kontrollera åtkomst till fjärranslutningen. - + The local filesystem can not be written. Please check permissions. Kan inte skriva till det lokala filsystemet. Var god kontrollera rättigheterna. - + CSync failed to connect through a proxy. CSync misslyckades att ansluta genom en proxy. - + CSync could not authenticate at the proxy. CSync kunde inte autentisera mot proxy. - + CSync failed to lookup proxy or server. CSync misslyckades att hitta proxy eller server. - + CSync failed to authenticate at the %1 server. CSync misslyckades att autentisera mot %1 servern. - + CSync failed to connect to the network. CSync misslyckades att ansluta mot nätverket. - + A network connection timeout happened. En timeout på nätverksanslutningen har inträffat. - + A HTTP transmission error happened. Ett HTTP överföringsfel inträffade. - + CSync failed due to not handled permission deniend. CSYNC misslyckades på grund av att nekad åtkomst inte hanterades. - + CSync failed to access CSynk misslyckades att tillträda - + CSync tried to create a directory that already exists. CSync försökte skapa en mapp som redan finns. - - + + CSync: No space on %1 server available. CSync: Ingen plats på %1 server tillgänglig. - + CSync unspecified error. CSync ospecificerat fel. - + Aborted by the user Avbruten av användare - + An internal error number %1 happened. Ett internt fel hände. nummer %1 - + The item is not synced because of previous errors: %1 Objektet kunde inte synkas på grund av tidigare fel: %1 - + Symbolic links are not supported in syncing. Symboliska länkar stöds ej i synkningen. - + File is listed on the ignore list. Filen är listad i ignorerings listan. - + File contains invalid characters that can not be synced cross platform. Filen innehåller ogiltiga tecken som inte kan synkas oberoende av plattform. - + Unable to initialize a sync journal. Kan inte initialisera en synk journal. - + Cannot open the sync journal Kunde inte öppna synk journalen - + Not allowed because you don't have permission to add sub-directories in that directory Går ej att genomföra då du saknar rättigheter att lägga till underkataloger i den katalogen - + Not allowed because you don't have permission to add parent directory Går ej att genomföra då du saknar rättigheter att lägga till någon moderkatalog - + Not allowed because you don't have permission to add files in that directory Går ej att genomföra då du saknar rättigheter att lägga till filer i den katalogen - + Not allowed to upload this file because it is read-only on the server, restoring Inte behörig att ladda upp denna fil då den är skrivskyddad på servern, återställer - - + + Not allowed to remove, restoring Inte behörig att radera, återställer - + Move not allowed, item restored Det gick inte att genomföra flytten, objektet återställs - + Move not allowed because %1 is read-only Det gick inte att genomföra flytten då %1 är skrivskyddad - + the destination destinationen - + the source källan @@ -2027,8 +2040,8 @@ Försök att synka dessa igen. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2165,6 +2178,14 @@ Försök att synka dessa igen. Aktuell version + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2405,7 +2426,7 @@ Försök att synka dessa igen. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Om du inte har en ownCloud-server ännu, besök <a href="https://owncloud.com">owncloud.com</a> för mer info. @@ -2414,15 +2435,10 @@ Försök att synka dessa igen. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> <p><small>Byggd på Git revision <a href="%1">%2</a> på %3, %4 med användning utav Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts index c73a20967b..b706922aae 100644 --- a/translations/mirall_th.ts +++ b/translations/mirall_th.ts @@ -63,17 +63,22 @@ แบบฟอร์ม - + + Selective Sync... + + + + Account Maintenance - + Edit Ignored Files - + Modify Account @@ -89,7 +94,7 @@ - + Pause หยุดชั่วคราว @@ -104,110 +109,110 @@ - + Storage Usage - + Retrieving usage information... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. - + Resume ดำเนินการต่อ - + Confirm Folder Remove ยืนยันการลบโฟลเดอร์ - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> - + Confirm Folder Reset - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. ยังไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า - + Sync Running การซิงค์ข้อมูลกำลังทำงาน - + No account configured. - + The syncing operation is running.<br/>Do you want to terminate it? การดำเนินการเพื่อถ่ายโอนข้อมูลกำลังทำงานอยู่ <br/>คุณต้องการสิ้นสุดการทำงานหรือไม่? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. @@ -352,24 +357,24 @@ Total time left %5 - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? - + Remove All Files? - + Remove all files - + Keep files @@ -387,52 +392,52 @@ Are you sure you want to perform this operation? - + Undefined State. สถานะที่ยังไม่ได้ถูกกำหนด - + Waits to start syncing. รอการเริ่มต้นซิงค์ข้อมูล - + Preparing for sync. - + Sync is running. การซิงค์ข้อมูลกำลังทำงาน - + Last Sync was successful. การซิงค์ข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว - + Last Sync was successful, but with warnings on individual files. - + Setup Error. เกิดข้อผิดพลาดในการติดตั้ง - + User Abort. - + Sync is paused. การซิงค์ข้อมูลถูกหยุดไว้ชั่วคราว - + %1 (Sync is paused) @@ -459,8 +464,8 @@ Are you sure you want to perform this operation? Mirall::FolderWizard - - + + Add Folder เพิ่มโฟลเดอร์ @@ -468,67 +473,67 @@ Are you sure you want to perform this operation? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. - + Enter the path to the local folder. - + The directory alias is a descriptive name for this sync connection. - + No valid local folder selected! - + You have no permission to write to the selected folder! - + The local path %1 is already an upload folder. Please pick another one! - + An already configured folder is contained in the current entry. โฟลเดอร์ที่ถูกกำหนดค่าไว้แล้วได้บรรจุรายการปัจจุบันอยู่ - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. - + An already configured folder contains the currently entered folder. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. - + The alias can not be empty. Please provide a descriptive alias word. นามแฝงไม่สามารถเว้นว่างได้ กรุณาใส่คำที่ต้องการใช้เป็นนามแฝง - + The alias <i>%1</i> is already in use. Please pick another alias. - + Select the source folder เลือกโฟลเดอร์ต้นฉบับ @@ -536,51 +541,59 @@ Are you sure you want to perform this operation? Mirall::FolderWizardRemotePath - + Add Remote Folder - + Enter the name of the new folder: - + Folder was successfully created on %1. โฟลเดอร์ถูกสร้างขึ้นเรียบร้อยแล้วเมื่อ %1... - + Failed to create the folder on %1. Please check manually. - + Choose this to sync the entire account - + This folder is already being synced. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> @@ -1328,7 +1341,7 @@ It is not advisable to use it. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash @@ -1344,17 +1357,17 @@ It is not advisable to use it. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. - + This folder must not be renamed. Please name it back to Shared. - + The file was renamed but is part of a read only share. The original file was restored. @@ -1779,229 +1792,229 @@ It is not advisable to use it. Mirall::SyncEngine - + Success. เสร็จสิ้น - + CSync failed to create a lock file. CSync ล้มเหลวในการสร้างไฟล์ล็อคข้อมูล - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. - + CSync failed to write the journal file. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>ปลั๊กอิน %1 สำหรับ csync could not be loadeไม่สามารถโหลดได้.<br/>กรุณาตรวจสอบความถูกต้องในการติดตั้ง!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. เวลาในระบบของโปรแกรมไคลเอนต์นี้แตกต่างจากเวลาในระบบของเซิร์ฟเวอร์ กรุณาใช้บริการผสานข้อมูลของเวลา (NTP) บนเซิร์ฟเวอร์และเครื่องไคลเอนต์เพื่อปรับเวลาให้ตรงกัน - + CSync could not detect the filesystem type. CSync ไม่สามารถตรวจพบประเภทของไฟล์ในระบบได้ - + CSync got an error while processing internal trees. CSync เกิดข้อผิดพลาดบางประการในระหว่างประมวลผล internal trees - + CSync failed to reserve memory. การจัดสรรหน่วยความจำ CSync ล้มเหลว - + CSync fatal parameter error. พบข้อผิดพลาดเกี่ยวกับ CSync fatal parameter - + CSync processing step update failed. การอัพเดทขั้นตอนการประมวลผล CSync ล้มเหลว - + CSync processing step reconcile failed. การปรับปรุงขั้นตอนการประมวลผล CSync ล้มเหลว - + CSync processing step propagate failed. การถ่ายทอดขั้นตอนการประมวลผล CSync ล้มเหลว - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> - + A remote file can not be written. Please check the remote access. ไม่สามารถเขียนข้อมูลไปยังไฟล์ระยะไกลได้ กรุณาตรวจสอบการเข้าถึงข้อมูลระยะไกล - + The local filesystem can not be written. Please check permissions. ระบบไฟล์ในพื้นที่ไม่สามารถเขียนข้อมูลได้ กรุณาตรวจสอบสิทธิ์การเข้าใช้งาน - + CSync failed to connect through a proxy. CSync ล้มเหลวในการเชื่อมต่อผ่านทางพร็อกซี่ - + CSync could not authenticate at the proxy. - + CSync failed to lookup proxy or server. CSync ไม่สามารถค้นหาพร็อกซี่บนเซิร์ฟเวอร์ได้ - + CSync failed to authenticate at the %1 server. CSync ล้มเหลวในการยืนยันสิทธิ์การเข้าใช้งานที่เซิร์ฟเวอร์ %1 - + CSync failed to connect to the network. CSync ล้มเหลวในการเชื่อมต่อกับเครือข่าย - + A network connection timeout happened. - + A HTTP transmission error happened. เกิดข้อผิดพลาดเกี่ยวกับ HTTP transmission - + CSync failed due to not handled permission deniend. CSync ล้มเหลว เนื่องจากไม่สามารถจัดการกับการปฏิเสธให้เข้าใช้งานได้ - + CSync failed to access - + CSync tried to create a directory that already exists. CSync ได้พยายามที่จะสร้างไดเร็กทอรี่ที่มีอยู่แล้ว - - + + CSync: No space on %1 server available. CSync: ไม่มีพื้นที่เหลือเพียงพอบนเซิร์ฟเวอร์ %1 - + CSync unspecified error. CSync ไม่สามารถระบุข้อผิดพลาดได้ - + Aborted by the user - + An internal error number %1 happened. - + The item is not synced because of previous errors: %1 - + Symbolic links are not supported in syncing. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2017,8 +2030,8 @@ It is not advisable to use it. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2155,6 +2168,14 @@ It is not advisable to use it. + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2395,7 +2416,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! @@ -2404,15 +2425,10 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts index c9b64360ff..cb55740bb6 100644 --- a/translations/mirall_tr.ts +++ b/translations/mirall_tr.ts @@ -63,17 +63,22 @@ Form - + + Selective Sync... + + + + Account Maintenance Hesap Bakımı - + Edit Ignored Files Yoksayılan Dosyaları Düzenle - + Modify Account Hesabı Düzenle @@ -89,7 +94,7 @@ - + Pause Duraklat @@ -104,111 +109,111 @@ Klasör Ekle... - + Storage Usage Depolama Kullanımı - + Retrieving usage information... Kullanım bilgisi alınıyor... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Not:</b> Ağa bağlanmış veya paylaşılan klasörler de dahil olmak üzere bazı klasörler, farklı sınırlara sahip olabilirler. - + Resume Devam et - + Confirm Folder Remove Klasör Kaldırma İşlemini Onayla - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Gerçekten <i>%1</i> klasörünü eşitlemeyi durdurmak istiyor musunuz?</p><p><b>Not:</b> Bu işlem dosyaları istemcinizden kaldırmayacaktır.</p> - + Confirm Folder Reset Klasör Sıfırlamayı Onayla - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Gerçekten <i>%1</i> klasörünü sıfırlamak ve istemci veritabanını yeniden inşa etmek istiyor musunuz?</p><p><b>Not:</b> Bu işlev sadece bakım amaçlı tasarlandı. Hiçbir dosya kaldırılmayacak, fakat bu işlem büyük veri trafiğine sebep olabilir ve klasör boyutuna bağlı olarak tamamlanması birkaç dakikadan birkaç saate kadar sürebilir. Bu seçeneği sadece yöneticiniz tarafından istenmişse kullanın.</p> - + Discovering %1 Ortaya çıkarılan: %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. Sunucudaki %2'lık kotanın %1'ı (%%3) kullanılıyor. - + No connection to %1 at <a href="%2">%3</a>. <a href="%2">%3</a> üzerinde %1 bağlantısı yok. - + No %1 connection configured. Hiç %1 bağlantısı yapılandırılmamış. - + Sync Running Eşitleme Çalışıyor - + No account configured. Hiçbir hesap yapılandırılmamış. - + The syncing operation is running.<br/>Do you want to terminate it? Eşitleme işlemi devam ediyor.<br/>Durdurmak istiyor musunuz? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3/%4) %6/s aktarım hızında kalan %5 - + %1 of %2, file %3 of %4 Total time left %5 %1/%2, dosya %3/%4 Toplam kalan süre %5 - + Connected to <a href="%1">%2</a>. <a href="%1">%2</a> ile bağlı. - + Connected to <a href="%1">%2</a> as <i>%3</i>. <a href="%1">%2</a> bağlantısı <i>%3</i> olarak yapıldı. - + Currently there is no storage usage information available. Şu anda depolama kullanım bilgisi mevcut değil. @@ -353,7 +358,7 @@ Toplam kalan süre %5 Eşitleme Etkinliği - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -362,17 +367,17 @@ Bu, klasörün sessizce yeniden yapılandırılması veya tüm dosyaların el il Bu işlemi gerçekleştirmek istediğinize emin misiniz? - + Remove All Files? Tüm Dosyalar Kaldırılsın mı? - + Remove all files Tüm dosyaları kaldır - + Keep files Dosyaları koru @@ -390,52 +395,52 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz? Eski eşitleme günlüğü '%1' bulundu ancak kaldırılamadı. Başka bir uygulama tarafından kullanılmadığından emin olun. - + Undefined State. Tanımlanmamış Durum. - + Waits to start syncing. Eşitleme başlatmak için bekleniyor. - + Preparing for sync. Eşitleme için hazırlanıyor. - + Sync is running. Eşitleme çalışıyor. - + Last Sync was successful. Son Eşitleme başarılı oldu. - + Last Sync was successful, but with warnings on individual files. Son eşitleme başarılıydı, ancak tekil dosyalarda uyarılar vardı. - + Setup Error. Kurulum Hatası. - + User Abort. Kullanıcı İptal Etti. - + Sync is paused. Eşitleme duraklatıldı. - + %1 (Sync is paused) %1 (Eşitleme duraklatıldı) @@ -462,8 +467,8 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz? Mirall::FolderWizard - - + + Add Folder Klasör Ekle @@ -471,67 +476,67 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. Eşitlemek için yerel bir klasör seçmek üzere tıklayın. - + Enter the path to the local folder. Yerel klasörün yolunu girin. - + The directory alias is a descriptive name for this sync connection. Dizin sahte adı, bu eşitleme bağlantısı için tanımlayıcı bir addır. - + No valid local folder selected! Geçerli yerel klasör seçilmedi! - + You have no permission to write to the selected folder! Seçilen klasöre yazma izniniz yok! - + The local path %1 is already an upload folder. Please pick another one! %1 yerel yolu zaten bir yükleme klasörü. Lütfen farklı bir seçim yapın! - + An already configured folder is contained in the current entry. Zaten geçerli girdide yapılandırılmış bir klasör var. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. Seçilen klasör sembolik bir bağlantı. Bu bağlantının işaretlediği klasörde zaten yapılandırılmış bir klasör mevcut. - + An already configured folder contains the currently entered folder. Zaten yapılandırılmış bir klasör içinde bulunulan klasörü içeriyor. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. Seçilen klasör sembolik bir bağlantı. Zaten yapılandırılmış bir klasör, bu bağlantının işaret ettiği geçerli seçimdeki klasörü içeren üst klasörü. - + The alias can not be empty. Please provide a descriptive alias word. Takma isim boş olamaz. Lütfen açıklayıcı bir takma isim sağlayın. - + The alias <i>%1</i> is already in use. Please pick another alias. <i>%1</i> takma adı zaten kullanımda. Lütfen farklı bir isim seçin. - + Select the source folder Kaynak klasörünü seçin @@ -539,51 +544,59 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz? Mirall::FolderWizardRemotePath - + Add Remote Folder Uzak Klasör Ekle - + Enter the name of the new folder: Yeni klasörün adını girin: - + Folder was successfully created on %1. Klasör %1 üzerinde başarıyla oluşturuldu. - + Failed to create the folder on %1. Please check manually. %1 üzerinde klasör oluşturma başarısız. Lütfen elle denetleyin. - + Choose this to sync the entire account Tüm hesabı eşitlemek için bunu seçin - + This folder is already being synced. Bu klasör zaten eşitleniyor. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. <i>%1</i> zaten eşitleniyor. Bu, <i>%2</i> klasörünün üst klasörü. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. Zaten tüm dosyalarınızı eşitliyorsunuz. Farklı bir klasör eşitlemek <b>desteklenmiyor</b>. Eğer çoklu klasörleri eşitlemek isterseniz, lütfen şu anda yapılandırılmış kök klasör eşitlemesini kaldırın. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>Uyarı:</b> @@ -1335,7 +1348,7 @@ Kullanmanız önerilmez. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash Yerel bir dosya adı çakışması nedeniyle %1 dosyası %2 olarak adlandırılamadı @@ -1351,17 +1364,17 @@ Kullanmanız önerilmez. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Bu klasörün adı değiştirilmemelidir. Özgün adına geri dönüştürüldü. - + This folder must not be renamed. Please name it back to Shared. Bu klasörün adı değiştirilmemelidir. Lütfen Shared olarak geri adlandırın. - + The file was renamed but is part of a read only share. The original file was restored. Dosya adlandırıldı ancak salt okunur paylaşımın bir parçası. Özgün dosya geri yüklendi. @@ -1789,229 +1802,229 @@ Bu dosyaları tekrar eşitlemeyi deneyin. Mirall::SyncEngine - + Success. Başarılı. - + CSync failed to create a lock file. CSync bir kilit dosyası oluşturamadı. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. CSync, günlük dosyası yükleyemedi veya oluşturamadı. Lütfen yerel eşitleme dizininde okuma ve yazma izinleriniz olduğundan emin olun. - + CSync failed to write the journal file. CSync günlük dosyasına yazamadı. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>Csync için %1 eklentisi yüklenemedi.<br/>Lütfen kurulumu doğrulayın!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Bu istemci üzerinde sistem saati sunucudaki sistem saati ile farklı. Sunucu ve istemci makinelerde bir zaman eşitleme hizmeti (NTP) kullanırsanız zaman aynı kalır. - + CSync could not detect the filesystem type. CSync dosya sistemi türünü tespit edemedi. - + CSync got an error while processing internal trees. CSync dahili ağaçları işlerken bir hata ile karşılaştı. - + CSync failed to reserve memory. CSync bellek ayıramadı. - + CSync fatal parameter error. CSync ciddi parametre hatası. - + CSync processing step update failed. CSync güncelleme süreç adımı başarısız. - + CSync processing step reconcile failed. CSync uzlaştırma süreç adımı başarısız. - + CSync processing step propagate failed. CSync yayma süreç adımı başarısız. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>Hedef dizin mevcut değil.</p><p>Lütfen eşitleme ayarını denetleyin.</p> - + A remote file can not be written. Please check the remote access. Bir uzak dosya yazılamıyor. Lütfen uzak erişimi denetleyin. - + The local filesystem can not be written. Please check permissions. Yerel dosya sistemine yazılamıyor. Lütfen izinleri kontrol edin. - + CSync failed to connect through a proxy. CSync bir vekil sunucu aracılığıyla bağlanırken hata oluştu. - + CSync could not authenticate at the proxy. CSync vekil sunucuda kimlik doğrulayamadı. - + CSync failed to lookup proxy or server. CSync bir vekil veya sunucu ararken başarısız oldu. - + CSync failed to authenticate at the %1 server. CSync %1 sunucusunda kimlik doğrularken başarısız oldu. - + CSync failed to connect to the network. CSync ağa bağlanamadı. - + A network connection timeout happened. Bir ağ zaman aşımı meydana geldi. - + A HTTP transmission error happened. Bir HTTP aktarım hatası oluştu. - + CSync failed due to not handled permission deniend. CSync ele alınmayan izin reddinden dolayı başarısız. - + CSync failed to access CSync erişemedi: - + CSync tried to create a directory that already exists. CSync, zaten mevcut olan bir dizin oluşturmaya çalıştı. - - + + CSync: No space on %1 server available. CSync: %1 sunucusunda kullanılabilir alan yok. - + CSync unspecified error. CSync belirtilmemiş hata. - + Aborted by the user Kullanıcı tarafından iptal edildi - + An internal error number %1 happened. %1 numaralı bir hata oluştu. - + The item is not synced because of previous errors: %1 Bu öge önceki hatalar koşullarından dolayı eşitlenemiyor: %1 - + Symbolic links are not supported in syncing. Sembolik bağlantılar eşitlemede desteklenmiyor. - + File is listed on the ignore list. Dosya yoksayma listesinde. - + File contains invalid characters that can not be synced cross platform. Dosya, çapraz platform arasında eşitlenemeyecek karakterler içeriyor. - + Unable to initialize a sync journal. Bir eşitleme günlüğü başlatılamadı. - + Cannot open the sync journal Eşitleme günlüğü açılamıyor - + Not allowed because you don't have permission to add sub-directories in that directory Bu dizine alt dizin ekleme yetkiniz olmadığından izin verilmedi - + Not allowed because you don't have permission to add parent directory Üst dizin ekleme yetkiniz olmadığından izin verilmedi - + Not allowed because you don't have permission to add files in that directory Bu dizine dosya ekleme yetkiniz olmadığından izin verilmedi - + Not allowed to upload this file because it is read-only on the server, restoring Sunucuda salt okunur olduğundan, bu dosya yüklenemedi, geri alınıyor - - + + Not allowed to remove, restoring Kaldırmaya izin verilmedi, geri alınıyor - + Move not allowed, item restored Taşımaya izin verilmedi, öge geri alındı - + Move not allowed because %1 is read-only %1 salt okunur olduğundan taşımaya izin verilmedi - + the destination hedef - + the source kaynak @@ -2027,9 +2040,9 @@ Bu dosyaları tekrar eşitlemeyi deneyin. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - <p>Sürüm %1 Daha fazla bilgi için lütfen <a href='%2'>%3</a> adresini ziyaret edin.</p><p>Telif hakkı ownCloud, Inc.</p><p>Dağıtım %4 ve GNU Genel Kamu Lisansı (GPL) Sürüm 2.0 ile lisanslanmıştır olup <br>%5 ve %5 logoları ABD ve/veya diğer ülkelerde %4 tescili markalarıdır.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + @@ -2165,6 +2178,14 @@ Bu dosyaları tekrar eşitlemeyi deneyin. Güncel + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2405,7 +2426,7 @@ Bu dosyaları tekrar eşitlemeyi deneyin. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Eğer hala bir ownCloud sunucunuz yoksa, daha fazla bilgi için <a href="https://owncloud.com">owncloud.com</a> adresine bakın. @@ -2414,15 +2435,10 @@ Bu dosyaları tekrar eşitlemeyi deneyin. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> <p><small><a href="%1">%2</a> Git gözden geçirmesi ile %3, %4 tarihinde, Qt %5 kullanılarak derlendi.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts index 09402da078..9f6eaab9bb 100644 --- a/translations/mirall_uk.ts +++ b/translations/mirall_uk.ts @@ -63,17 +63,22 @@ Форма - + + Selective Sync... + + + + Account Maintenance Управління обліковим записом - + Edit Ignored Files Ігноровані файли - + Modify Account Редагувати запис @@ -89,7 +94,7 @@ - + Pause Пауза @@ -104,110 +109,110 @@ - + Storage Usage Використання сховища - + Retrieving usage information... Отримання інформації по використання... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. - + Resume Відновлення - + Confirm Folder Remove Підтвердіть видалення каталогу - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Дійсно бажаєте зупинити синхронізацію теки <i>%1</i>?</p><p><b>Примітка:</b> Файли у вашому клієнті не будуть видалені.</p> - + Confirm Folder Reset - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. Жодного %1 підключення не налаштовано. - + Sync Running Виконується синхронізація - + No account configured. - + The syncing operation is running.<br/>Do you want to terminate it? Виконується процедура синхронізації.<br/>Бажаєте відмінити? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. @@ -352,7 +357,7 @@ Total time left %5 - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -361,17 +366,17 @@ Are you sure you want to perform this operation? Ви дійсно бажаєте продовжити цю операцію? - + Remove All Files? Видалити усі файли? - + Remove all files Видалити усі файли - + Keep files Зберегти файли @@ -389,52 +394,52 @@ Are you sure you want to perform this operation? - + Undefined State. Невизначений стан. - + Waits to start syncing. Очікування початку синхронізації. - + Preparing for sync. Підготовка до синхронізації - + Sync is running. Синхронізація запущена. - + Last Sync was successful. Остання синхронізація була успішною. - + Last Sync was successful, but with warnings on individual files. - + Setup Error. Помилка установки. - + User Abort. - + Sync is paused. - + %1 (Sync is paused) @@ -461,8 +466,8 @@ Are you sure you want to perform this operation? Mirall::FolderWizard - - + + Add Folder Додати Теку @@ -470,67 +475,67 @@ Are you sure you want to perform this operation? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. - + Enter the path to the local folder. - + The directory alias is a descriptive name for this sync connection. - + No valid local folder selected! - + You have no permission to write to the selected folder! - + The local path %1 is already an upload folder. Please pick another one! - + An already configured folder is contained in the current entry. В поточному запису містяться вже налаштовані теки. - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. - + An already configured folder contains the currently entered folder. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. - + The alias can not be empty. Please provide a descriptive alias word. Псевдонім не може бути порожнім. Будь ласка, вкажіть описове слово-псевдонім. - + The alias <i>%1</i> is already in use. Please pick another alias. - + Select the source folder Оберіть початкову теку @@ -538,51 +543,59 @@ Are you sure you want to perform this operation? Mirall::FolderWizardRemotePath - + Add Remote Folder - + Enter the name of the new folder: - + Folder was successfully created on %1. Теку успішно створено на %1. - + Failed to create the folder on %1. Please check manually. - + Choose this to sync the entire account - + This folder is already being synced. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> @@ -1330,7 +1343,7 @@ It is not advisable to use it. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash @@ -1346,17 +1359,17 @@ It is not advisable to use it. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. - + This folder must not be renamed. Please name it back to Shared. - + The file was renamed but is part of a read only share. The original file was restored. @@ -1781,229 +1794,229 @@ It is not advisable to use it. Mirall::SyncEngine - + Success. Успішно. - + CSync failed to create a lock file. CSync не вдалося створити файл блокування. - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. - + CSync failed to write the journal file. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p> %1 плагін для синхронізації не вдалося завантажити.<br/>Будь ласка, перевірте його інсталяцію!</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. Системний час цього клієнта відрізняється від системного часу на сервері. Будь ласка, використовуйте сервіс синхронізації часу (NTP) на сервері та клієнті, аби час був однаковий. - + CSync could not detect the filesystem type. CSync не вдалося визначити тип файлової системи. - + CSync got an error while processing internal trees. У CSync виникла помилка під час сканування внутрішньої структури каталогів. - + CSync failed to reserve memory. CSync не вдалося зарезервувати пам'ять. - + CSync fatal parameter error. У CSync сталася фатальна помилка параметра. - + CSync processing step update failed. CSync не вдалася зробити оновлення . - + CSync processing step reconcile failed. CSync не вдалася зробити врегулювання. - + CSync processing step propagate failed. CSync не вдалася зробити розповсюдження. - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> - + A remote file can not be written. Please check the remote access. Не можливо проводити запис у віддалену файлову систему. Будь ласка, перевірте повноваження доступу. - + The local filesystem can not be written. Please check permissions. Не можливо проводити запис у локальну файлову систему. Будь ласка, перевірте повноваження. - + CSync failed to connect through a proxy. CSync не вдалося приєднатися через Проксі. - + CSync could not authenticate at the proxy. - + CSync failed to lookup proxy or server. CSync не вдалося знайти Проксі або Сервер. - + CSync failed to authenticate at the %1 server. CSync не вдалося аутентифікуватися на %1 сервері. - + CSync failed to connect to the network. CSync не вдалося приєднатися до мережі. - + A network connection timeout happened. - + A HTTP transmission error happened. Сталася помилка передачі даних по HTTP. - + CSync failed due to not handled permission deniend. CSync завершився неуспішно через порушення прав доступу. - + CSync failed to access - + CSync tried to create a directory that already exists. CSync намагалася створити каталог, який вже існує. - - + + CSync: No space on %1 server available. CSync: на сервері %1 скінчилося місце. - + CSync unspecified error. Невизначена помилка CSync. - + Aborted by the user - + An internal error number %1 happened. - + The item is not synced because of previous errors: %1 - + Symbolic links are not supported in syncing. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2019,8 +2032,8 @@ It is not advisable to use it. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2157,6 +2170,14 @@ It is not advisable to use it. + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2397,7 +2418,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! Якщо ви ще не маєте власного сервера ownCloud, подивіться <a href="https://owncloud.com">owncloud.com</a> з цього приводу. @@ -2406,15 +2427,10 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts index 76ff576b7e..2c6a8b33d7 100644 --- a/translations/mirall_zh_CN.ts +++ b/translations/mirall_zh_CN.ts @@ -63,17 +63,22 @@ 窗体 - + + Selective Sync... + + + + Account Maintenance 帐户维护 - + Edit Ignored Files 编辑忽略的文件 - + Modify Account 修改帐户 @@ -89,7 +94,7 @@ - + Pause 暂停 @@ -104,110 +109,110 @@ 增加文件夹... - + Storage Usage 存储使用情况 - + Retrieving usage information... 返回使用率信息... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>注释：</b> 一些文件夹，例如网络挂载的和共享的文件夹，可能有不同的限制。 - + Resume 继续 - + Confirm Folder Remove 确认移除文件夹 - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>你真的要停止 <i>%1%</i> 文件夹的同步吗？</p><p><b>注释：</b>这不会删除你客户端中的文件。</p> - + Confirm Folder Reset 确认文件夹重置 - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>您真希望重置文件夹 <i>%1</i> 并重新构建您的客户端数据库吗？</p><p><b>注意：</b>此功能设计仅用作维护操作。没有文件将被移除，但这将导致大量的数据传输。根据文件夹的大小，这一过程将持续几分钟到几小时。请仅在管理员指导的情况下使用此功能。</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. 没有 %1 连接配置。 - + Sync Running 同步正在运行 - + No account configured. 没有配置的帐号。 - + The syncing operation is running.<br/>Do you want to terminate it? 正在执行同步。<br />您确定要关闭它吗？ - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. 已连接到<a href="%1">%2</a>。 - + Connected to <a href="%1">%2</a> as <i>%3</i>. 已作为 <i>%3</i> 连接到 <a href="%1">%2</a>。 - + Currently there is no storage usage information available. 目前没有储存使用量信息可用。 @@ -352,7 +357,7 @@ Total time left %5 同步活动 - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -361,17 +366,17 @@ Are you sure you want to perform this operation? 你确定执行该操作吗？ - + Remove All Files? 删除所有文件？ - + Remove all files 删除所有文件 - + Keep files 保持所有文件 @@ -389,52 +394,52 @@ Are you sure you want to perform this operation? 一个旧的同步日志 '%1' 被找到，但是不能被移除。请确定没有应用程序正在使用它。 - + Undefined State. 未知状态。 - + Waits to start syncing. 等待启动同步。 - + Preparing for sync. 准备同步。 - + Sync is running. 同步正在运行。 - + Last Sync was successful. 最后一次同步成功。 - + Last Sync was successful, but with warnings on individual files. 上次同步已成功，不过一些文件出现了警告。 - + Setup Error. 安装失败 - + User Abort. 用户撤销。 - + Sync is paused. 同步已暂停。 - + %1 (Sync is paused) %1 (同步已暂停) @@ -461,8 +466,8 @@ Are you sure you want to perform this operation? Mirall::FolderWizard - - + + Add Folder 增加目录 @@ -470,67 +475,67 @@ Are you sure you want to perform this operation? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. - + Enter the path to the local folder. - + The directory alias is a descriptive name for this sync connection. - + No valid local folder selected! - + You have no permission to write to the selected folder! - + The local path %1 is already an upload folder. Please pick another one! - + An already configured folder is contained in the current entry. 当前路径包含一个已配置的文件夹。 - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. - + An already configured folder contains the currently entered folder. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. - + The alias can not be empty. Please provide a descriptive alias word. 别名不能为空。请提供一个描述性的别名。 - + The alias <i>%1</i> is already in use. Please pick another alias. - + Select the source folder 选择源目录 @@ -538,51 +543,59 @@ Are you sure you want to perform this operation? Mirall::FolderWizardRemotePath - + Add Remote Folder 增加远程文件夹 - + Enter the name of the new folder: - + Folder was successfully created on %1. 文件夹在您的 %1 上不可用。<br/>请点此创建它。 - + Failed to create the folder on %1. Please check manually. - + Choose this to sync the entire account - + This folder is already being synced. 文件夹已在同步中。 - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> @@ -1332,7 +1345,7 @@ It is not advisable to use it. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash @@ -1348,17 +1361,17 @@ It is not advisable to use it. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. - + This folder must not be renamed. Please name it back to Shared. - + The file was renamed but is part of a read only share. The original file was restored. @@ -1785,229 +1798,229 @@ It is not advisable to use it. Mirall::SyncEngine - + Success. 成功。 - + CSync failed to create a lock file. CSync 无法创建文件锁。 - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. Csync同步失败，请确定是否有本地同步目录的读写权 - + CSync failed to write the journal file. CSync写日志文件失败 - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>csync 的 %1 插件不能加载。<br/>请校验安装！</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. 本客户端的系统时间和服务器的系统时间不一致。请在服务器和客户机上使用时间同步服务 (NTP)以让时间一致。 - + CSync could not detect the filesystem type. CSync 无法检测文件系统类型。 - + CSync got an error while processing internal trees. CSync 在处理内部文件树时出错。 - + CSync failed to reserve memory. CSync 失败，内存不足。 - + CSync fatal parameter error. CSync 致命参数错误。 - + CSync processing step update failed. CSync 处理步骤更新失败。 - + CSync processing step reconcile failed. CSync 处理步骤调和失败。 - + CSync processing step propagate failed. CSync 处理步骤传播失败。 - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>目标目录不存在。</p><p>请检查同步设置。</p> - + A remote file can not be written. Please check the remote access. 远程文件不可写，请检查远程权限。 - + The local filesystem can not be written. Please check permissions. 本地文件系统不可写。请检查权限。 - + CSync failed to connect through a proxy. CSync 未能通过代理连接。 - + CSync could not authenticate at the proxy. - + CSync failed to lookup proxy or server. CSync 无法查询代理或服务器。 - + CSync failed to authenticate at the %1 server. CSync 于 %1 服务器认证失败。 - + CSync failed to connect to the network. CSync 联网失败。 - + A network connection timeout happened. 网络连接超时。 - + A HTTP transmission error happened. HTTP 传输错误。 - + CSync failed due to not handled permission deniend. 出于未处理的权限拒绝，CSync 失败。 - + CSync failed to access 访问 CSync 失败 - + CSync tried to create a directory that already exists. CSync 尝试创建了已有的文件夹。 - - + + CSync: No space on %1 server available. CSync：%1 服务器空间已满。 - + CSync unspecified error. CSync 未定义错误。 - + Aborted by the user 用户撤销 - + An internal error number %1 happened. - + The item is not synced because of previous errors: %1 - + Symbolic links are not supported in syncing. 符号链接不被同步支持。 - + File is listed on the ignore list. 文件在忽略列表中。 - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. 无法初始化同步日志 - + Cannot open the sync journal 无法打开同步日志 - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2023,8 +2036,8 @@ It is not advisable to use it. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2161,6 +2174,14 @@ It is not advisable to use it. 更新 + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2401,7 +2422,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! 如果您还没有一个 ownCloud 服务器，请到 <a href="https://owncloud.com"> 获取更多信息。 @@ -2410,15 +2431,10 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts index 5bf85a2426..f74d9e50db 100644 --- a/translations/mirall_zh_TW.ts +++ b/translations/mirall_zh_TW.ts @@ -63,17 +63,22 @@ 格式 - + + Selective Sync... + + + + Account Maintenance 帳號維護 - + Edit Ignored Files 編輯忽略的檔案 - + Modify Account 修改帳號 @@ -89,7 +94,7 @@ - + Pause 暫停 @@ -104,110 +109,110 @@ 新增資料夾… - + Storage Usage 空間用途 - + Retrieving usage information... 取得用途資訊... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>注意:</b> 有些資料夾，包括網路掛載或分享資料夾，可能有不同的限制。 - + Resume 繼續 - + Confirm Folder Remove 確認移除資料夾 - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>您確定要停止同步資料夾<i>%1</i>?</p><p><b>注意:</b> 這不會從您的裝置移除檔案。</p> - + Confirm Folder Reset 資料夾重設確認 - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. 無%1連線設定 - + Sync Running 同步中 - + No account configured. - + The syncing operation is running.<br/>Do you want to terminate it? 正在同步中<br/>你真的想要中斷？ - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. @@ -352,24 +357,24 @@ Total time left %5 同步啟用 - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? - + Remove All Files? 移除所有檔案? - + Remove all files 移除所有檔案 - + Keep files 保留檔案 @@ -387,52 +392,52 @@ Are you sure you want to perform this operation? 發現較舊的同步處理日誌'%1'，但無法移除。請確認沒有應用程式正在使用它。 - + Undefined State. 未知狀態 - + Waits to start syncing. 等待啟動同步 - + Preparing for sync. 正在準備同步。 - + Sync is running. 同步執行中 - + Last Sync was successful. 最後一次同步成功 - + Last Sync was successful, but with warnings on individual files. - + Setup Error. 安裝失敗 - + User Abort. 使用者中斷。 - + Sync is paused. 同步已暫停 - + %1 (Sync is paused) %1 (同步暫停) @@ -459,8 +464,8 @@ Are you sure you want to perform this operation? Mirall::FolderWizard - - + + Add Folder 新增資料夾 @@ -468,67 +473,67 @@ Are you sure you want to perform this operation? Mirall::FolderWizardLocalPath - + Click to select a local folder to sync. - + Enter the path to the local folder. - + The directory alias is a descriptive name for this sync connection. - + No valid local folder selected! - + You have no permission to write to the selected folder! 您沒有權限來寫入被選取的資料夾! - + The local path %1 is already an upload folder. Please pick another one! - + An already configured folder is contained in the current entry. 此項目中包含了已經設定同步的資料夾 - + The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to. - + An already configured folder contains the currently entered folder. - + The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to. - + The alias can not be empty. Please provide a descriptive alias word. 別名不能空白, 請提供一個描述性的別名 - + The alias <i>%1</i> is already in use. Please pick another alias. - + Select the source folder 選擇來源資料夾 @@ -536,51 +541,59 @@ Are you sure you want to perform this operation? Mirall::FolderWizardRemotePath - + Add Remote Folder 新增遠端資料夾 - + Enter the name of the new folder: - + Folder was successfully created on %1. 資料夾成功建立在%1 - + Failed to create the folder on %1. Please check manually. - + Choose this to sync the entire account - + This folder is already being synced. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. - + You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync. + + Mirall::FolderWizardSelectiveSync + + + Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. + + + Mirall::FormatWarningsWizardPage - + <b>Warning:</b> <b>警告:</b> @@ -1328,7 +1341,7 @@ It is not advisable to use it. Mirall::PropagateLocalRename - + File %1 can not be renamed to %2 because of a local file name clash @@ -1344,17 +1357,17 @@ It is not advisable to use it. Mirall::PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. - + This folder must not be renamed. Please name it back to Shared. - + The file was renamed but is part of a read only share. The original file was restored. @@ -1779,229 +1792,229 @@ It is not advisable to use it. Mirall::SyncEngine - + Success. 成功。 - + CSync failed to create a lock file. CSync 無法建立文件鎖 - + CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory. - + CSync failed to write the journal file. - + <p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p> <p>用於csync的套件%1</p> - + The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same. 本客戶端的系統時間和伺服器系統時間不一致,請在伺服器與客戶端上使用時間同步服務(NTP)讓時間保持一致 - + CSync could not detect the filesystem type. CSync 無法偵測檔案系統的類型 - + CSync got an error while processing internal trees. CSync 處理內部資料樹時發生錯誤 - + CSync failed to reserve memory. CSync 無法取得記憶體空間。 - + CSync fatal parameter error. CSync 參數錯誤。 - + CSync processing step update failed. CSync 處理步驟 "update" 失敗。 - + CSync processing step reconcile failed. CSync 處理步驟 "reconcile" 失敗。 - + CSync processing step propagate failed. CSync 處理步驟 "propagate" 失敗。 - + <p>The target directory does not exist.</p><p>Please check the sync setup.</p> <p>目標資料夾不存在</p><p>請檢查同步設定</p> - + A remote file can not be written. Please check the remote access. 遠端檔案無法寫入，請確認遠端存取權限。 - + The local filesystem can not be written. Please check permissions. 本地檔案系統無法寫入，請確認權限。 - + CSync failed to connect through a proxy. CSync 透過代理伺服器連線失敗。 - + CSync could not authenticate at the proxy. - + CSync failed to lookup proxy or server. CSync 查詢代理伺服器或伺服器失敗。 - + CSync failed to authenticate at the %1 server. CSync 於伺服器 %1 認證失敗。 - + CSync failed to connect to the network. CSync 無法連接到網路。 - + A network connection timeout happened. - + A HTTP transmission error happened. HTTP 傳輸錯誤。 - + CSync failed due to not handled permission deniend. CSync 失敗，由於未處理的存取被拒。 - + CSync failed to access - + CSync tried to create a directory that already exists. CSync 試圖建立一個已經存在的目錄。 - - + + CSync: No space on %1 server available. CSync：伺服器 %1 沒有可用空間。 - + CSync unspecified error. CSync 未知的錯誤。 - + Aborted by the user - + An internal error number %1 happened. - + The item is not synced because of previous errors: %1 - + Symbolic links are not supported in syncing. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2017,8 +2030,8 @@ It is not advisable to use it. Mirall::Theme - - <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> + + <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> @@ -2155,6 +2168,14 @@ It is not advisable to use it. 最新的 + + Mirall::ownCloudTheme + + + <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> + + + OwncloudAdvancedSetupPage @@ -2395,7 +2416,7 @@ It is not advisable to use it. ownCloudTheme - + If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info. Top text in setup wizard. Keep short! 若您尚未擁有ownCloud伺服器，可參閱<a href="https://owncloud.com">owncloud.com</a> 來獲得更多資訊。 @@ -2404,15 +2425,10 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p> - - - <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p>%7 - - progress From 2436ef957460a61174bb926eb79070638d0699cb Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Tue, 19 Aug 2014 02:06:17 -0400 Subject: [PATCH 55/94] [tx-robot] updated from transifex --- admin/win/nsi/l10n/Slovak.nsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/win/nsi/l10n/Slovak.nsh b/admin/win/nsi/l10n/Slovak.nsh index 4e6818d004..547f0077a6 100644 --- a/admin/win/nsi/l10n/Slovak.nsh +++ b/admin/win/nsi/l10n/Slovak.nsh @@ -15,6 +15,8 @@ StrCpy $PageReinstall_SAME_Field_3 "Odin StrCpy $UNINSTALLER_APPDATA_TITLE "Odintalova ${APPLICATION_NAME}" StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Vyberte monos vykona drbu." StrCpy $SEC_APPLICATION_DETAILS "Intaluj sa nleitosti ${APPLICATION_NAME}." +StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Stavov ikona pre Windows Explorer" +StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Intalujem stavov ikonu pre Windows Explorer" StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Zstupca programu v menu tart" StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Prida zstupcu pre ${APPLICATION_NAME} do menu tart." StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Zstupca na ploche" @@ -42,5 +44,3 @@ StrCpy $INIT_INSTALLER_RUNNING "In StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Tento odintaltor vyaduje admin prstup, skste to znova" StrCpy $INIT_UNINSTALLER_RUNNING "Odintaltor je u spusten." StrCpy $SectionGroup_Shortcuts "Zstupcovia" -StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer" -StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons for Windows Explorer" From 01b0ee49dece7d32e21db667b69ccba7635b8df2 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Tue, 19 Aug 2014 13:58:20 +0200 Subject: [PATCH 56/94] Status Icons: Rename the syncEnable method to isPaused. Previously, in folder and folderman there have been the syncEnabled properties, but they confused the semantics: While in FolderMan the syncEnabled flag represents the network connection and stuff, in Folder it represented if the user paused or resumed the folder. This resulted in mixed use of both, which lead to wrong icon states. This patch renames the folder methods and properties to isPaused to make more clear about what it is. --- src/mirall/accountsettings.cpp | 116 ++++++++++++++-------------- src/mirall/folder.cpp | 10 +-- src/mirall/folder.h | 6 +- src/mirall/folderman.cpp | 135 ++++++++++++++++++--------------- src/mirall/folderman.h | 6 +- src/mirall/folderstatusmodel.h | 2 +- src/mirall/owncloudgui.cpp | 2 +- 7 files changed, 145 insertions(+), 132 deletions(-) diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp index 7298c2c139..93479cb349 100644 --- a/src/mirall/accountsettings.cpp +++ b/src/mirall/accountsettings.cpp @@ -159,8 +159,8 @@ void AccountSettings::slotFolderActivated( const QModelIndex& indx ) ui->_buttonEnable->setEnabled( isValid ); if ( isValid ) { - bool folderEnabled = _model->data( indx, FolderStatusDelegate::FolderSyncEnabled).toBool(); - if ( folderEnabled ) { + bool folderPaused = _model->data( indx, FolderStatusDelegate::FolderSyncPaused).toBool(); + if ( !folderPaused) { ui->_buttonEnable->setText( tr( "Pause" ) ); } else { ui->_buttonEnable->setText( tr( "Resume" ) ); @@ -256,8 +256,7 @@ void AccountSettings::folderToModelItem( QStandardItem *item, Folder *f ) item->setData( f->nativePath(), FolderStatusDelegate::FolderPathRole ); item->setData( f->remotePath(), FolderStatusDelegate::FolderSecondPathRole ); item->setData( f->alias(), FolderStatusDelegate::FolderAliasRole ); - item->setData( f->syncEnabled(), FolderStatusDelegate::FolderSyncEnabled ); - + item->setData( f->syncPaused(), FolderStatusDelegate::FolderSyncPaused ); SyncResult res = f->syncResult(); SyncResult::Status status = res.status(); @@ -266,7 +265,10 @@ void AccountSettings::folderToModelItem( QStandardItem *item, Folder *f ) Theme *theme = Theme::instance(); item->setData( theme->statusHeaderText( status ), Qt::ToolTipRole ); if (_account->state() == Account::Connected) { - if( f->syncEnabled() ) { + if( f->syncPaused() ) { + item->setData( theme->folderDisabledIcon( ), FolderStatusDelegate::FolderStatusIconRole ); // size 48 before + _wasDisabledBefore = false; + } else { if( status == SyncResult::SyncPrepare ) { if( _wasDisabledBefore ) { // if the folder was disabled before, set the sync icon @@ -284,9 +286,6 @@ void AccountSettings::folderToModelItem( QStandardItem *item, Folder *f ) item->setData( theme->syncStateIcon( status ), FolderStatusDelegate::FolderStatusIconRole ); } } - } else { - item->setData( theme->folderDisabledIcon( ), FolderStatusDelegate::FolderStatusIconRole ); // size 48 before - _wasDisabledBefore = false; } } else { item->setData( theme->folderOfflineIcon(), FolderStatusDelegate::FolderStatusIconRole); @@ -431,57 +430,60 @@ void AccountSettings::slotEnableCurrentFolder() if( selected.isValid() ) { QString alias = _model->data( selected, FolderStatusDelegate::FolderAliasRole ).toString(); - bool folderEnabled = _model->data( selected, FolderStatusDelegate::FolderSyncEnabled).toBool(); - qDebug() << "Toggle enabled/disabled Folder alias " << alias << " - current state: " << folderEnabled; - if( !alias.isEmpty() ) { - FolderMan *folderMan = FolderMan::instance(); - qDebug() << "Application: enable folder with alias " << alias; - bool terminate = false; - - // this sets the folder status to disabled but does not interrupt it. - Folder *f = folderMan->folder( alias ); - if (!f) { - return; - } - - if( folderEnabled ) { - // check if a sync is still running and if so, ask if we should terminate. - if( f->isBusy() ) { // its still running -#if defined(Q_OS_MAC) - QWidget *parent = this; - Qt::WindowFlags flags = Qt::Sheet; -#else - QWidget *parent = 0; - Qt::WindowFlags flags = Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint; // default flags -#endif - QMessageBox msgbox(QMessageBox::Question, tr("Sync Running"), - tr("The syncing operation is running.
Do you want to terminate it?"), - QMessageBox::Yes | QMessageBox::No, parent, flags); - msgbox.setDefaultButton(QMessageBox::Yes); - int reply = msgbox.exec(); - if ( reply == QMessageBox::Yes ) - terminate = true; - else - return; // do nothing - } - } - - // message box can return at any time while the thread keeps running, - // so better check again after the user has responded. - if ( f->isBusy() && terminate ) { - f->slotTerminateSync(); - } - - folderMan->slotEnableFolder( alias, !folderEnabled ); - - // keep state for the icon setting. - if( !folderEnabled ) _wasDisabledBefore = true; - - slotUpdateFolderState (f); - // set the button text accordingly. - slotFolderActivated( selected ); + if( alias.isEmpty() ) { + qDebug() << "Empty alias to enable."; + return; } + + FolderMan *folderMan = FolderMan::instance(); + + qDebug() << "Application: enable folder with alias " << alias; + bool terminate = false; + bool currentlyPaused = false; + + // this sets the folder status to disabled but does not interrupt it. + Folder *f = folderMan->folder( alias ); + if (!f) { + return; + } + currentlyPaused = f->syncPaused(); + if( ! currentlyPaused ) { + // check if a sync is still running and if so, ask if we should terminate. + if( f->isBusy() ) { // its still running +#if defined(Q_OS_MAC) + QWidget *parent = this; + Qt::WindowFlags flags = Qt::Sheet; +#else + QWidget *parent = 0; + Qt::WindowFlags flags = Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint; // default flags +#endif + QMessageBox msgbox(QMessageBox::Question, tr("Sync Running"), + tr("The syncing operation is running.
Do you want to terminate it?"), + QMessageBox::Yes | QMessageBox::No, parent, flags); + msgbox.setDefaultButton(QMessageBox::Yes); + int reply = msgbox.exec(); + if ( reply == QMessageBox::Yes ) + terminate = true; + else + return; // do nothing + } + } + + // message box can return at any time while the thread keeps running, + // so better check again after the user has responded. + if ( f->isBusy() && terminate ) { + f->slotTerminateSync(); + } + f->setSyncPaused(!currentlyPaused); // toggle the pause setting + folderMan->slotSetFolderPaused( alias, !currentlyPaused ); + + // keep state for the icon setting. + if( currentlyPaused ) _wasDisabledBefore = true; + + slotUpdateFolderState (f); + // set the button text accordingly. + slotFolderActivated( selected ); } } diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp index 6844e4999e..6660d0a2a5 100644 --- a/src/mirall/folder.cpp +++ b/src/mirall/folder.cpp @@ -54,7 +54,7 @@ Folder::Folder(const QString &alias, const QString &path, const QString& secondP , _path(path) , _remotePath(secondPath) , _alias(alias) - , _enabled(true) + , _paused(false) , _csyncError(false) , _csyncUnavail(false) , _wipeDb(false) @@ -215,14 +215,14 @@ QString Folder::nativePath() const return QDir::toNativeSeparators(_path); } -bool Folder::syncEnabled() const +bool Folder::syncPaused() const { - return _enabled; + return _paused; } -void Folder::setSyncEnabled( bool doit ) +void Folder::setSyncPaused( bool doit ) { - _enabled = doit; + _paused = doit; if( doit ) { // qDebug() << "Syncing enabled on folder " << name(); diff --git a/src/mirall/folder.h b/src/mirall/folder.h index 0e5656c980..dcea1a2d3c 100644 --- a/src/mirall/folder.h +++ b/src/mirall/folder.h @@ -85,9 +85,9 @@ public: * If the sync is switched off, the startSync method is not going to * be called. */ - void setSyncEnabled( bool ); + void setSyncPaused( bool ); - bool syncEnabled() const; + bool syncPaused() const; void prepareToSync(); @@ -185,7 +185,7 @@ private: QString _remotePath; QString _alias; QString _configFile; - bool _enabled; + bool _paused; SyncResult _syncResult; QScopedPointer _engine; QStringList _errors; diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp index 7ec10a3d6a..11da864941 100644 --- a/src/mirall/folderman.cpp +++ b/src/mirall/folderman.cpp @@ -330,7 +330,7 @@ Folder* FolderMan::setupFolderFromConfigFile(const QString &file) { qDebug() << "Adding folder to Folder Map " << folder; _folderMap[alias] = folder; if (paused) { - folder->setSyncEnabled(!paused); + folder->setSyncPaused(paused); _disabledFolders.insert(folder); } @@ -361,7 +361,7 @@ void FolderMan::slotEnableFolder( const QString& alias, bool enable ) // FIXME: Use MirallConfigFile QSettings settings(_folderConfigPath + QLatin1Char('/') + f->configFile(), QSettings::IniFormat); settings.beginGroup(escapeAlias(f->alias())); - if (enable) { + if (!paused) { settings.remove("paused"); _disabledFolders.remove(f); } else { @@ -410,7 +410,7 @@ SyncResult FolderMan::syncResult( const QString& alias ) void FolderMan::slotScheduleAllFolders() { foreach( Folder *f, _folderMap.values() ) { - if (f && f->syncEnabled()) { + if (f && ! f->syncPaused()) { slotScheduleSync( f->alias() ); } } @@ -433,7 +433,7 @@ void FolderMan::slotScheduleSync( const QString& alias ) if( ! _scheduleQueue.contains(alias ) && _folderMap.contains(alias) ) { Folder *f = _folderMap[alias]; if( f ) { - if( f->syncEnabled() ) { + if( !f->syncPaused() ) { f->prepareToSync(); } else { qDebug() << "Folder is not enabled, not scheduled!"; @@ -487,7 +487,7 @@ void FolderMan::slotScheduleFolderSync() const QString alias = _scheduleQueue.dequeue(); if( _folderMap.contains( alias ) ) { Folder *f = _folderMap[alias]; - if( f && f->syncEnabled() ) { + if( f && !f->syncPaused() ) { _currentSyncFolder = alias; f->startSync( QStringList() ); @@ -585,7 +585,7 @@ void FolderMan::removeFolder( const QString& alias ) f->wipe(); // can be removed if we are able to delete the folder object. - f->setSyncEnabled(false); + f->setSyncPaused(true); // remove the folder configuration QFile file( _folderConfigPath + QLatin1Char('/') + f->configFile() ); @@ -680,39 +680,44 @@ SyncResult FolderMan::accountStatus(const QList &folders) if( cnt == 1 ) { Folder *folder = folders.at(0); if( folder ) { - SyncResult::Status syncStatus = folder->syncResult().status(); + if( folder->syncPaused() ) { + overallResult.setStatus(SyncResult::Paused); + } else { + SyncResult::Status syncStatus = folder->syncResult().status(); - switch( syncStatus ) { - case SyncResult::Undefined: - overallResult.setStatus(SyncResult::Error); - break; - case SyncResult::NotYetStarted: - overallResult.setStatus( SyncResult::NotYetStarted ); - break; - case SyncResult::SyncPrepare: - overallResult.setStatus( SyncResult::SyncPrepare ); - break; - case SyncResult::SyncRunning: - overallResult.setStatus( SyncResult::SyncRunning ); - break; - case SyncResult::Problem: // don't show the problem icon in tray. - case SyncResult::Success: - if( overallResult.status() == SyncResult::Undefined ) - overallResult.setStatus( SyncResult::Success ); - break; - case SyncResult::Error: - overallResult.setStatus( SyncResult::Error ); - break; - case SyncResult::SetupError: - if ( overallResult.status() != SyncResult::Error ) - overallResult.setStatus( SyncResult::SetupError ); - break; - case SyncResult::SyncAbortRequested: - overallResult.setStatus( SyncResult::SyncAbortRequested); - break; - case SyncResult::Paused: - overallResult.setStatus( SyncResult::Paused); - break; + + switch( syncStatus ) { + case SyncResult::Undefined: + overallResult.setStatus(SyncResult::Error); + break; + case SyncResult::NotYetStarted: + overallResult.setStatus( SyncResult::NotYetStarted ); + break; + case SyncResult::SyncPrepare: + overallResult.setStatus( SyncResult::SyncPrepare ); + break; + case SyncResult::SyncRunning: + overallResult.setStatus( SyncResult::SyncRunning ); + break; + case SyncResult::Problem: // don't show the problem icon in tray. + case SyncResult::Success: + if( overallResult.status() == SyncResult::Undefined ) + overallResult.setStatus( SyncResult::Success ); + break; + case SyncResult::Error: + overallResult.setStatus( SyncResult::Error ); + break; + case SyncResult::SetupError: + if ( overallResult.status() != SyncResult::Error ) + overallResult.setStatus( SyncResult::SetupError ); + break; + case SyncResult::SyncAbortRequested: + overallResult.setStatus( SyncResult::SyncAbortRequested); + break; + case SyncResult::Paused: + overallResult.setStatus( SyncResult::Paused); + break; + } } } } else { @@ -723,30 +728,34 @@ SyncResult FolderMan::accountStatus(const QList &folders) int various = 0; foreach ( Folder *folder, folders ) { - SyncResult folderResult = folder->syncResult(); - SyncResult::Status syncStatus = folderResult.status(); - - switch( syncStatus ) { - case SyncResult::Undefined: - case SyncResult::NotYetStarted: - case SyncResult::SyncPrepare: - various++; - break; - case SyncResult::SyncRunning: - runSeen++; - break; - case SyncResult::Problem: // don't show the problem icon in tray. - case SyncResult::Success: - goodSeen++; - break; - case SyncResult::Error: - case SyncResult::SetupError: - errorsSeen++; - break; - case SyncResult::SyncAbortRequested: - case SyncResult::Paused: + if( folder->syncPaused() ) { abortSeen++; - // no default case on purpose, check compiler warnings + } else { + SyncResult folderResult = folder->syncResult(); + SyncResult::Status syncStatus = folderResult.status(); + + switch( syncStatus ) { + case SyncResult::Undefined: + case SyncResult::NotYetStarted: + case SyncResult::SyncPrepare: + various++; + break; + case SyncResult::SyncRunning: + runSeen++; + break; + case SyncResult::Problem: // don't show the problem icon in tray. + case SyncResult::Success: + goodSeen++; + break; + case SyncResult::Error: + case SyncResult::SetupError: + errorsSeen++; + break; + case SyncResult::SyncAbortRequested: + case SyncResult::Paused: + abortSeen++; + // no default case on purpose, check compiler warnings + } } } bool set = false; @@ -772,7 +781,7 @@ SyncResult FolderMan::accountStatus(const QList &folders) return overallResult; } -QString FolderMan::statusToString( SyncResult syncStatus, bool enabled ) const +QString FolderMan::statusToString( SyncResult syncStatus, bool paused ) const { QString folderMessage; switch( syncStatus.status() ) { @@ -807,7 +816,7 @@ QString FolderMan::statusToString( SyncResult syncStatus, bool enabled ) const break; // no default case on purpose, check compiler warnings } - if( !enabled ) { + if( paused ) { // sync is disabled. folderMessage = tr( "%1 (Sync is paused)" ).arg(folderMessage); } diff --git a/src/mirall/folderman.h b/src/mirall/folderman.h index c3a8d0012d..1b4c55188a 100644 --- a/src/mirall/folderman.h +++ b/src/mirall/folderman.h @@ -77,7 +77,7 @@ public: /** Creates a new and empty local directory. */ bool startFromScratch( const QString& ); - QString statusToString( SyncResult, bool enabled ) const; + QString statusToString(SyncResult, bool paused ) const; static SyncResult accountStatus( const QList &folders ); @@ -88,6 +88,8 @@ signals: /** * signal to indicate a folder named by alias has changed its sync state. * Get the state via the Folder Map or the syncResult and syncState methods. + * + * Attention: The alias string may be zero. Do a general update of the state than. */ void folderSyncStateChange( const QString & ); @@ -95,7 +97,7 @@ signals: public slots: void slotRemoveFolder( const QString& ); - void slotEnableFolder( const QString&, bool ); + void slotSetFolderPaused(const QString&, bool paused); void slotFolderSyncStarted(); void slotFolderSyncFinished( const SyncResult& ); diff --git a/src/mirall/folderstatusmodel.h b/src/mirall/folderstatusmodel.h index 74acaa08af..77120b324d 100644 --- a/src/mirall/folderstatusmodel.h +++ b/src/mirall/folderstatusmodel.h @@ -42,7 +42,7 @@ class FolderStatusDelegate : public QStyledItemDelegate FolderRemotePath, FolderStatus, FolderErrorMsg, - FolderSyncEnabled, + FolderSyncPaused, FolderStatusIconRole, SyncProgressOverallPercent, diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp index baa84bb1f5..9bb2743b95 100644 --- a/src/mirall/owncloudgui.cpp +++ b/src/mirall/owncloudgui.cpp @@ -249,7 +249,7 @@ void ownCloudGui::slotComputeOverallSyncStatus() QStringList allStatusStrings; foreach(Folder* folder, map.values()) { qDebug() << "Folder in overallStatus Message: " << folder << " with name " << folder->alias(); - QString folderMessage = folderMan->statusToString(folder->syncResult().status(), folder->syncEnabled()); + QString folderMessage = folderMan->statusToString(folder->syncResult().status(), folder->syncPaused()); allStatusStrings += tr("Folder %1: %2").arg(folder->alias(), folderMessage); } From 1245ed6f0650193874fef99224f006d0bb6087d6 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Tue, 19 Aug 2014 14:03:41 +0200 Subject: [PATCH 57/94] Status Icons: Let FolderMan only write the folder config files. Remove the setSyncEnabled() call to individual folders which mistakenly set the folders to pause. Let the folders keep their pause state on their own. If FolderMan is set to be enabled emit a general refresh signal rather than one for each folder. --- src/mirall/folder.cpp | 2 +- src/mirall/folderman.cpp | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp index 6660d0a2a5..fb296e4301 100644 --- a/src/mirall/folder.cpp +++ b/src/mirall/folder.cpp @@ -482,7 +482,7 @@ void Folder::slotTerminateSync() // Do not display an error message, user knows his own actions. // _errors.append( tr("The CSync thread terminated.") ); // _csyncError = true; - setSyncEnabled(false); + FolderMan::instance()->slotSetFolderPaused(alias(), true); setSyncState(SyncResult::SyncAbortRequested); return; } diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp index 11da864941..99ea90146d 100644 --- a/src/mirall/folderman.cpp +++ b/src/mirall/folderman.cpp @@ -346,7 +346,7 @@ Folder* FolderMan::setupFolderFromConfigFile(const QString &file) { return folder; } -void FolderMan::slotEnableFolder( const QString& alias, bool enable ) +void FolderMan::slotSetFolderPaused( const QString& alias, bool paused ) { if( ! _folderMap.contains( alias ) ) { qDebug() << "!! Can not enable alias " << alias << ", can not be found in folderMap."; @@ -355,7 +355,6 @@ void FolderMan::slotEnableFolder( const QString& alias, bool enable ) Folder *f = _folderMap[alias]; if( f ) { - f->setSyncEnabled(enable); slotScheduleSync(alias); // FIXME: Use MirallConfigFile @@ -442,7 +441,6 @@ void FolderMan::slotScheduleSync( const QString& alias ) } } _scheduleQueue.enqueue(alias); - } else { qDebug() << " II> Sync for folder " << alias << " already scheduled, do not enqueue!"; } @@ -450,6 +448,8 @@ void FolderMan::slotScheduleSync( const QString& alias ) QTimer::singleShot(500, this, SLOT(slotScheduleFolderSync())); } +// only enable or disable foldermans will to schedule and do syncs. +// this is not the same as Pause and Resume of folders. void FolderMan::setSyncEnabled( bool enabled ) { if (!_syncEnabled && enabled && !_scheduleQueue.isEmpty()) { @@ -457,12 +457,8 @@ void FolderMan::setSyncEnabled( bool enabled ) QTimer::singleShot(200, this, SLOT(slotScheduleFolderSync())); } _syncEnabled = enabled; - - foreach( Folder *f, _folderMap.values() ) { - if(f) { // check for f != 0. That can happen, do not remove the check! - f->setSyncEnabled(enabled && !_disabledFolders.contains(f)); - } - } + // force a redraw in case the network connect status changed + emit( folderSyncStateChange(QString::null) ); } /* From bb3bd6930a9d2ab59151a2085ba5bccc1e4efe84 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Tue, 19 Aug 2014 14:06:28 +0200 Subject: [PATCH 58/94] StatusModel: Have another property accountConnected. With that , make the status model aware of the account connection state. With that, we can grey out the correct state icon if the account is not connected and display the normal icon if the account is connected. --- src/mirall/accountsettings.cpp | 11 ++++++----- src/mirall/accountsettings.h | 2 +- src/mirall/folderstatusmodel.cpp | 3 ++- src/mirall/folderstatusmodel.h | 1 + 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp index 93479cb349..dadce7122d 100644 --- a/src/mirall/accountsettings.cpp +++ b/src/mirall/accountsettings.cpp @@ -227,7 +227,7 @@ void AccountSettings::slotAddFolder( Folder *folder ) if( ! folder || folder->alias().isEmpty() ) return; QStandardItem *item = new QStandardItem(); - folderToModelItem( item, folder ); + folderToModelItem( item, folder, _account->state() == Account::Connected ); _model->appendRow( item ); // in order to update the enabled state of the "Sync now" button connect(folder, SIGNAL(syncStateChange()), this, SLOT(slotFolderSyncStateChange()), Qt::UniqueConnection); @@ -249,7 +249,7 @@ void AccountSettings::setGeneralErrors( const QStringList& errors ) } } -void AccountSettings::folderToModelItem( QStandardItem *item, Folder *f ) +void AccountSettings::folderToModelItem( QStandardItem *item, Folder *f, bool accountConnected ) { if( ! item || !f ) return; @@ -257,6 +257,7 @@ void AccountSettings::folderToModelItem( QStandardItem *item, Folder *f ) item->setData( f->remotePath(), FolderStatusDelegate::FolderSecondPathRole ); item->setData( f->alias(), FolderStatusDelegate::FolderAliasRole ); item->setData( f->syncPaused(), FolderStatusDelegate::FolderSyncPaused ); + item->setData( accountConnected, FolderStatusDelegate::FolderAccountConnected ); SyncResult res = f->syncResult(); SyncResult::Status status = res.status(); @@ -516,7 +517,7 @@ void AccountSettings::slotUpdateFolderState( Folder *folder ) } if( item ) { - folderToModelItem( item, folder ); + folderToModelItem( item, folder, _account->state() == Account::Connected ); } else { // the dialog is not visible. } @@ -782,10 +783,10 @@ void AccountSettings::slotSyncStateChange(const QString& alias) { Q_UNUSED(alias); - FolderMan *folderMan = FolderMan::instance(); - SyncResult state = folderMan->accountStatus(folderMan->map().values()); QIcon icon; if (_account && _account->state() == Account::Connected) { + FolderMan *folderMan = FolderMan::instance(); + SyncResult state = folderMan->accountStatus(folderMan->map().values()); icon = Theme::instance()->syncStateIcon(state.status()); } else { icon = Theme::instance()->folderOfflineIcon(); diff --git a/src/mirall/accountsettings.h b/src/mirall/accountsettings.h index ee3bfd4392..56753605ac 100644 --- a/src/mirall/accountsettings.h +++ b/src/mirall/accountsettings.h @@ -86,7 +86,7 @@ protected slots: private: QString shortenFilename( const QString& folder, const QString& file ) const; - void folderToModelItem( QStandardItem *, Folder * ); + void folderToModelItem(QStandardItem *, Folder * , bool accountConnected); QStandardItem* itemForFolder(const QString& ); void showConnectionLabel( const QString& message, const QString& tooltip = QString() ); diff --git a/src/mirall/folderstatusmodel.cpp b/src/mirall/folderstatusmodel.cpp index c4eea0f978..2cf9d6a1f4 100644 --- a/src/mirall/folderstatusmodel.cpp +++ b/src/mirall/folderstatusmodel.cpp @@ -133,8 +133,9 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem & QString itemString = qvariant_cast(index.data(SyncProgressItemString)); int warningCount = qvariant_cast(index.data(WarningCount)); bool syncOngoing = qvariant_cast(index.data(SyncRunning)); + // QString statusText = qvariant_cast(index.data(FolderStatus)); - bool syncEnabled = index.data(FolderSyncEnabled).toBool(); + bool syncEnabled = index.data(FolderAccountConnected).toBool(); // QString syncStatus = syncEnabled? tr( "Enabled" ) : tr( "Disabled" ); QRect iconRect = option.rect; diff --git a/src/mirall/folderstatusmodel.h b/src/mirall/folderstatusmodel.h index 77120b324d..4cd36a9b0b 100644 --- a/src/mirall/folderstatusmodel.h +++ b/src/mirall/folderstatusmodel.h @@ -44,6 +44,7 @@ class FolderStatusDelegate : public QStyledItemDelegate FolderErrorMsg, FolderSyncPaused, FolderStatusIconRole, + FolderAccountConnected, SyncProgressOverallPercent, SyncProgressOverallString, From 924d9b985ffc6db564fe8e18c8a08ad88d3d9416 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Tue, 19 Aug 2014 14:08:31 +0200 Subject: [PATCH 59/94] Some minor cleanups. --- src/mirall/folder.cpp | 3 ++- src/mirall/owncloudgui.cpp | 12 +++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp index fb296e4301..4a2fadf9f8 100644 --- a/src/mirall/folder.cpp +++ b/src/mirall/folder.cpp @@ -260,6 +260,7 @@ void Folder::slotPollTimerTimeout() qDebug() << "** Force Sync now, state is " << _syncResult.statusString(); emit scheduleToSync(alias()); } else { + // do the ordinary etag chech for the root folder. RequestEtagJob* job = new RequestEtagJob(AccountManager::instance()->account(), remotePath(), this); // check if the etag is different QObject::connect(job, SIGNAL(etagRetreived(QString)), this, SLOT(etagRetreived(QString))); @@ -689,7 +690,7 @@ void Folder::slotEmitFinishedDelayed() } -void Folder::slotFolderDiscovered(bool local, QString folderName) +void Folder::slotFolderDiscovered(bool, QString folderName) { Progress::Info pi; pi._currentDiscoveredFolder = folderName; diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp index 9bb2743b95..9af03690bb 100644 --- a/src/mirall/owncloudgui.cpp +++ b/src/mirall/owncloudgui.cpp @@ -164,12 +164,12 @@ void ownCloudGui::slotSyncStateChange( const QString& alias ) slotComputeOverallSyncStatus(); + if( alias.isEmpty() ) { + return; // Valid, just a general GUI redraw was needed. + } + qDebug() << "Sync state changed for folder " << alias << ": " << result.statusString(); - // Promote sync result to settings-dialog for sync protocol? - // if( _progressDialog ) { - // _progressDialog->setSyncResult(result); - // } if (result.status() == SyncResult::Success || result.status() == SyncResult::Error) { Logger::instance()->enterNextLogFile(); } @@ -204,8 +204,10 @@ void ownCloudGui::startupConnected( bool connected, const QStringList& fails ) } _startupFails = fails; // store that for the settings dialog once it appears. - if( !_settingsDialog.isNull() ) + if( !_settingsDialog.isNull() ) { _settingsDialog->setGeneralErrors( _startupFails ); + } + } void ownCloudGui::slotComputeOverallSyncStatus() From dc0a054d9420f31cb325c683347e64758d093ebe Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Tue, 19 Aug 2014 14:09:53 +0200 Subject: [PATCH 60/94] Status icons: Set the offline icon at the very beginning. Otherwise, if the account is signed out and opens the credential popup, there is a wrong icon displayed. If the account is coming from keychain this icon is quickly overwritten. --- src/mirall/owncloudgui.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp index 9af03690bb..0fc9ff63d8 100644 --- a/src/mirall/owncloudgui.cpp +++ b/src/mirall/owncloudgui.cpp @@ -54,7 +54,9 @@ ownCloudGui::ownCloudGui(Application *parent) : { _tray = new Systray(); _tray->setParent(this); - _tray->setIcon( Theme::instance()->syncStateIcon( SyncResult::NotYetStarted, true ) ); + + // for the beginning, set the offline icon until the account was verified + _tray->setIcon( Theme::instance()->folderOfflineIcon(true)); connect(_tray.data(), SIGNAL(activated(QSystemTrayIcon::ActivationReason)), SLOT(slotTrayClicked(QSystemTrayIcon::ActivationReason))); From e4fe4cb4d31e43c26916eeed5bf7e03e9e6e77d4 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Tue, 19 Aug 2014 14:10:57 +0200 Subject: [PATCH 61/94] Status icons: Display the correct icons after startup connect. --- src/mirall/owncloudgui.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp index 0fc9ff63d8..a46b31d97b 100644 --- a/src/mirall/owncloudgui.cpp +++ b/src/mirall/owncloudgui.cpp @@ -201,8 +201,8 @@ void ownCloudGui::startupConnected( bool connected, const QStringList& fails ) if( connected ) { qDebug() << "######## connected to ownCloud Server!"; folderMan->setSyncEnabled(true); - _tray->setIcon( Theme::instance()->syncStateIcon( SyncResult::NotYetStarted, true ) ); - _tray->show(); + // _tray->setIcon( Theme::instance()->syncStateIcon( SyncResult::NotYetStarted, true ) ); + // _tray->show(); } _startupFails = fails; // store that for the settings dialog once it appears. @@ -210,6 +210,7 @@ void ownCloudGui::startupConnected( bool connected, const QStringList& fails ) _settingsDialog->setGeneralErrors( _startupFails ); } + slotComputeOverallSyncStatus(); } void ownCloudGui::slotComputeOverallSyncStatus() From 617887a0c6a5aa8bf39407992ab2591ad777b58c Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Tue, 19 Aug 2014 14:14:01 +0200 Subject: [PATCH 62/94] Propagator: If the sync was interrupted by pausing, do not show error. Handle problems which happen because of pausing the sync as soft errors rather than normal errors which are blacklisted and displayed in the gui. This fixes bug #1959 --- src/mirall/owncloudpropagator.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp index 9a651f0253..46985c4709 100644 --- a/src/mirall/owncloudpropagator.cpp +++ b/src/mirall/owncloudpropagator.cpp @@ -53,6 +53,14 @@ void PropagateItemJob::done(SyncFileItem::Status status, const QString &errorStr } else { _item._errorString = errorString; } + + if( _propagator->_abortRequested.fetchAndAddRelaxed(0) ) { + // an abort request is ongoing. Change the status to Soft-Error + + status = SyncFileItem::SoftError; + _item._errorString = tr("Operation was canceled by user interaction."); + } + _item._status = status; // Blacklisting From cc6d83a9533bc66f5b757bf715c0996c94adcc14 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Tue, 19 Aug 2014 15:48:08 +0200 Subject: [PATCH 63/94] Windows Shell Integration: Adjust port --- .../windows/OCShellExtensions/OCOverlays/OverlayConstants.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell_integration/windows/OCShellExtensions/OCOverlays/OverlayConstants.h b/shell_integration/windows/OCShellExtensions/OCOverlays/OverlayConstants.h index d93ea98cbe..3af9e73dc2 100644 --- a/shell_integration/windows/OCShellExtensions/OCOverlays/OverlayConstants.h +++ b/shell_integration/windows/OCShellExtensions/OCOverlays/OverlayConstants.h @@ -44,4 +44,4 @@ #define GET_FILE_OVERLAY_ID L"getFileIconId" -#define PORT 33001 \ No newline at end of file +#define PORT 34001 \ No newline at end of file From 76e0d61b1926eed33732d0160670be0d703eae72 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Tue, 19 Aug 2014 15:50:10 +0200 Subject: [PATCH 64/94] Windows Shell Integration: Register icons with well known name --- .../windows/OCShellExtensions/OCOverlays/DllMain.cpp | 2 +- .../OCOverlays/OCOverlayRegistrationHandler.cpp | 7 ++++--- .../OCOverlays/OCOverlayRegistrationHandler.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/shell_integration/windows/OCShellExtensions/OCOverlays/DllMain.cpp b/shell_integration/windows/OCShellExtensions/OCOverlays/DllMain.cpp index a124b95964..545f0c9a34 100644 --- a/shell_integration/windows/OCShellExtensions/OCOverlays/DllMain.cpp +++ b/shell_integration/windows/OCShellExtensions/OCOverlays/DllMain.cpp @@ -108,7 +108,7 @@ HRESULT RegisterCLSID(LPCOLESTR guidStr, PCWSTR overlayStr, PCWSTR szModule) return hResult; } - hResult = OCOverlayRegistrationHandler::RegisterCOMObject(szModule, guid); + hResult = OCOverlayRegistrationHandler::RegisterCOMObject(szModule, overlayStr, guid); if (!SUCCEEDED(hResult)) { return hResult; diff --git a/shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.cpp b/shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.cpp index 7b6985dfc3..b81bc34695 100644 --- a/shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.cpp +++ b/shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.cpp @@ -70,7 +70,7 @@ HRESULT OCOverlayRegistrationHandler::RemoveRegistryEntries(PCWSTR friendlyName) return hResult; } -HRESULT OCOverlayRegistrationHandler::RegisterCOMObject(PCWSTR modulePath, const CLSID& clsid) +HRESULT OCOverlayRegistrationHandler::RegisterCOMObject(PCWSTR modulePath, PCWSTR friendlyName, const CLSID& clsid) { if (modulePath == NULL) { return E_FAIL; @@ -92,14 +92,15 @@ HRESULT OCOverlayRegistrationHandler::RegisterCOMObject(PCWSTR modulePath, const return hResult; } + hResult = HRESULT_FROM_WIN32(RegSetValue(clsidKey, NULL, REG_SZ, friendlyName, (DWORD) wcslen(friendlyName))); + HKEY inprocessKey = NULL; hResult = HRESULT_FROM_WIN32(RegCreateKeyEx(clsidKey, REGISTRY_IN_PROCESS, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &inprocessKey, NULL)); if(!SUCCEEDED(hResult)) { return hResult; } - DWORD cbData = lstrlen(modulePath) * sizeof(*modulePath); - hResult = HRESULT_FROM_WIN32(RegSetValue(inprocessKey, NULL, REG_SZ, modulePath, cbData)); + hResult = HRESULT_FROM_WIN32(RegSetValue(inprocessKey, NULL, REG_SZ, modulePath, (DWORD) wcslen(modulePath))); if(!SUCCEEDED(hResult)) { return hResult; diff --git a/shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.h b/shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.h index 606b9e87b0..2b3a52fca2 100644 --- a/shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.h +++ b/shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.h @@ -23,7 +23,7 @@ class __declspec(dllexport) OCOverlayRegistrationHandler { public: static HRESULT MakeRegistryEntries(const CLSID& clsid, PCWSTR fileType); - static HRESULT RegisterCOMObject(PCWSTR modulePath, const CLSID& clsid); + static HRESULT RegisterCOMObject(PCWSTR modulePath, PCWSTR friendlyName, const CLSID& clsid); static HRESULT RemoveRegistryEntries(PCWSTR friendlyName); static HRESULT UnregisterCOMObject(const CLSID& clsid); }; From d171431ac713dbf5a97f29bcb7e84c46381dd776 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Tue, 19 Aug 2014 15:50:31 +0200 Subject: [PATCH 65/94] Windows Shell Integration: Add version information --- .../OCShellExtensions/OCOverlays/OCOverlay.rc | Bin 4244 -> 6122 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlay.rc b/shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlay.rc index 8d4d30b6d48b50535658f4c44ddc2e3a4a7bc80c..fc261e81dfdacc581cfdef85c8b5043c520ee10e 100644 GIT binary patch literal 6122 zcmdUz?QbGC5XR?orT!0F^5srFT_AT~T2+-UKqx8+Q6Qw1BB3-KNhCrdUYa|pe|xXL z$6nvQu#f^#MYURN?D6>V%=qzmzx=&#`xe=;-PyHG?7^nILz~goqit$)yRs4gs`fok zWHHc7+*0HXgTg{r*w!WQNoz@!l6KmP;v~>7AwnJK4)WiJ3uzOEH7s|*Q z*d=e{Ay#^@d)7b0I`DIh1WmD;dJ@5-sYE{K9@YERucdwrML zTLUzHup^?%@2L*^=bYVDW#&H7)#8!fzj&ghBfIE0BZm8oI$`{4H*1U56I#zH8!k>m ziAVGNv|R4jqJ&>kGN=r z{1bMX!a(|dPL&NWe3U_bed0M*%>1vXJKU-r)75 zY{H7lH!rF=>J! zTiXVa^geG7NiAB!qu6%#buFPRQ@K~x2HRul5TDACpSMOpP-Ky9tPv2bYmp1~&KWil z3pR3g*#^&ri%;b`%7C7?OBP4gIxmM~m30D_rg?UE>H%FSb=%XOPQ01s*TDNdIHHe? z7_ozQ#e99|#;#)T5(sAa+wZ3% z$`R{ovb%;~PouzU#oChIv{tR8Y(Kaa{lRZGlS{@FWuu`tls){YTdizR0=I6zkMO`4 zc08fH2XV>W7E1Iz(OzX0`U;^8Lu(O(79%L0BiNya=JXc~zbC?67tU$}H>WZVot}ye zWfpC69_=ILI-ea1pN~Y`YlM72kNP)3mEEBMO@%d<eH`3%~pN+TD*zob?(l8txRY_ lx$QSleHmE&4K&ztcWjVHB81E1eGF^qX1n;sbJ6e8^bh8c;c@@~ delta 16 XcmaE*KSgmv6z^m;cB##$L=>0-HY5df From 1dd3d080b8ba23c333b4907921ff9fdc62352eef Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Tue, 19 Aug 2014 17:25:59 +0200 Subject: [PATCH 66/94] Update binary submodule --- binary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binary b/binary index 10a2d688b7..82d72bc62d 160000 --- a/binary +++ b/binary @@ -1 +1 @@ -Subproject commit 10a2d688b758c3f83b0d9b331b02fcff063bd843 +Subproject commit 82d72bc62d1f036a4d73a8e9375b52db6e0573b3 From d02175210bc8e6088e77f4f9989fe0428888b0c3 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Tue, 19 Aug 2014 17:46:47 +0200 Subject: [PATCH 67/94] Status Icon: Set a proper icon if no sync is configured. This fixes bug #1956 --- src/mirall/owncloudgui.cpp | 8 ++++++++ src/mirall/settingsdialog.h | 2 +- src/mirall/theme.cpp | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp index a46b31d97b..7e9e710648 100644 --- a/src/mirall/owncloudgui.cpp +++ b/src/mirall/owncloudgui.cpp @@ -266,6 +266,14 @@ void ownCloudGui::slotComputeOverallSyncStatus() QIcon statusIcon = Theme::instance()->syncStateIcon( overallResult.status(), true); _tray->setIcon( statusIcon ); _tray->setToolTip(trayMessage); + } else { + // undefined because there are no folders. + QIcon icon = Theme::instance()->syncStateIcon(SyncResult::Problem); + _tray->setIcon( icon ); + _tray->setToolTip(tr("There are no sync folders configured.")); + if( _settingsDialog ) { + _settingsDialog->slotUpdateAccountIcon(icon); + } } } } diff --git a/src/mirall/settingsdialog.h b/src/mirall/settingsdialog.h index 1e60f6d21e..f5ce4dbd86 100644 --- a/src/mirall/settingsdialog.h +++ b/src/mirall/settingsdialog.h @@ -46,13 +46,13 @@ public: public slots: void showActivityPage(); + void slotUpdateAccountIcon(const QIcon& icon); protected: void reject() Q_DECL_OVERRIDE; void accept() Q_DECL_OVERRIDE; private slots: - void slotUpdateAccountIcon(const QIcon& icon); private: Ui::SettingsDialog *_ui; diff --git a/src/mirall/theme.cpp b/src/mirall/theme.cpp index d6f3321322..94bead60e2 100644 --- a/src/mirall/theme.cpp +++ b/src/mirall/theme.cpp @@ -282,6 +282,9 @@ QIcon Theme::syncStateIcon( SyncResult::Status status, bool sysTray ) const switch( status ) { case SyncResult::Undefined: + // this can happen if no sync connections are configured. + statusIcon = QLatin1String("state-information"); + break; case SyncResult::NotYetStarted: case SyncResult::SyncRunning: statusIcon = QLatin1String("state-sync"); From 132fac86d7449b37d1ea7b043bb55f942d717d98 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 20 Aug 2014 01:25:19 -0400 Subject: [PATCH 68/94] [tx-robot] updated from transifex --- translations/mirall_cs.ts | 6 +++--- translations/mirall_de.ts | 8 ++++---- translations/mirall_es.ts | 8 ++++---- translations/mirall_eu.ts | 7 ++++--- translations/mirall_fr.ts | 6 +++--- translations/mirall_gl.ts | 8 ++++---- translations/mirall_it.ts | 8 ++++---- translations/mirall_ja.ts | 2 +- translations/mirall_nl.ts | 12 ++++++------ translations/mirall_pt_BR.ts | 9 +++++---- translations/mirall_tr.ts | 8 ++++---- 11 files changed, 42 insertions(+), 40 deletions(-) diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts index a0eaa31ed3..63b801ab87 100644 --- a/translations/mirall_cs.ts +++ b/translations/mirall_cs.ts @@ -65,7 +65,7 @@ Selective Sync... - + Výběrová synchronizace... @@ -589,7 +589,7 @@ Opravdu chcete provést tuto akci? Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. - + Výběrová synchronizace: Můžete dodatečně označit podadresáře, které si nepřejete synchronizovat. @@ -2043,7 +2043,7 @@ Zkuste provést novou synchronizaci. <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - + <p>Verze %1. Pro více informací navštivte <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distribuováno %4 a licencováno pod GNU General Public License (GPL) Version 2.0.<br/>%5 a logo %5 jsou registrované obchodní známky %4 ve<br>Spojených státech, ostatních zemích nebo obojí.</p> diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts index cdd8fd4ddc..807ad76c8d 100644 --- a/translations/mirall_de.ts +++ b/translations/mirall_de.ts @@ -65,7 +65,7 @@ Selective Sync... - + Selektive Synchronisation... @@ -590,7 +590,7 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen? Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. - + Selektive Synchronisation: Sie können optional Unterordner abwählen, die nicht synchronisiert werden sollen. @@ -2043,7 +2043,7 @@ Versuchen Sie diese nochmals zu synchronisieren. <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - + <p>Version %1 Für weitere Informationen besuche bitte <a href='%2'>%3</a>.</p><p>Urheberrecht von ownCloud, Inc.<p><p>Zur Verfügung gestellt durch %4 und lizensiert unter der GNU General Public License (GPL) Version 2.0.<br>%5 und das %5 Logo sind eingetragene Warenzeichen von %4 in den Vereinigten Staaten, anderen Ländern oder beides.</p> @@ -2184,7 +2184,7 @@ Versuchen Sie diese nochmals zu synchronisieren. <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> - + <p>Version %2 Für weitere Informationen besuchen Sie <a href="%3">%4</a></p><p><small>Entwickelt durch Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz und andere.<br>Basiert auf Mirall von Duncan Mac-Vicar P.</small></p><p>Urheberrecht von ownCloud, Inc.</p><p>Lizenziert unter der GNU General Public License (GPL) Version 2.0.<br>ownCloud und das ownCloud-Logo sind eingetragene Warenzeichen von ownCloud in den Vereinigten Staaten, anderen Ländern oder beides.</p> diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts index a7fef2613d..51ad94661e 100644 --- a/translations/mirall_es.ts +++ b/translations/mirall_es.ts @@ -65,7 +65,7 @@ Selective Sync... - + Sincronización selectiva... @@ -589,7 +589,7 @@ Está seguro de que desea realizar esta operación? Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. - + Sincronización selectiva: opcionalmente, puede anular la selección de subcarpetas que no desee sincronizar. @@ -2042,7 +2042,7 @@ Intente sincronizar los archivos nuevamente. <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - + <p>Versión %1 Para mayor información, visite <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distribuido por %4 y bajo la licencia GNU General Public License (GPL) Versión 2.0.<br/>%5 y el logo %5 son marcas registradas de %4 en los Estados Unidos de América, otros países, o en ambos.</p> @@ -2183,7 +2183,7 @@ Intente sincronizar los archivos nuevamente. <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> - + <p>Versión %2. Para mayor información, visite <a href="%3">%4</a></p><p><small>Por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz y otros.<br/>Basado en Mirall por Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Distribuido bajo la licencia GNU Public License (GPL) Versión 2.0<br/>ownCloud y el logo de ownCloud son marcas registradas de ownCloud, Inc. en los Estados Unidos de América, otros países, o en ambos</p> diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts index 490dd82b50..cc61b9cdce 100644 --- a/translations/mirall_eu.ts +++ b/translations/mirall_eu.ts @@ -1070,7 +1070,8 @@ for additional privileges during the process. This url is NOT secure as it is not encrypted. It is not advisable to use it. - + Url hori EZ da segurua ez baitago kodetuta. +Ez da gomendagarria erabltzea. @@ -1230,7 +1231,7 @@ It is not advisable to use it. Skip folders configuration - + Saltatu karpeten ezarpenak @@ -2515,7 +2516,7 @@ Saiatu horiek berriz sinkronizatzen. unknown - + ezezaguna diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts index a08092707f..06e18fc825 100644 --- a/translations/mirall_fr.ts +++ b/translations/mirall_fr.ts @@ -1909,7 +1909,7 @@ Il est déconseillé de l'utiliser. A network connection timeout happened. - + Le temps d'attente pour la connexion réseau s'est écoulé. @@ -1985,7 +1985,7 @@ Il est déconseillé de l'utiliser. Not allowed because you don't have permission to add sub-directories in that directory - + Non autorisé parce-que vous n'avez pas la permission d'ajouter des sous-dossiers dans ce dossier @@ -2011,7 +2011,7 @@ Il est déconseillé de l'utiliser. Move not allowed, item restored - + Déplacement non autorisé, élément restauré diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts index e3ba0f8353..bf9c27c866 100644 --- a/translations/mirall_gl.ts +++ b/translations/mirall_gl.ts @@ -65,7 +65,7 @@ Selective Sync... - + Sincronización selectiva... @@ -589,7 +589,7 @@ Confirma que quere realizar esta operación? Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. - + Sincronización selectiva: Pode desmarcar os subcartafoles que non queira sincronizar. @@ -2042,7 +2042,7 @@ Tente sincronizalos de novo. <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - + <p>Versión %1 Para obter máis información vexa <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distribuído por %4 e licenciado baixo a Licenza Pública Xeral (GPL) GNU Versión 2.0.<br>Os logotipos %5 e %5 son marcas rexistradas de %4 nos Estados Unidos de Norte América e/ou outros países.</p> @@ -2183,7 +2183,7 @@ Tente sincronizalos de novo. <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> - + <p>Versión %2. Para obter máis información vexa visit <a href="%3">%4</a></p><p><small>Por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz e outros.<br>Baseado no Mirall de Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licenciado baixo a Licenza Pública Xeral (GPL) GNU Versión 2.0<br/>ownCloud e o logotipo do ownCloud son marcas rexistradas de ownCloud,Inc. nos Estados Unidos de Norte América e/ou outros países</p> diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts index eba422c815..8f85e872fa 100644 --- a/translations/mirall_it.ts +++ b/translations/mirall_it.ts @@ -65,7 +65,7 @@ Selective Sync... - + Sincronizzazione selettiva... @@ -589,7 +589,7 @@ Sei sicuro di voler eseguire questa operazione? Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. - + Sincronizzazione selettiva: puoi deselezionare opzionalmente le sottocartelle che non desideri sincronizzare. @@ -2041,7 +2041,7 @@ Prova a sincronizzare nuovamente. <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - + <p>Versione %1 Per ulteriori informazioni, visita <a href='%2'>%3</a>. </p><p>Copyright ownCloud, Inc.<p><p>Distribuito da %4 e sotto licenza GNU General Public License (GPL) versione 2.0.<br/>%5 e il logo di %5 sono marchi registrati di %4 negli Stati Uniti, in altri paesi o entrambi.</p> @@ -2182,7 +2182,7 @@ Prova a sincronizzare nuovamente. <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> - + <p>Versione %2. Per ulteriori informazioni, visita <a href='%3'>%4</a></p><p><small>Di Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz e altri.<br/>Basato su Mirall di Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.<p><p>Sotto licenza GNU Public License (GPL) versione 2.0<br>ownCloud e il logo di ownCloud sono marchi registrati di ownCloud, Inc. negli Stati Uniti, in altri paesi o entrambi</p> diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts index 7dd0335d51..43e8a44f82 100644 --- a/translations/mirall_ja.ts +++ b/translations/mirall_ja.ts @@ -246,7 +246,7 @@ Total time left %5 No ownCloud account configured - ownCloud アカウントが設定されていません + ownCloudアカウントが設定されていません diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts index 97ec414615..74bc2e301e 100644 --- a/translations/mirall_nl.ts +++ b/translations/mirall_nl.ts @@ -65,7 +65,7 @@ Selective Sync... - + Selectieve sync: @@ -589,7 +589,7 @@ Weet u zeker dat u deze bewerking wilt uitvoeren? Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. - + Selectieve Sunc: u kunt optioneel de submappen deselecteren die u niet wenst te synchroniseren. @@ -1716,7 +1716,7 @@ Probeer opnieuw te synchroniseren. This connection is NOT secure as it is not encrypted. - Deze verbinding is NIET veilig, omdat de verbinding niet is versleuteld. + Deze verbinding is NIET veilig, omdat deze niet versleuteld is. @@ -1741,7 +1741,7 @@ Probeer opnieuw te synchroniseren. Warnings about current SSL Connection: - Waarschuwing over huidige SSL Connectie: + Waarschuwing over huidige SSL-verbinding: @@ -2042,7 +2042,7 @@ Probeer opnieuw te synchroniseren. <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - + <p>Versie %1 Voor meer informatie bezoekt u <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Gedistribueerd door %4 en verstrekt onder de GNU General Public License (GPL) Versie 2.0.<br>%5 en het %5 logo zijn geregistreerde handelsmerken van %4 in de Verenigde Staten, andere landen, of beide.</p> @@ -2183,7 +2183,7 @@ Probeer opnieuw te synchroniseren. <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> - + <p>Versie %2. Bezoek voor meer informatie <a href="%3">%4</a>.</p><p><small>Door Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz en anderen.<br>Gebaseerd op MIrall van Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Gelicenseerd onder de GNU Public License (GPL) Versie 2.0<br>ownCloud en het ownCloud logo zijn geregistreerde handelsmerken van ownCloud,Inc. in de Verenigde Staten, andere landen, of beide.</p> diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts index 9348a670b0..c27d983df7 100644 --- a/translations/mirall_pt_BR.ts +++ b/translations/mirall_pt_BR.ts @@ -65,7 +65,7 @@ Selective Sync... - + Sincronização Seletiva... @@ -589,7 +589,7 @@ Você tem certeza que quer executar esta operação? Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. - + Sincronização Seletiva: Você pode opcionalmente descelecionar subpastas que você não deseja sincronizar. @@ -2040,7 +2040,7 @@ Tente sincronizar novamente. <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - + <p>Versão %1 Para mais informações por favor visite <a href='%2'>%3</a>.</p><p>Direitos Autorais ownCloud, Inc.</p><p>Distribuido por %4 e licenciado sob a GNU General Public License (GPL) Versão 2.0.<br/>%5 e o %5 logo são marcas registradas de %4 nos Estados Unidos, outrops países, ou ambos.</p> @@ -2181,7 +2181,8 @@ Tente sincronizar novamente. <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> - + <p>Versão %2. Para mais informações visite <a href="%3">%4</a></p><p><small>Por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p> +Direitos Autorais ownCloud, Inc.</p><p>Distribuido por %4 e licenciado sob a GNU General Public License (GPL) Versão 2.0.<br/>%5 e o %5 logo são marcas registradas de %4 nos Estados Unidos, outrops países, ou ambos.</p> diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts index cb55740bb6..42ace71ac0 100644 --- a/translations/mirall_tr.ts +++ b/translations/mirall_tr.ts @@ -65,7 +65,7 @@ Selective Sync... - + Seçimsel Eşitleme... @@ -589,7 +589,7 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz? Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. - + Seçimsel Eşitleme: İsterseniz eşitlemek istemediğiniz alt klasörlerin işaretini kaldırabilirsiniz. @@ -2042,7 +2042,7 @@ Bu dosyaları tekrar eşitlemeyi deneyin. <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - + <p>Sürüm %1 Daha fazla bilgi için lütfen <a href='%2'>%3</a> adresini ziyaret edin.</p><p>Telif hakkı ownCloud, Inc.</p><p>Dağıtım %4 ve GNU Genel Kamu Lisansı (GPL) Sürüm 2.0 ile lisanslanmıştır olup <br/>%5 ve %5 logoları ABD ve/veya diğer ülkelerde %4 tescili markalarıdır.</p> @@ -2183,7 +2183,7 @@ Bu dosyaları tekrar eşitlemeyi deneyin. <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> - + <p>Sürüm %2. Daha fazla bilgi için lütfen <a href="%3">%4</a> adresini ziyaret edin.</p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz ve diğerleri.<br>Duncan Mac-Vicar P. tarafından yazılmış Mirall tabanlıdır.</small></p><p>Telif hakkı ownCloud, Inc.</p><p>GNU Genel Kamu Lisansı (GPL) Sürüm 2.0 ile lisanslanmıştır.<br>ownCloud ve ownCloud logoları <br>ABD ve/veya diğer ülkelerde ownCloud, Inc.'nin tescili markalarıdır.</p> From d9de6e68ad552055ccc57302d8d28e14ec939b89 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Mon, 18 Aug 2014 17:25:43 +0200 Subject: [PATCH 69/94] OS X: Optimize Finder icon drawing code Don't have an intermeditate TIFF. --- .../OwnCloudFinder/IconOverlayHandlers.m | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/shell_integration/MacOSX/OwnCloudFinder/IconOverlayHandlers.m b/shell_integration/MacOSX/OwnCloudFinder/IconOverlayHandlers.m index 90b22fd584..14f1232cc2 100644 --- a/shell_integration/MacOSX/OwnCloudFinder/IconOverlayHandlers.m +++ b/shell_integration/MacOSX/OwnCloudFinder/IconOverlayHandlers.m @@ -91,14 +91,18 @@ if (iconimage != nil) { - CGImageSourceRef source; - NSData* data = [iconimage TIFFRepresentation]; + CGRect destRect = CGRectMake(0, 0, [icon size].width, [icon size].height); + CGImageRef cgImage = [iconimage CGImageForProposedRect:&destRect + context:[NSGraphicsContext currentContext] + hints:nil]; + if (cgImage) { + CGContextDrawImage(myContext, destRect, cgImage); + //CGImageRelease(cgImage); // leak here? if we leave this code in, Finder crashes + // But actually i'm not seeing a leak in Activity Monitor.. maybe it is not really leaking? + } else { + NSLog(@"No image given!!!!!11 %@", [url path]); + } - source = CGImageSourceCreateWithData((CFDataRef)data, NULL); - CGImageRef maskRef = CGImageSourceCreateImageAtIndex(source, 0, NULL); - CGContextDrawImage(myContext, CGRectMake(0, 0, [icon size].width, [icon size].height), maskRef); - CFRelease(source); - CFRelease(maskRef); } [icon unlockFocus]; From 8fdee7950531edd8c452f7c0dc4e689dd0446cbe Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Wed, 20 Aug 2014 16:06:16 +0200 Subject: [PATCH 70/94] Fix crash in accountsettings --- src/mirall/accountsettings.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp index 9f8b84fe2e..2bdafd6509 100644 --- a/src/mirall/accountsettings.cpp +++ b/src/mirall/accountsettings.cpp @@ -235,7 +235,11 @@ void AccountSettings::slotAddFolder( Folder *folder ) if( ! folder || folder->alias().isEmpty() ) return; QStandardItem *item = new QStandardItem(); - folderToModelItem( item, folder, _account->state() == Account::Connected ); + bool isConnected = false; + if (_account) { + isConnected = (_account->state() == Account::Connected); + } + folderToModelItem( item, folder, isConnected); _model->appendRow( item ); // in order to update the enabled state of the "Sync now" button connect(folder, SIGNAL(syncStateChange()), this, SLOT(slotFolderSyncStateChange()), Qt::UniqueConnection); @@ -273,7 +277,7 @@ void AccountSettings::folderToModelItem( QStandardItem *item, Folder *f, bool ac Theme *theme = Theme::instance(); item->setData( theme->statusHeaderText( status ), Qt::ToolTipRole ); - if (_account->state() == Account::Connected) { + if ( accountConnected ) { if( f->syncPaused() ) { item->setData( theme->folderDisabledIcon( ), FolderStatusDelegate::FolderStatusIconRole ); // size 48 before _wasDisabledBefore = false; From 6b52e9db34486d967ae8dd9b57e871648f46c69a Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Wed, 20 Aug 2014 16:06:16 +0200 Subject: [PATCH 71/94] Fix crash in accountsettings --- src/mirall/accountsettings.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp index 9f8b84fe2e..2bdafd6509 100644 --- a/src/mirall/accountsettings.cpp +++ b/src/mirall/accountsettings.cpp @@ -235,7 +235,11 @@ void AccountSettings::slotAddFolder( Folder *folder ) if( ! folder || folder->alias().isEmpty() ) return; QStandardItem *item = new QStandardItem(); - folderToModelItem( item, folder, _account->state() == Account::Connected ); + bool isConnected = false; + if (_account) { + isConnected = (_account->state() == Account::Connected); + } + folderToModelItem( item, folder, isConnected); _model->appendRow( item ); // in order to update the enabled state of the "Sync now" button connect(folder, SIGNAL(syncStateChange()), this, SLOT(slotFolderSyncStateChange()), Qt::UniqueConnection); @@ -273,7 +277,7 @@ void AccountSettings::folderToModelItem( QStandardItem *item, Folder *f, bool ac Theme *theme = Theme::instance(); item->setData( theme->statusHeaderText( status ), Qt::ToolTipRole ); - if (_account->state() == Account::Connected) { + if ( accountConnected ) { if( f->syncPaused() ) { item->setData( theme->folderDisabledIcon( ), FolderStatusDelegate::FolderStatusIconRole ); // size 48 before _wasDisabledBefore = false; From ccf532672b11fb87b473397d0446e528f9b37440 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Wed, 20 Aug 2014 16:07:22 +0200 Subject: [PATCH 72/94] Use InstallLib to install the overlay icons This allows for a cleaner expirience --- cmake/modules/NSIS.template.in | 70 +++++++++------------------------- 1 file changed, 19 insertions(+), 51 deletions(-) diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index aaa1956d58..6ece4765e4 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -95,6 +95,7 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll" !include WordFunc.nsh ;Used by VersionCompare macro function. !include FileFunc.nsh ;Used to read out parameters !include UAC.nsh ;Used by the UAC elevation to install as user or admin. +!include Library.nsh ;Used by the COM registration for shell extensions !include x64.nsh ;Used to determine the right arch for the shell extensions ;----------------------------------------------------------------------------- @@ -277,50 +278,10 @@ FunctionEnd no_process_${processName}_to_end: !macroend -!macro StartExplorerAsUserMacro un - Function ${un}StartExplorerAsUser - Exec "$WINDIR\explorer.exe" - FunctionEnd -!macroend - -!insertmacro StartExplorerAsUserMacro "" -!insertmacro StartExplorerAsUserMacro "un." - -!macro StartExplorer un - DetailPrint "Starting Explorer..." - ${UAC.CallFunctionAsUser} ${un}StartExplorerAsUser -!macroend - -!macro StopExplorer - DetailPrint "Terminated Explorer..." - FindWindow $R0 "Shell_TrayWnd" - SendMessage $R0 0x5B4 0 0 - #Processes::KillProcess explorer.exe - Sleep 1500 - DetailPrint "Continuing..." -!macroend - Function EnsureOwncloudShutdown !insertmacro CheckAndConfirmEndProcess "${APPLICATION_EXECUTABLE}" FunctionEnd -Function RegisterShellExt - SetOutPath "$INSTDIR\shellext" - ${If} ${RunningX64} - ExecWait '"$SYSDIR\regsvr32.exe" /s "$OUTDIR\OCOverlays_x64.dll"' - ${Else} - ExecWait '"$SYSDIR\regsvr32.exe" /s "$OUTDIR\OCOverlays_x86.dll"' - ${EndIf} -FunctionEnd - -Function Un.RegisterShellExt - ${If} ${RunningX64} - ExecWait '"$SYSDIR\regsvr32.exe" /u /s "$INSTDIR\shellext\OCOverlays_x64.dll"' - ${Else} - ExecWait '"$SYSDIR\regsvr32.exe" /u /s "$INSTDIR\shellext\OCOverlays_x86.dll"' - ${EndIf} -FunctionEnd - Function InstallRedistributables ${If} ${RunningX64} ExecWait '"$OUTDIR\vcredist_x64.exe" /install /quiet' @@ -510,17 +471,18 @@ SectionEnd SectionIn 1 2 SetDetailsPrint textonly DetailPrint $OPTION_SECTION_SC_SHELL_EXT_DetailPrint - SetOutPath "$INSTDIR\shellext" - File "${SOURCE_PATH}\binary\shell_integration\windows\Release\x64\OCUtil_x64.dll" - File "${SOURCE_PATH}\binary\shell_integration\windows\Release\x64\OCOverlays_x64.dll" - File "${SOURCE_PATH}\binary\shell_integration\windows\Release\Win32\OCUtil_x86.dll" - File "${SOURCE_PATH}\binary\shell_integration\windows\Release\Win32\OCOverlays_x86.dll" File "${BUILD_PATH}\vcredist_x86.exe" File "${BUILD_PATH}\vcredist_x64.exe" Call InstallRedistributables - Call RegisterShellExt - !insertMacro StopExplorer - !insertMacro StartExplorer "" + ${If} ${RunningX64} + !define LIBRARY_X64 + !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\x64\OCUtil_x64.dll" "$INSTDIR/shellext/OCUtil_x64.dll" "$INSTDIR/shellext" + !insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\x64\OCOverlays_x64.dll" "$INSTDIR/shellext/OCOverlays_x64.dll" "$INSTDIR/shellext" + !undef LIBRARY_X64 + ${Else} + !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\Win32\OCUtil_x86.dll" "$INSTDIR/shellext/OCUtil_x86.dll" "$INSTDIR/shellext" + !insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\Win32\OCOverlays_x86.dll" "$INSTDIR/shellext/OCOverlays_x86.dll" "$INSTDIR/shellext" + ${Endif} ${MementoSectionEnd} !endif @@ -673,10 +635,16 @@ Section Uninstall ;Shell extension !ifdef OPTION_SECTION_SC_SHELL_EXT + !define LIBRARY_COM + !define LIBRARY_SHELL_EXTENSION ${If} ${HasSection} SEC_SHELL_EXT - !insertmacro StopExplorer - Call Un.RegisterShellExt - !insertmacro StartExplorer "Un." + !define LIBRARY_X64 + !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED "$INSTDIR/shellext/OCUtil_x64.dll" + !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR/shellext/OCOverlays_x64.dll" + !undef LIBRARY_X64 + ${Else} + !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED "$INSTDIR/shellext/OCUtil_x86.dll" + !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR/shellext/OCOverlays_x86.dll" ${EndIf} !endif From 4356005c5ac0e518b0322d6799c74ca0d0b971d6 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Wed, 20 Aug 2014 14:36:09 +0200 Subject: [PATCH 73/94] FolderMan: Do not remove the folder icon too early from the map. Otherwise, method unloadFolder can not do important frees. This is one part of the fix for #2073 because now the socketapi will send the UNREGISTER_PATH message over the socket. --- src/mirall/folderman.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp index 15a8e591e4..c530c1794a 100644 --- a/src/mirall/folderman.cpp +++ b/src/mirall/folderman.cpp @@ -576,7 +576,7 @@ void FolderMan::removeFolder( const QString& alias ) if( _folderMap.contains( alias )) { qDebug() << "Removing " << alias; - f = _folderMap.take( alias ); + f = _folderMap[alias]; // do not remove from the map, that is done in unloadFolder. } else { qDebug() << "!! Can not remove " << alias << ", not in folderMap."; } From d1a660ce2048f153fdcd9fab4ec658903bf50651 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Wed, 20 Aug 2014 16:24:06 +0200 Subject: [PATCH 74/94] SocketAPI: Add parameter to enable wait for the socket write. This is needed to wait until the UNREGISTER message is sent to the shell code when mirall shuts down. --- src/mirall/socketapi.cpp | 11 +++++++---- src/mirall/socketapi.h | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp index 18a22b1b1b..2ef92795ef 100644 --- a/src/mirall/socketapi.cpp +++ b/src/mirall/socketapi.cpp @@ -261,7 +261,7 @@ void SocketApi::slotUnregisterPath( const QString& alias ) { Folder *f = FolderMan::instance()->folder(alias); if (f) { - broadcastMessage(QLatin1String("UNREGISTER_PATH"), f->path() ); + broadcastMessage(QLatin1String("UNREGISTER_PATH"), f->path(), QString::null, true ); } } @@ -304,7 +304,7 @@ void SocketApi::slotJobCompleted(const QString &folder, const SyncFileItem &item -void SocketApi::sendMessage(QTcpSocket *socket, const QString& message) +void SocketApi::sendMessage(QTcpSocket *socket, const QString& message, bool doWait) { DEBUG << "Sending message: " << message; QString localMessage = message; @@ -312,13 +312,16 @@ void SocketApi::sendMessage(QTcpSocket *socket, const QString& message) localMessage.append(QLatin1Char('\n')); } qint64 sent = socket->write(localMessage.toUtf8()); + if( doWait ) { + socket->waitForBytesWritten(1000); + } if( sent != localMessage.toUtf8().length() ) { qDebug() << "WARN: Could not send all data on socket for " << localMessage; } } -void SocketApi::broadcastMessage( const QString& verb, const QString& path, const QString& status ) +void SocketApi::broadcastMessage( const QString& verb, const QString& path, const QString& status, bool doWait ) { QString msg(verb); @@ -333,7 +336,7 @@ void SocketApi::broadcastMessage( const QString& verb, const QString& path, cons DEBUG << "Broadcasting to" << _listeners.count() << "listeners: " << msg; foreach(QTcpSocket *socket, _listeners) { - sendMessage(socket, msg); + sendMessage(socket, msg, doWait); } } diff --git a/src/mirall/socketapi.h b/src/mirall/socketapi.h index cd8cbdf0d0..e8f4ac02ca 100644 --- a/src/mirall/socketapi.h +++ b/src/mirall/socketapi.h @@ -48,8 +48,8 @@ private slots: void slotJobCompleted(const QString &, const SyncFileItem &); private: - void sendMessage(QTcpSocket* socket, const QString& message); - void broadcastMessage(const QString& verb, const QString &path, const QString &status = QString::null); + void sendMessage(QTcpSocket* socket, const QString& message, bool doWait = false); + void broadcastMessage(const QString& verb, const QString &path, const QString &status = QString::null, bool doWait = false); Q_INVOKABLE void command_RETRIEVE_FOLDER_STATUS(const QString& argument, QTcpSocket* socket); Q_INVOKABLE void command_RETRIEVE_FILE_STATUS(const QString& argument, QTcpSocket* socket); From 75101a031945702c398a37334dd00eac896c8db5 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Wed, 20 Aug 2014 16:27:44 +0200 Subject: [PATCH 75/94] Application: Unload all folders when shutting down. That sends a proper UNREGISTER message via socket API. --- src/mirall/application.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp index cd33cd9392..5610cf6f9f 100644 --- a/src/mirall/application.cpp +++ b/src/mirall/application.cpp @@ -208,6 +208,8 @@ void Application::slotCleanup() if (account) { account->save(); } + FolderMan::instance()->unloadAllFolders(); + _gui->slotShutdown(); _gui->deleteLater(); } From fef0d0b31cf2ae13c82da4475e20c495a067905a Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Wed, 20 Aug 2014 17:31:00 +0200 Subject: [PATCH 76/94] Overlays Nautilus: Handle UNREGISTER_PATH and do proper reconnect. This is needed to fix #2073 --- shell_integration/nautilus/ownCloud.py | 41 ++++++++++++++++---------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/shell_integration/nautilus/ownCloud.py b/shell_integration/nautilus/ownCloud.py index ac04a17d38..158b015d73 100755 --- a/shell_integration/nautilus/ownCloud.py +++ b/shell_integration/nautilus/ownCloud.py @@ -51,10 +51,7 @@ class ownCloudExtension(GObject.GObject, Nautilus.ColumnProvider, Nautilus.InfoP return self.nautilusVFSFile_table[path] else: return None - - def callback_update_file( self, path ): - print "Got an update callback for " + path - + def askForOverlay(self, file): if os.path.isdir(file): folderStatus = self.sendCommand("RETRIEVE_FOLDER_STATUS:"+file+"\n"); @@ -62,6 +59,17 @@ class ownCloudExtension(GObject.GObject, Nautilus.ColumnProvider, Nautilus.InfoP if os.path.isfile(file): fileStatus = self.sendCommand("RETRIEVE_FILE_STATUS:"+file+"\n"); + def invalidate_items_underneath( self, path ): + update_items = [] + for p in self.nautilusVFSFile_table: + if p == path or p.startswith( path ): + item = self.nautilusVFSFile_table[p] + update_items.append(item) + + for item in update_items: + item.invalidate_extension_info() + # self.update_file_info(item) + # Handles a single line of server respoonse and sets the emblem def handle_server_response(self, l): Emblems = { 'OK' : 'oC_ok', @@ -94,18 +102,23 @@ class ownCloudExtension(GObject.GObject, Nautilus.ColumnProvider, Nautilus.InfoP elif action == 'UPDATE_VIEW': # Search all items underneath this path and invalidate them if parts[1] in self.registered_paths: - update_items = [] - for p in self.nautilusVFSFile_table: - if p == parts[1] or p.startswith( parts[1] ): - item = self.nautilusVFSFile_table[p] - update_items.append(item) - - for item in update_items: - item.invalidate_extension_info() - # self.update_file_info(item) + self.invalidate_items_underneath( parts[1] ) elif action == 'REGISTER_PATH': self.registered_paths[parts[1]] = 1 + self.invalidate_items_underneath( parts[1] ) + elif action == 'UNREGISTER_PATH': + del self.registered_paths[parts[1]] + self.invalidate_items_underneath( parts[1] ) + + # check if there are non pathes any more, if so, its usual + # that mirall went away. Try reconnect. + if not self.registered_paths: + self.sock.close() + self.connected = False + GObject.source_remove( self.watch_id ) + GObject.timeout_add(5000, self.connectToOwnCloud) + else: # print "We got unknown action " + action 1 @@ -136,8 +149,6 @@ class ownCloudExtension(GObject.GObject, Nautilus.ColumnProvider, Nautilus.InfoP def get_local_path(self, path): return path.replace("file://", "") - - def update_file_info(self, item): if item.get_uri_scheme() != 'file': return From 696f801df0eaba6f2eb00fef82c46ed7e7e1f4ed Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Thu, 21 Aug 2014 01:25:23 -0400 Subject: [PATCH 77/94] [tx-robot] updated from transifex --- translations/mirall_ca.ts | 154 +++++++++++++++++---------------- translations/mirall_cs.ts | 154 +++++++++++++++++---------------- translations/mirall_de.ts | 154 +++++++++++++++++---------------- translations/mirall_el.ts | 154 +++++++++++++++++---------------- translations/mirall_en.ts | 154 +++++++++++++++++---------------- translations/mirall_es.ts | 154 +++++++++++++++++---------------- translations/mirall_es_AR.ts | 154 +++++++++++++++++---------------- translations/mirall_et.ts | 154 +++++++++++++++++---------------- translations/mirall_eu.ts | 154 +++++++++++++++++---------------- translations/mirall_fa.ts | 154 +++++++++++++++++---------------- translations/mirall_fi.ts | 154 +++++++++++++++++---------------- translations/mirall_fr.ts | 154 +++++++++++++++++---------------- translations/mirall_gl.ts | 154 +++++++++++++++++---------------- translations/mirall_hu.ts | 154 +++++++++++++++++---------------- translations/mirall_it.ts | 154 +++++++++++++++++---------------- translations/mirall_ja.ts | 154 +++++++++++++++++---------------- translations/mirall_nl.ts | 154 +++++++++++++++++---------------- translations/mirall_pl.ts | 154 +++++++++++++++++---------------- translations/mirall_pt.ts | 154 +++++++++++++++++---------------- translations/mirall_pt_BR.ts | 154 +++++++++++++++++---------------- translations/mirall_ru.ts | 160 +++++++++++++++++++---------------- translations/mirall_sk.ts | 154 +++++++++++++++++---------------- translations/mirall_sl.ts | 154 +++++++++++++++++---------------- translations/mirall_sv.ts | 154 +++++++++++++++++---------------- translations/mirall_th.ts | 154 +++++++++++++++++---------------- translations/mirall_tr.ts | 154 +++++++++++++++++---------------- translations/mirall_uk.ts | 154 +++++++++++++++++---------------- translations/mirall_zh_CN.ts | 154 +++++++++++++++++---------------- translations/mirall_zh_TW.ts | 154 +++++++++++++++++---------------- 29 files changed, 2381 insertions(+), 2091 deletions(-) diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts index e7540b5170..625c46e92c 100644 --- a/translations/mirall_ca.ts +++ b/translations/mirall_ca.ts @@ -129,53 +129,53 @@ Continua - + Confirm Folder Remove Confirma l'eliminació de la carpeta - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Voleu aturar la sincronització de la carpeta <i>%1</i>?</p><p><b>Nota:</b> Això no eliminarà els fitxers del client.</p> - + Confirm Folder Reset Confirmeu la reinicialització de la carpeta - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Voleu reiniciar la carpeta <i>%1</i> i reconstruir la base de dades del client?</p><p><b>Nota:</b> Aquesta funció existeix només per tasques de manteniment. Cap fitxer no s'eliminarà, però podria provocar-se un transit de dades significant i podria trigar diversos minuts o hores en completar-se, depenent de la mida de la carpeta. Utilitzeu aquesta opció només si us ho recomana l'administrador.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) de %2 l'espai del servidor en ús. - + No connection to %1 at <a href="%2">%3</a>. No hi ha connexió amb %1 a <a href="%2">%3</a>. - + No %1 connection configured. La connexió %1 no està configurada. - + Sync Running S'està sincronitzant @@ -185,35 +185,35 @@ No hi ha cap compte configurat - + The syncing operation is running.<br/>Do you want to terminate it? S'està sincronitzant.<br/>Voleu parar-la? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 de %4) %5 pendents a un ràtio de %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 de %2, fitxer %3 de %4 Temps restant total %5 - + Connected to <a href="%1">%2</a>. Connectat a <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Connectat a <a href="%1">%2</a> com a <i>%3</i>. - + Currently there is no storage usage information available. Actualment no hi ha informació disponible de l'ús d'emmagatzemament. @@ -292,73 +292,73 @@ Temps restant total %5 No es pot llegir %1. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 i %2 altres fitxers s'han esborrat - + %1 has been removed. %1 names a file. S'ha esborrat '%1' - + %1 and %2 other files have been downloaded. %1 names a file. %1 i %2 altres fitxers s'han descarregat. - + %1 has been downloaded. %1 names a file. S'ha descarregat %1 - + %1 and %2 other files have been updated. %1 i %2 altres fitxer(s) s'han actualitzat. - + %1 has been updated. %1 names a file. S'ha actualitzat %1 - + %1 has been renamed to %2 and %3 other files have been renamed. %1 s'ha reanomenat a %2 i %3 altres fitxers s'han reanomenat. - + %1 has been renamed to %2. %1 and %2 name files. %1 s'ha reanomenat a %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 s'ha reanomenat a %2 i %3 altres fitxers s'han eliminat. - + %1 has been moved to %2. %1 s'ha mogut a %2. - + Sync Activity Activitat de sincronització - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -367,17 +367,17 @@ Això podria ser perquè la carpeta ha estat reconfigurada silenciosament, o que Esteu segur que voleu executar aquesta operació? - + Remove All Files? Esborra tots els fitxers? - + Remove all files Esborra tots els fitxers - + Keep files Mantén els fitxers @@ -395,52 +395,52 @@ Esteu segur que voleu executar aquesta operació? S'ha trobat un diari de sincronització antic '%1', però no s'ha pogut eliminar. Assegureu-vos que no hi ha cap aplicació que actualment en faci ús. - + Undefined State. Estat indefinit. - + Waits to start syncing. Espera per començar la sincronització. - + Preparing for sync. Perparant per la sincronització. - + Sync is running. S'està sincronitzant. - + Last Sync was successful. La darrera sincronització va ser correcta. - + Last Sync was successful, but with warnings on individual files. La última sincronització ha estat un èxit, però amb avisos en fitxers individuals. - + Setup Error. Error de configuració. - + User Abort. Cancel·la usuari. - + Sync is paused. La sincronització està en pausa. - + %1 (Sync is paused) %1 (Sync està pausat) @@ -449,17 +449,17 @@ Esteu segur que voleu executar aquesta operació? Mirall::FolderStatusDelegate - + File Fitxer - + Syncing all files in your account with Sincronitzant tots els fitxers del compte amb - + Remote path: %1 Carpeta remota: %1 @@ -1314,7 +1314,12 @@ No és aconsellada usar-la. ; La restauració ha fallat: - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 S'ha eliminat un fitxer o carpeta de la compartició nómés de lectura, però la restauració ha fallat: %1 @@ -2048,132 +2053,137 @@ Proveu de sincronitzar-los de nou. Mirall::ownCloudGui - + Please sign in Acrediteu-vos - + Disconnected from server Desconnectat del servidor - + Folder %1: %2 Carpeta %1: %2 - + No sync folders configured. No hi ha fitxers de sincronització configurats - + + There are no sync folders configured. + + + + None. Cap. - + Recent Changes Canvis recents - + Open %1 folder Obre la carpeta %1 - + Managed Folders: Fitxers gestionats: - + Open folder '%1' Obre carpeta '%1' - + Open %1 in browser Obre %1 en el navegador - + Calculating quota... Calculant la quota... - + Unknown status Estat desconegut - + Settings... Arranjament... - + Details... Detalls... - + Help Ajuda - + Quit %1 Surt %1 - + Sign in... Acredita... - + Sign out Surt - + Quota n/a Quota n/d - + %1% of %2 in use %1 de %2 en ús - + No items synced recently No hi ha elements sincronitzats recentment - + Discovering %1 - + Syncing %1 of %2 (%3 left) Sincronitzant %1 de %2 (%3 pendents) - + Syncing %1 (%2 left) Sincronitzant %1 (%2 pendents) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Actualitzat diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts index 63b801ab87..ae2e666fdc 100644 --- a/translations/mirall_cs.ts +++ b/translations/mirall_cs.ts @@ -129,53 +129,53 @@ Obnovit - + Confirm Folder Remove Potvrdit odstranění složky - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Opravdu chcete zastavit synchronizaci složky <i>%1</i>?</p><p><b>Poznámka:</b> Tato akce nesmaže soubory z místní složky.</p> - + Confirm Folder Reset Potvrdit restartování složky - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Skutečně chcete resetovat složku <i>%1</i> a znovu sestavit klientskou databázi?</p><p><b>Poznámka:</b> Tato funkce je určena pouze pro účely údržby. Žádné soubory nebudou smazány, ale může to způsobit velké datové přenosy a dokončení může trvat mnoho minut či hodin v závislosti na množství dat ve složce. Použijte tuto volbu pouze na pokyn správce.</p> - + Discovering %1 Hledám %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) z %2 místa na disku použito. - + No connection to %1 at <a href="%2">%3</a>. Žádné spojení s %1 na <a href="%2">%3</a>. - + No %1 connection configured. Žádné spojení s %1 nenastaveno. - + Sync Running Synchronizace probíhá @@ -185,35 +185,35 @@ Žádný účet nenastaven. - + The syncing operation is running.<br/>Do you want to terminate it? Operace synchronizace právě probíhá.<br/>Přejete si ji ukončit? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 z %4) zbývající čas %5 při rychlosti %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 z %2, soubor %3 ze %4 Celkový zbývající čas %5 - + Connected to <a href="%1">%2</a>. Připojeno k <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Připojeno k <a href="%1">%2</a> jako <i>%3</i>. - + Currently there is no storage usage information available. Momentálně nejsou k dispozici žádné informace o využití úložiště @@ -292,73 +292,73 @@ Celkový zbývající čas %5 %1 není čitelný. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 a %2 dalších souborů bylo odebráno. - + %1 has been removed. %1 names a file. %1 byl odebrán. - + %1 and %2 other files have been downloaded. %1 names a file. %1 a %2 dalších souborů bylo staženo. - + %1 has been downloaded. %1 names a file. %1 byl stažen. - + %1 and %2 other files have been updated. %1 a %2 dalších souborů bylo aktualizováno. - + %1 has been updated. %1 names a file. %1 byl aktualizován. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 byl přejmenován na %2 a %3 dalších souborů bylo přejmenováno. - + %1 has been renamed to %2. %1 and %2 name files. %1 byl přejmenován na %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 byl přesunut do %2 a %3 dalších souborů bylo přesunuto. - + %1 has been moved to %2. %1 byl přemístěn do %2. - + Sync Activity Průběh synchronizace - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -367,17 +367,17 @@ Toto může být způsobeno změnou v nastavení synchronizace složky nebo tím Opravdu chcete provést tuto akci? - + Remove All Files? Odstranit všechny soubory? - + Remove all files Odstranit všechny soubory - + Keep files Ponechat soubory @@ -395,52 +395,52 @@ Opravdu chcete provést tuto akci? Byl nalezen starý záznam synchronizace '%1', ale nebylo možné jej odebrat. Ujistěte se, že není aktuálně používán jinou aplikací. - + Undefined State. Nedefinovaný stav. - + Waits to start syncing. Vyčkává na spuštění synchronizace. - + Preparing for sync. Příprava na synchronizaci. - + Sync is running. Synchronizace probíhá. - + Last Sync was successful. Poslední synchronizace byla úspěšná. - + Last Sync was successful, but with warnings on individual files. Poslední synchronizace byla úspěšná, ale s varováním u některých souborů - + Setup Error. Chyba nastavení. - + User Abort. Zrušení uživatelem. - + Sync is paused. Synchronizace pozastavena. - + %1 (Sync is paused) %1 (Synchronizace je pozastavena) @@ -449,17 +449,17 @@ Opravdu chcete provést tuto akci? Mirall::FolderStatusDelegate - + File Soubor - + Syncing all files in your account with Synchronizuji všechny soubory ve vašem účtu s - + Remote path: %1 Vzdálená cesta: %1 @@ -1314,7 +1314,12 @@ Nedoporučuje se jí používat. ; Obnovení selhalo: - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 Soubor nebo adresář by odebrán ze sdílení pouze pro čtení, ale jeho obnovení selhalo: %1 @@ -2049,132 +2054,137 @@ Zkuste provést novou synchronizaci. Mirall::ownCloudGui - + Please sign in Přihlašte se prosím - + Disconnected from server Odpojen od serveru - + Folder %1: %2 Složka %1: %2 - + No sync folders configured. Nejsou nastaveny žádné synchronizované složky. - + + There are no sync folders configured. + + + + None. Nic. - + Recent Changes Poslední změny - + Open %1 folder Otevřít složku %1 - + Managed Folders: Spravované složky: - + Open folder '%1' Otevřít složku '%1' - + Open %1 in browser Otevřít %1 v prohlížeči - + Calculating quota... Počítám kvóty... - + Unknown status Neznámý stav - + Settings... Nastavení... - + Details... Podrobnosti... - + Help Nápověda - + Quit %1 Ukončit %1 - + Sign in... Přihlásit... - + Sign out Odhlásit - + Quota n/a Kvóta nedostupná - + %1% of %2 in use %1% z %2 v používání - + No items synced recently Žádné položky nebyly nedávno synchronizovány - + Discovering %1 Hledám %1 - + Syncing %1 of %2 (%3 left) Synchronizuji %1 ze %2 (zbývá %3) - + Syncing %1 (%2 left) Synchronizuji %1 (zbývá %2) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Aktuální diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts index 807ad76c8d..de854de7c8 100644 --- a/translations/mirall_de.ts +++ b/translations/mirall_de.ts @@ -129,54 +129,54 @@ Fortsetzen - + Confirm Folder Remove Löschen des Ordners bestätigen - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Wollen Sie wirklich die Synchronisation des Ordners <i>%1</i> beenden?</p><p><b>Anmerkung:</b> Dies wird keine Dateien von ihrem Rechner löschen.</p> - + Confirm Folder Reset Zurücksetzen des Ordners bestätigen - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Wollen Sie wirklich den Ordner <i>%1</i> zurücksetzen und die Datenbank auf dem Client neu aufbauen?</p><p><b>Anmerkung:</b> Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entfernt, jedoch kann diese Aktion erheblichen Datenverkehr verursachen und je nach Umfang des Ordners mehrere Minuten oder Stunden in Anspruch nehmen. Verwenden Sie diese Funktion nur dann, wenn ihr Administrator dies ausdrücklich wünscht.</p> - + Discovering %1 Entdecke %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) von %2 Serverkapazität in Benutzung. - + No connection to %1 at <a href="%2">%3</a>. Keine Verbindung mit %1 zu <a href="%2">%3</a>. - + No %1 connection configured. Keine %1-Verbindung konfiguriert. - + Sync Running Synchronisation läuft @@ -186,35 +186,35 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf Kein Konto konfiguriert. - + The syncing operation is running.<br/>Do you want to terminate it? Die Synchronistation läuft gerade.<br/>Wollen Sie diese beenden? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 von %4) %5 übrig bei einer Rate von %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 von %2, Datei %3 von %4 Gesamtzeit übrig %5 - + Connected to <a href="%1">%2</a>. Verbunden mit <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Verbunden mit <a href="%1">%2</a> als <i>%3</i>. - + Currently there is no storage usage information available. Derzeit sind keine Speichernutzungsinformationen verfügbar. @@ -293,73 +293,73 @@ Gesamtzeit übrig %5 %1 ist nicht lesbar. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 und %2 andere Dateien wurden gelöscht. - + %1 has been removed. %1 names a file. %1 wurde gelöscht. - + %1 and %2 other files have been downloaded. %1 names a file. %1 und %2 andere Dateien wurden heruntergeladen. - + %1 has been downloaded. %1 names a file. %1 wurde heruntergeladen. - + %1 and %2 other files have been updated. %1 und %2 andere Dateien wurden aktualisiert. - + %1 has been updated. %1 names a file. %1 wurde aktualisiert. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 wurde in %2 umbenannt und %3 andere Dateien wurden umbenannt. - + %1 has been renamed to %2. %1 and %2 name files. %1 wurde in %2 umbenannt. - + %1 has been moved to %2 and %3 other files have been moved. %1 wurde in %2 verschoben und %3 andere Dateien wurden verschoben. - + %1 has been moved to %2. %1 wurde in %2 verschoben. - + Sync Activity Synchronisierungsaktivität - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -368,17 +368,17 @@ Vielleicht wurde der Ordner neu konfiguriert, oder alle Dateien wurden händisch Sind Sie sicher, dass sie diese Operation durchführen wollen? - + Remove All Files? Alle Dateien löschen? - + Remove all files Lösche alle Dateien - + Keep files Dateien behalten @@ -396,52 +396,52 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen? Ein altes Synchronisations-Journal '%1' wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet. - + Undefined State. Undefinierter Zustand. - + Waits to start syncing. Wartet auf Beginn der Synchronistation - + Preparing for sync. Synchronisation wird vorbereitet. - + Sync is running. Synchronisation läuft. - + Last Sync was successful. Die letzte Synchronisation war erfolgreich. - + Last Sync was successful, but with warnings on individual files. Letzte Synchronisation war erfolgreich, aber mit Warnungen für einzelne Dateien. - + Setup Error. Setup-Fehler. - + User Abort. Benutzer-Abbruch - + Sync is paused. Synchronisation wurde angehalten. - + %1 (Sync is paused) %1 (Synchronisation ist pausiert) @@ -450,17 +450,17 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen? Mirall::FolderStatusDelegate - + File Datei - + Syncing all files in your account with Synchronisiere alle Dateien in Ihrem Konto mit - + Remote path: %1 Remote-Pfad: %1 @@ -1315,7 +1315,12 @@ Es ist nicht ratsam, diese zu benutzen. ; Wiederherstellung fehlgeschlagen: - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 Eine Datei oder Verzeichnis wurde von einer Nur-Lese-Freigabe wiederhergestellt, aber die Wiederherstellung ist mit folgendem Fehler fehlgeschlagen: %1 @@ -2049,132 +2054,137 @@ Versuchen Sie diese nochmals zu synchronisieren. Mirall::ownCloudGui - + Please sign in Bitte melden Sie sich an - + Disconnected from server Vom Server getrennt - + Folder %1: %2 Ordner %1: %2 - + No sync folders configured. Keine Sync-Ordner konfiguriert. - + + There are no sync folders configured. + + + + None. Keine. - + Recent Changes Letzte Änderungen - + Open %1 folder Ordner %1 öffnen - + Managed Folders: Verwaltete Ordner: - + Open folder '%1' Ordner '%1' öffnen - + Open %1 in browser %1 im Browser öffnen - + Calculating quota... Berechne Quote... - + Unknown status Unbekannter Status - + Settings... Einstellungen - + Details... Details... - + Help Hilfe - + Quit %1 %1 beenden - + Sign in... Anmeldung... - + Sign out Abmeldung - + Quota n/a Quote unbekannt - + %1% of %2 in use %1% von %2 benutzt - + No items synced recently Keine kürzlich synchronisierten Elemente - + Discovering %1 Entdecke %1 - + Syncing %1 of %2 (%3 left) Synchronisiere %1 von %2 (%3 übrig) - + Syncing %1 (%2 left) Synchronisiere %1 (%2 übrig) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Aktuell diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts index 2abfff7905..bfc941bb61 100644 --- a/translations/mirall_el.ts +++ b/translations/mirall_el.ts @@ -129,53 +129,53 @@ Συνέχεια - + Confirm Folder Remove Επιβεβαίωση Αφαίρεσης Φακέλου - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Θέλετε στ' αλήθεια να σταματήσετε το συγχρονισμό του φακέλου <i>%1</i>;</p><p><b>Σημείωση:</b> Αυτό δεν θα αφαιρέσει τα αρχεία από το δέκτη.</p> - + Confirm Folder Reset Επιβεβαίωση Επαναφοράς Φακέλου - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Θέλετε στ' αλήθεια να επαναφέρετε το φάκελο <i>%1</i> και να επαναδημιουργήσετε τη βάση δεδομένων του δέκτη;</p><p><b>Σημείωση:</b> Αυτή η λειτουργία έχει σχεδιαστεί αποκλειστικά για λόγους συντήρησης. Κανένα αρχείο δεν θα αφαιρεθεί, αλλά αυτό μπορεί να προκαλέσει σημαντική κίνηση δεδομένων και να πάρει αρκετά λεπτά ή ώρες μέχρι να ολοκληρωθεί, ανάλογα με το μέγεθος του φακέλου. Χρησιμοποιείστε αυτή την επιλογή μόνο εάν έχετε συμβουλευτεί αναλόγως από το διαχειριστή σας.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) από %2 αποθηκευτικός χώρος διακομιστή σε χρήση. - + No connection to %1 at <a href="%2">%3</a>. Δεν υπάρχει σύνδεση με %1 στο <a href="%2">%3</a>. - + No %1 connection configured. Δεν έχει ρυθμιστεί σύνδεση με το %1. - + Sync Running Εκτελείται Συγχρονισμός @@ -185,18 +185,18 @@ Δεν ρυθμίστηκε λογαριασμός. - + The syncing operation is running.<br/>Do you want to terminate it? Η λειτουργία συγχρονισμού εκτελείται.<br/> Θέλετε να την τερματίσετε; - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 από %4) %5 απομένουν με ταχύτητα %6/δευτ - + %1 of %2, file %3 of %4 Total time left %5 %1 από %2, αρχείο %3 από%4 @@ -204,17 +204,17 @@ Total time left %5 Συνολικός χρόνος που απομένει %5 - + Connected to <a href="%1">%2</a>. Συνδεδεμένοι με <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Συνδεδεμένοι με <a href="%1">%2</a> ως <i>%3</i>. - + Currently there is no storage usage information available. Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες. @@ -293,73 +293,73 @@ Total time left %5 Το %1 δεν είναι αναγνώσιμο. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. Το %1 και άλλα %2 αρχεία αφαιρέθηκαν. - + %1 has been removed. %1 names a file. Το %1 αφαιρέθηκε. - + %1 and %2 other files have been downloaded. %1 names a file. Το αρχείο %1 και άλλα %2 αρχεία έχουν ληφθεί. - + %1 has been downloaded. %1 names a file. Το %1 έχει ληφθεί. - + %1 and %2 other files have been updated. Το αρχείο %1 και %2 άλλα αρχεία έχουν ενημερωθεί. - + %1 has been updated. %1 names a file. Το %1 έχει ενημερωθεί. - + %1 has been renamed to %2 and %3 other files have been renamed. Το αρχείο %1 έχει μετονομαστεί σε %2 και άλλα %3 αρχεία έχουν μετονομαστεί. - + %1 has been renamed to %2. %1 and %2 name files. Το %1 έχει μετονομαστεί σε %2. - + %1 has been moved to %2 and %3 other files have been moved. Το αρχείο %1 έχει μετακινηθεί στο %2 και %3 άλλα αρχεία έχουν μετακινηθεί. - + %1 has been moved to %2. Το %1 έχει μετακινηθεί στο %2. - + Sync Activity Δραστηριότητα Συγχρονισμού - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -368,17 +368,17 @@ Are you sure you want to perform this operation? Είστε σίγουροι ότι θέλετε να εκτελέσετε αυτή τη λειτουργία; - + Remove All Files? Αφαίρεση Όλων των Αρχείων; - + Remove all files Αφαίρεση όλων των αρχείων - + Keep files Διατήρηση αρχείων @@ -396,52 +396,52 @@ Are you sure you want to perform this operation? Βρέθηκε ένα παλαιότερο αρχείο συγχρονισμού '%1', αλλά δεν μπόρεσε να αφαιρεθεί. Παρακαλώ βεβαιωθείτε ότι καμμία εφαρμογή δεν το χρησιμοποιεί αυτή τη στιγμή. - + Undefined State. Απροσδιόριστη Κατάσταση. - + Waits to start syncing. Αναμονή έναρξης συγχρονισμού. - + Preparing for sync. Προετοιμασία για συγχρονισμό. - + Sync is running. Ο συγχρονισμός εκτελείται. - + Last Sync was successful. Ο τελευταίος συγχρονισμός ήταν επιτυχής. - + Last Sync was successful, but with warnings on individual files. Ο τελευταίος συγχρονισμός ήταν επιτυχής, αλλά υπήρχαν προειδοποιήσεις σε συγκεκριμένα αρχεία. - + Setup Error. Σφάλμα Ρύθμισης. - + User Abort. Ματαίωση από Χρήστη. - + Sync is paused. Παύση συγχρονισμού. - + %1 (Sync is paused) %1 (Παύση συγχρονισμού) @@ -450,17 +450,17 @@ Are you sure you want to perform this operation? Mirall::FolderStatusDelegate - + File Αρχείο - + Syncing all files in your account with Συγχρονισμός όλων των αρχείων στο λογαριασμό σας με - + Remote path: %1 Απομακρυσμένη διαδρομή: %1 @@ -1315,7 +1315,12 @@ It is not advisable to use it. - Η αποκατάσταση Απέτυχε: - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 Ένα αρχείο ή ένας κατάλογος αφαιρέθηκε από ένα διαμοιρασμένο κατάλογο μόνο για ανάγνωση, αλλά η επαναφορά απέτυχε: %1 @@ -2049,132 +2054,137 @@ It is not advisable to use it. Mirall::ownCloudGui - + Please sign in Παρκαλώ συνδεθείτε - + Disconnected from server Αποσύνδεση από το διακομιστή - + Folder %1: %2 Φάκελος %1: %2 - + No sync folders configured. Δεν έχουν οριστεί φάκελοι συγχρονισμού. - + + There are no sync folders configured. + + + + None. Κανένας. - + Recent Changes Πρόσφατες Αλλαγές - + Open %1 folder Άνοιγμα %1 φακέλου - + Managed Folders: Φάκελοι υπό Διαχείριση: - + Open folder '%1' Άνοιγμα φακέλου '%1' - + Open %1 in browser Άνοιγμα %1 στον περιηγητή - + Calculating quota... Υπολογισμός μεριδίου χώρου αποθήκευσης... - + Unknown status Άγνωστη κατάσταση - + Settings... Ρυθμίσεις... - + Details... Λεπτομέρειες... - + Help Βοήθεια - + Quit %1 Κλείσιμο %1 - + Sign in... Σύνδεση... - + Sign out Αποσύνδεση - + Quota n/a Μερίδιο χώρου αποθήκευσης μ/δ - + %1% of %2 in use %1% από %2 σε χρήση - + No items synced recently Κανένα στοιχείο δεν συγχρονίστηκε πρόσφατα - + Discovering %1 - + Syncing %1 of %2 (%3 left) Συγχρονισμός %1 από %2 (%3 απομένουν) - + Syncing %1 (%2 left) Συγχρονισμός %1 (%2 απομένουν) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Ενημερωμένο diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts index 4de08f897a..0d23a5fb8c 100644 --- a/translations/mirall_en.ts +++ b/translations/mirall_en.ts @@ -131,53 +131,53 @@ - + Confirm Folder Remove - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> - + Confirm Folder Reset - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. - + Sync Running @@ -187,34 +187,34 @@ - + The syncing operation is running.<br/>Do you want to terminate it? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. @@ -293,90 +293,90 @@ Total time left %5 - + %1: %2 - + %1 and %2 other files have been removed. %1 names a file. - + %1 has been removed. %1 names a file. - + %1 and %2 other files have been downloaded. %1 names a file. - + %1 has been downloaded. %1 names a file. - + %1 and %2 other files have been updated. - + %1 has been updated. %1 names a file. - + %1 has been renamed to %2 and %3 other files have been renamed. - + %1 has been renamed to %2. %1 and %2 name files. - + %1 has been moved to %2 and %3 other files have been moved. - + %1 has been moved to %2. - + Sync Activity - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? - + Remove All Files? - + Remove all files - + Keep files @@ -394,52 +394,52 @@ Are you sure you want to perform this operation? - + Undefined State. - + Waits to start syncing. - + Preparing for sync. - + Sync is running. - + Last Sync was successful. - + Last Sync was successful, but with warnings on individual files. - + Setup Error. - + User Abort. - + Sync is paused. - + %1 (Sync is paused) @@ -448,17 +448,17 @@ Are you sure you want to perform this operation? Mirall::FolderStatusDelegate - + File - + Syncing all files in your account with - + Remote path: %1 @@ -1309,7 +1309,12 @@ It is not advisable to use it. - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 @@ -2040,132 +2045,137 @@ It is not advisable to use it. Mirall::ownCloudGui - + Please sign in - + Disconnected from server - + Folder %1: %2 - + No sync folders configured. - + + There are no sync folders configured. + + + + None. - + Recent Changes - + Open %1 folder - + Managed Folders: - + Open folder '%1' - + Open %1 in browser - + Calculating quota... - + Unknown status - + Settings... - + Details... - + Help - + Quit %1 - + Sign in... - + Sign out - + Quota n/a - + %1% of %2 in use - + No items synced recently - + Discovering %1 - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts index 51ad94661e..387a050764 100644 --- a/translations/mirall_es.ts +++ b/translations/mirall_es.ts @@ -129,53 +129,53 @@ Continuar - + Confirm Folder Remove Confirmar la eliminación de la carpeta - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Realmente desea dejar de sincronizar la carpeta <i>%1</i>?</p><p><b>Note:</b> Esto no eliminará los archivos de su cliente.</p> - + Confirm Folder Reset Confirme que desea restablecer la carpeta - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Realmente desea restablecer la carpeta <i>%1</i> y reconstruir la base de datos de cliente?</p><p><b>Nota:</b> Esta función es para mantenimiento únicamente. No se eliminarán archivos, pero se puede causar alto tráfico en la red y puede tomar varios minutos u horas para terminar, dependiendo del tamaño de la carpeta. Únicamente utilice esta opción si así lo indica su administrador.</p> - + Discovering %1 Descubriendo %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) de %2 espacio usado en el servidor. - + No connection to %1 at <a href="%2">%3</a>. No hay conexión a %1 en <a href="%2">%3</a>. - + No %1 connection configured. No hay ninguna conexión de %1 configurada. - + Sync Running Sincronización en curso @@ -185,35 +185,35 @@ No se ha configurado la cuenta. - + The syncing operation is running.<br/>Do you want to terminate it? La sincronización está en curso.<br/>¿Desea interrumpirla? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 de %4) quedan %5 a una velocidad de %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 de %2, archivo %3 de %4 Tiempo restante %5 - + Connected to <a href="%1">%2</a>. Conectado a <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Conectado a <a href="%1">%2</a> como <i>%3</i>. - + Currently there is no storage usage information available. Actualmente no hay información disponible sobre el uso de almacenamiento. @@ -292,73 +292,73 @@ Tiempo restante %5 %1 es ilegible. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 y %2 otros archivos han sido eliminados. - + %1 has been removed. %1 names a file. %1 ha sido eliminado. - + %1 and %2 other files have been downloaded. %1 names a file. %1 y %2 otros archivos han sido descargados. - + %1 has been downloaded. %1 names a file. %1 ha sido descargado. - + %1 and %2 other files have been updated. %1 y %2 otros archivos han sido actualizados. - + %1 has been updated. %1 names a file. %1 ha sido actualizado. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 ha sido renombrado a %2 y %3 otros archivos han sido renombrados. - + %1 has been renamed to %2. %1 and %2 name files. %1 ha sido renombrado a %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 ha sido movido a %2 y %3 otros archivos han sido movidos. - + %1 has been moved to %2. %1 ha sido movido a %2. - + Sync Activity Actividad en la Sincronización - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -367,17 +367,17 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q Está seguro de que desea realizar esta operación? - + Remove All Files? Eliminar todos los archivos? - + Remove all files Eliminar todos los archivos - + Keep files Conservar archivos @@ -395,52 +395,52 @@ Está seguro de que desea realizar esta operación? Un antiguo registro (journal) de sincronización '%1' se ha encontrado, pero no se ha podido eliminar. Por favor asegúrese que ninguna aplicación la está utilizando. - + Undefined State. Estado no definido. - + Waits to start syncing. Esperando el inicio de la sincronización. - + Preparing for sync. Preparándose para sincronizar. - + Sync is running. Sincronización en funcionamiento. - + Last Sync was successful. La última sincronización fue exitosa. - + Last Sync was successful, but with warnings on individual files. La última sincronización fue exitosa pero con advertencias para archivos individuales. - + Setup Error. Error de configuración. - + User Abort. Interrumpir. - + Sync is paused. La sincronización está en pausa. - + %1 (Sync is paused) %1 (Sincronización en pausa) @@ -449,17 +449,17 @@ Está seguro de que desea realizar esta operación? Mirall::FolderStatusDelegate - + File Archivo - + Syncing all files in your account with Sincronizando todos los archivos en su cuenta con - + Remote path: %1 Ruta Remota: %1 @@ -1314,7 +1314,12 @@ No se recomienda usarlo. ; Falló la restauración: - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 Un archivo o directorio fue eliminado de una carpeta compartida en modo de solo lectura, pero la recuperación falló: %1 @@ -2048,132 +2053,137 @@ Intente sincronizar los archivos nuevamente. Mirall::ownCloudGui - + Please sign in Por favor Registrese - + Disconnected from server Desconectado del servidor - + Folder %1: %2 Archivo %1: %2 - + No sync folders configured. No hay carpetas de sincronización configuradas. - + + There are no sync folders configured. + + + + None. Ninguno. - + Recent Changes Cambios recientes - + Open %1 folder Abrir carpeta %1 - + Managed Folders: Carpetas administradas: - + Open folder '%1' Abrir carpeta '%1' - + Open %1 in browser Abrir %1 en el navegador - + Calculating quota... Calculando cuota... - + Unknown status Estado desconocido - + Settings... Configuraciones... - + Details... Detalles... - + Help Ayuda - + Quit %1 Salir de %1 - + Sign in... Registrarse... - + Sign out Cerrar sesión - + Quota n/a Cuota no disponible - + %1% of %2 in use %1% de %2 en uso - + No items synced recently No se han sincronizado elementos recientemente - + Discovering %1 Descubriendo %1 - + Syncing %1 of %2 (%3 left) Sincronizando %1 de %2 (quedan %3) - + Syncing %1 (%2 left) Sincronizando %1 (quedan %2) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Actualizado diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts index 4a7a614529..1f08e5e497 100644 --- a/translations/mirall_es_AR.ts +++ b/translations/mirall_es_AR.ts @@ -129,53 +129,53 @@ Continuar - + Confirm Folder Remove Confirmá la eliminación del directorio - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>¿Realmente deseas detener la sincronización de la carpeta <i>%1</i>?</p><p><b>Nota:</b>Estp no removerá los archivos desde tu cliente.</p> - + Confirm Folder Reset Confirme el reseteo de la carpeta - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>¿Realmente deseas resetear el directorio <i>%1</i> y reconstruir la base de datos del cliente?</p><p><b>Nota:</b> Esta función está designada para propósitos de mantenimiento solamente. Ningún archivo será eliminado, pero puede causar un tráfico de datos significante y tomar varios minutos o horas para completarse, dependiendo del tamaño del directorio. Sólo use esta opción si es aconsejado por su administrador.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. No hay ninguna conexión de %1 configurada. - + Sync Running Sincronización en curso @@ -185,34 +185,34 @@ No hay cuenta configurada. - + The syncing operation is running.<br/>Do you want to terminate it? La sincronización está en curso.<br/>¿Querés interrumpirla? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. Conectado a <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Conectado a <a href="%1">%2</a> como <i>%3</i>. - + Currently there is no storage usage information available. Actualmente no hay información disponible acerca del uso del almacenamiento. @@ -291,73 +291,73 @@ Total time left %5 No se puede leer %1. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. - + %1 has been removed. %1 names a file. - + %1 and %2 other files have been downloaded. %1 names a file. - + %1 has been downloaded. %1 names a file. - + %1 and %2 other files have been updated. - + %1 has been updated. %1 names a file. - + %1 has been renamed to %2 and %3 other files have been renamed. - + %1 has been renamed to %2. %1 and %2 name files. - + %1 has been moved to %2 and %3 other files have been moved. - + %1 has been moved to %2. - + Sync Activity Actividad de Sync - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -366,17 +366,17 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o ¿Estás seguro de que querés realizar esta operación? - + Remove All Files? ¿Borrar todos los archivos? - + Remove all files Borrar todos los archivos - + Keep files Conservar archivos @@ -394,52 +394,52 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o Una antigua sincronización con journaling '%1' fue encontrada, pero no se pudo eliminar. Por favor, asegurate que ninguna aplicación la está utilizando. - + Undefined State. Estado no definido. - + Waits to start syncing. Esperando el comienzo de la sincronización. - + Preparing for sync. Preparando la sincronización. - + Sync is running. Sincronización en funcionamiento. - + Last Sync was successful. La última sincronización fue exitosa. - + Last Sync was successful, but with warnings on individual files. El último Sync fue exitoso, pero hubo advertencias en archivos individuales. - + Setup Error. Error de configuración. - + User Abort. Interrumpir. - + Sync is paused. La sincronización está en pausa. - + %1 (Sync is paused) %1 (Sincronización en pausa) @@ -448,17 +448,17 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o Mirall::FolderStatusDelegate - + File Archivo - + Syncing all files in your account with Sincronizando todos los archivos en tu cuenta con - + Remote path: %1 Ruta Remota: %1 @@ -1311,7 +1311,12 @@ It is not advisable to use it. - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 @@ -2043,132 +2048,137 @@ Intente sincronizar estos nuevamente. Mirall::ownCloudGui - + Please sign in Por favor, inicie sesión - + Disconnected from server - + Folder %1: %2 Directorio %1: %2 - + No sync folders configured. Los directorios de sincronización no están configurados. - + + There are no sync folders configured. + + + + None. Ninguno. - + Recent Changes Cambios recientes - + Open %1 folder Abrir directorio %1 - + Managed Folders: Directorios administrados: - + Open folder '%1' Abrir carpeta '%1' - + Open %1 in browser Abrir %1 en el navegador... - + Calculating quota... Calculando cuota... - + Unknown status Estado desconocido - + Settings... Configuraciones... - + Details... Detalles... - + Help Ayuda - + Quit %1 Cancelar %1 - + Sign in... Iniciando sesión... - + Sign out Salir - + Quota n/a Cuota no disponible - + %1% of %2 in use %1% de %2 en uso - + No items synced recently No se sincronizaron elementos recientemente - + Discovering %1 - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) %1 (%2, %3) - + Up to date actualizado diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts index 51c69cab6e..00517c5bb6 100644 --- a/translations/mirall_et.ts +++ b/translations/mirall_et.ts @@ -129,53 +129,53 @@ Taasta - + Confirm Folder Remove Kinnita kausta eemaldamist - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Kas tõesti soovid peatada kataloogi <i>%1</i> sünkroniseerimist?.</p><p><b>Märkus:</b> See ei eemalda faile sinu kliendist.</p> - + Confirm Folder Reset Kinnita kataloogi algseadistus - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Kas tõesti soovid kataloogi <i>%1</i> algseadistada ning uuesti luua oma kliendi andmebaasi?</p><p><b>See funktsioon on mõeldud peamiselt ainult hooldustöödeks. Märkus:</b>Kuigi ühtegi faili ei eemaldata, siis see võib põhjustada märkimisväärset andmeliiklust ja võtta mitu minutit või tundi, sõltuvalt kataloogi suurusest. Kasuta seda võimalust ainult siis kui seda soovitab süsteemihaldur.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) %2-st serveri mahust on kasutuses. - + No connection to %1 at <a href="%2">%3</a>. Ühendus puudub %1 <a href="%2">%3</a>. - + No %1 connection configured. Ühtegi %1 ühendust pole seadistatud. - + Sync Running Sünkroniseerimine on käimas @@ -185,35 +185,35 @@ Ühtegi kontot pole seadistatud - + The syncing operation is running.<br/>Do you want to terminate it? Sünkroniseerimine on käimas.<br/>Kas sa soovid seda lõpetada? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 of %4) %5 jäänud kiirusel %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 of %2, fail %3 of %4 Aega kokku jäänud %5 - + Connected to <a href="%1">%2</a>. Ühendatud <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Ühendatud <a href="%1">%2</a> kui <i>%3</i>. - + Currently there is no storage usage information available. Hetkel pole mahu kasutuse info saadaval. @@ -292,73 +292,73 @@ Aega kokku jäänud %5 %1 pole loetav. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 ja %2 teist faili eemaldati. - + %1 has been removed. %1 names a file. %1 on eemaldatud. - + %1 and %2 other files have been downloaded. %1 names a file. %1 ja %2 teist faili on alla laaditud. - + %1 has been downloaded. %1 names a file. %1 on alla laaditud. - + %1 and %2 other files have been updated. %1 ja %2 teist faili on uuendatud. - + %1 has been updated. %1 names a file. %1 on uuendatud. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 on ümber nimetatud %2 ja %3 muud faili on samuti ümber nimetatud - + %1 has been renamed to %2. %1 and %2 name files. %1 on ümber nimetatud %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 on tõstetud %2 ning %3 muud faili on samuti liigutatud. - + %1 has been moved to %2. %1 on tõstetud %2. - + Sync Activity Sünkroniseerimise tegevus - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -367,17 +367,17 @@ See võib olla põhjustatud kataloogi ümberseadistusest või on toimunud kõiki Oled kindel, et soovid seda operatsiooni teostada? - + Remove All Files? Kustutada kõik failid? - + Remove all files Kustutada kõik failid - + Keep files Säilita failid @@ -395,52 +395,52 @@ Oled kindel, et soovid seda operatsiooni teostada? Leiti vana sünkroniseeringu zurnaal '%1', kuid selle eemaldamine ebaõnnenstus. Palun veendu, et seda kasutaks ükski programm. - + Undefined State. Määramata staatus. - + Waits to start syncing. Ootab sünkroniseerimise alustamist. - + Preparing for sync. Valmistun sünkroniseerima. - + Sync is running. Sünkroniseerimine on käimas. - + Last Sync was successful. Viimane sünkroniseerimine oli edukas. - + Last Sync was successful, but with warnings on individual files. Viimane sünkroniseering oli edukas, kuid mõned failid põhjustasid tõrkeid. - + Setup Error. Seadistamise viga. - + User Abort. Kasutaja tühistamine. - + Sync is paused. Sünkroniseerimine on peatatud. - + %1 (Sync is paused) %1 (Sünkroniseerimine on peatatud) @@ -449,17 +449,17 @@ Oled kindel, et soovid seda operatsiooni teostada? Mirall::FolderStatusDelegate - + File Fail - + Syncing all files in your account with Sünkroniseeritakse sinu konto kõik failid - + Remote path: %1 Eemalda asukoht: %1 @@ -1314,7 +1314,12 @@ Selle kasutamine pole soovitatav. ; Taastamine ebaõnnestus: - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 Fail või kataloog oli eemaldatud kirjutamisõiguseta jagamisest, kuid taastamine ebaõnnestus: %1 @@ -2048,132 +2053,137 @@ Proovi neid uuesti sünkroniseerida. Mirall::ownCloudGui - + Please sign in Palun logi sisse - + Disconnected from server Serverist lahtiühendatud - + Folder %1: %2 Kaust %1: %2 - + No sync folders configured. Sünkroniseeritavaid kaustasid pole seadistatud. - + + There are no sync folders configured. + + + + None. Pole. - + Recent Changes Hiljutised muudatused - + Open %1 folder Ava kaust %1 - + Managed Folders: Hallatavad kaustad: - + Open folder '%1' Ava kaust '%1' - + Open %1 in browser Ava %1 veebilehitsejas - + Calculating quota... Mahupiiri arvutamine... - + Unknown status Tundmatu staatus - + Settings... Seaded... - + Details... Üksikasjad... - + Help Abiinfo - + Quit %1 Lõpeta %1 - + Sign in... Logi sisse... - + Sign out Logi välja - + Quota n/a Mahupiir n/a - + %1% of %2 in use Kasutusel %1% / %2 - + No items synced recently Ühtegi üksust pole hiljuti sünkroniseeritud - + Discovering %1 - + Syncing %1 of %2 (%3 left) Sünkroniseerin %1 %2-st (%3 veel) - + Syncing %1 (%2 left) Sünkroniseerin %1 (%2 veel) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Ajakohane diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts index cc61b9cdce..5a09c92c03 100644 --- a/translations/mirall_eu.ts +++ b/translations/mirall_eu.ts @@ -129,53 +129,53 @@ Berrekin - + Confirm Folder Remove Baieztatu karpetaren ezabatzea - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Bentan nahi duzu karpetaren sinkronizazioa gelditu? <i>%1</i>?</p><p><b>Oharra:</b>Honek ez du fitxategiak zure bezerotik ezabatuko.</p> - + Confirm Folder Reset Baieztatu Karpetaren Leheneratzea - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Benetan nahi duzu <i>%1</i> karpeta leheneratu eta zure bezeroaren datu basea berreraiki?</p><p><b>Oharra:</p> Funtzio hau mantenurako bakarrik diseinauta izan da. Ez da fitxategirik ezabatuko, baina honek datu trafiko handia sor dezake eta minutu edo ordu batzuk behar izango ditu burutzeko, karpetaren tamainaren arabera. Erabili aukera hau bakarrik zure kudeatzaileak esanez gero.</p> - + Discovering %1 Aurkitzen %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) tik %2 zerbitzariko lekua erabilia - + No connection to %1 at <a href="%2">%3</a>. Ez dago %1-ra konexiorik hemendik <a href="%2">%3</a>. - + No %1 connection configured. Ez dago %1 konexiorik konfiguratuta. - + Sync Running Sinkronizazioa martxan da @@ -185,35 +185,35 @@ Ez da konturik konfiguratu. - + The syncing operation is running.<br/>Do you want to terminate it? Sinkronizazio martxan da.<br/>Bukatu nahi al duzu? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 %2-tik %1, %4-tik %3 fitxategi Geratzen den denbora %5 - + Connected to <a href="%1">%2</a>. <a href="%1">%2</a>ra konektatuta. - + Connected to <a href="%1">%2</a> as <i>%3</i>. <a href="%1">%2</a>ra konektatuta <i>%3</i> erabiltzailearekin. - + Currently there is no storage usage information available. Orain ez dago eskuragarri biltegiratze erabileraren informazioa. @@ -292,73 +292,73 @@ Geratzen den denbora %5 %1 ezin da irakurri. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 eta beste %2 fitxategi ezabatu dira. - + %1 has been removed. %1 names a file. %1 ezabatua izan da. - + %1 and %2 other files have been downloaded. %1 names a file. %1 eta beste %2 fitxategi deskargatu dira. - + %1 has been downloaded. %1 names a file. %1 deskargatu da. - + %1 and %2 other files have been updated. %1 eta beste %2 fitxategi kargatu dira. - + %1 has been updated. %1 names a file. %1 kargatu da. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 %2-(e)ra berrizendatu da eta beste %3 fitxategi berrizendatu dira. - + %1 has been renamed to %2. %1 and %2 name files. %1 %2-(e)ra berrizendatu da. - + %1 has been moved to %2 and %3 other files have been moved. %1 %2-(e)ra berrizendatu da eta beste %3 fitxategi mugitu dira. - + %1 has been moved to %2. %1 %2-(e)ra mugitu da. - + Sync Activity Sinkronizazio Jarduerak - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -367,17 +367,17 @@ Izan daiteke karpeta isilpean birkonfiguratu delako edo fitxategi guztiak eskuz Ziur zaude eragiketa hau egin nahi duzula? - + Remove All Files? Ezabatu Fitxategi Guztiak? - + Remove all files Ezabatu fitxategi guztiak - + Keep files Mantendu fitxategiak @@ -395,52 +395,52 @@ Ziur zaude eragiketa hau egin nahi duzula? Aurkitu da '%1' sinkronizazio erregistro zaharra, baina ezin da ezabatu. Ziurtatu aplikaziorik ez dela erabiltzen ari. - + Undefined State. Definitu gabeko egoera. - + Waits to start syncing. Itxoiten sinkronizazioa hasteko. - + Preparing for sync. Sinkronizazioa prestatzen. - + Sync is running. Sinkronizazioa martxan da. - + Last Sync was successful. Azkeneko sinkronizazioa ongi burutu zen. - + Last Sync was successful, but with warnings on individual files. Azkenengo sinkronizazioa ongi burutu zen, baina banakako fitxategi batzuetan abisuak egon dira. - + Setup Error. Konfigurazio errorea. - + User Abort. Erabiltzaileak bertan behera utzi. - + Sync is paused. Sinkronizazioa pausatuta dago. - + %1 (Sync is paused) %1 (Sinkronizazioa pausatuta dago) @@ -449,17 +449,17 @@ Ziur zaude eragiketa hau egin nahi duzula? Mirall::FolderStatusDelegate - + File Fitxategia - + Syncing all files in your account with Fitxategi guztiak sinkronizatzen zure kontuan honekin - + Remote path: %1 Urruneko bidea: %1 @@ -1314,7 +1314,12 @@ Ez da gomendagarria erabltzea. ; huth egin du berreskuratzen: - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 @@ -2046,132 +2051,137 @@ Saiatu horiek berriz sinkronizatzen. Mirall::ownCloudGui - + Please sign in Mesedez saioa hasi - + Disconnected from server - + Folder %1: %2 - + No sync folders configured. Ez dago sinkronizazio karpetarik definituta. - + + There are no sync folders configured. + + + + None. Bat ere ez. - + Recent Changes Azkenengo Aldaketak - + Open %1 folder Ireki %1 karpeta - + Managed Folders: Kudeatutako karpetak: - + Open folder '%1' Ireki '%1' karpeta - + Open %1 in browser Ireki %1 arakatzailean - + Calculating quota... - + Unknown status Egoera ezezaguna - + Settings... Ezarpenak... - + Details... Xehetasunak... - + Help Laguntza - + Quit %1 %1etik Irten - + Sign in... Saioa hasi... - + Sign out Saioa bukatu - + Quota n/a - + %1% of %2 in use %2tik %%1 erabilita - + No items synced recently Ez da azken aldian ezer sinkronizatu - + Discovering %1 Aurkitzen %1 - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Eguneratua diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts index ed212a6b8b..ad24b9612b 100644 --- a/translations/mirall_fa.ts +++ b/translations/mirall_fa.ts @@ -129,53 +129,53 @@ از سر گیری - + Confirm Folder Remove قبول کردن پاک شدن پوشه - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> - + Confirm Folder Reset - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. - + Sync Running همگام سازی در حال اجراست @@ -185,34 +185,34 @@ - + The syncing operation is running.<br/>Do you want to terminate it? عملیات همگام سازی در حال اجراست.<br/>آیا دوست دارید آن را متوقف کنید؟ - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. @@ -291,90 +291,90 @@ Total time left %5 %1 قابل خواندن نیست. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. - + %1 has been removed. %1 names a file. %1 حذف شده است. - + %1 and %2 other files have been downloaded. %1 names a file. - + %1 has been downloaded. %1 names a file. %1 بارگزاری شد. - + %1 and %2 other files have been updated. - + %1 has been updated. %1 names a file. - + %1 has been renamed to %2 and %3 other files have been renamed. - + %1 has been renamed to %2. %1 and %2 name files. - + %1 has been moved to %2 and %3 other files have been moved. - + %1 has been moved to %2. - + Sync Activity فعالیت همگام سازی - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? - + Remove All Files? - + Remove all files - + Keep files نگه داشتن فایل ها @@ -392,52 +392,52 @@ Are you sure you want to perform this operation? - + Undefined State. موقعیت تعریف نشده - + Waits to start syncing. صبر کنید تا همگام سازی آغاز شود - + Preparing for sync. - + Sync is running. همگام سازی در حال اجراست - + Last Sync was successful. آخرین همگام سازی موفقیت آمیز بود - + Last Sync was successful, but with warnings on individual files. - + Setup Error. خطا در پیکر بندی. - + User Abort. خارج کردن کاربر. - + Sync is paused. همگام سازی فعلا متوقف شده است - + %1 (Sync is paused) @@ -446,17 +446,17 @@ Are you sure you want to perform this operation? Mirall::FolderStatusDelegate - + File فایل - + Syncing all files in your account with - + Remote path: %1 @@ -1307,7 +1307,12 @@ It is not advisable to use it. - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 @@ -2038,132 +2043,137 @@ It is not advisable to use it. Mirall::ownCloudGui - + Please sign in - + Disconnected from server - + Folder %1: %2 پوشه %1: %2 - + No sync folders configured. هیچ پوشه ای همگام سازی شده‌ای تنظیم نشده است - + + There are no sync folders configured. + + + + None. - + Recent Changes - + Open %1 folder بازکردن %1 پوشه - + Managed Folders: پوشه های مدیریت شده: - + Open folder '%1' - + Open %1 in browser - + Calculating quota... - + Unknown status - + Settings... - + Details... - + Help راه‌نما - + Quit %1 - + Sign in... - + Sign out - + Quota n/a - + %1% of %2 in use - + No items synced recently - + Discovering %1 - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date تا تاریخ diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts index 9f17dfbb44..92d5e3b077 100644 --- a/translations/mirall_fi.ts +++ b/translations/mirall_fi.ts @@ -129,53 +129,53 @@ Jatka - + Confirm Folder Remove Vahvista kansion poisto - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Haluatko varmasti lopettaa kansion <i>%i</i> synkronoinnin?</p><p><b>Huomio:</b> Tämä valinta ei poista tiedostoja asiakkaalta.</p> - + Confirm Folder Reset Vahvista kansion alustus - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) / %2 palvelimen tilasta käytössä. - + No connection to %1 at <a href="%2">%3</a>. Ei yhteyttä %1iin osoitteessa <a href="%2">%3</a>. - + No %1 connection configured. %1-yhteyttä ei ole määritelty. - + Sync Running Synkronointi meneillään @@ -185,35 +185,35 @@ Tiliä ei ole määritelty. - + The syncing operation is running.<br/>Do you want to terminate it? Synkronointioperaatio on meneillään.<br/>Haluatko keskeyttää sen? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3/%4) %5 jäljellä nopeudella %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1/%2, tiedosto %3/%4 Aikaa jäljellä yhteensä %5 - + Connected to <a href="%1">%2</a>. Muodosta yhteys - <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Yhdistetty kohteeseen <a href="%1">%2</a> käyttäjänä <i>%3</i>. - + Currently there is no storage usage information available. Tallennustilan käyttötietoja ei ole juuri nyt saatavilla. @@ -292,90 +292,90 @@ Aikaa jäljellä yhteensä %5 %1 ei ole luettavissa. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 ja %2 muuta tiedostoa on poistettu. - + %1 has been removed. %1 names a file. %1 on poistettu. - + %1 and %2 other files have been downloaded. %1 names a file. %1 ja %2 muuta tiedostoa on ladattu. - + %1 has been downloaded. %1 names a file. %1 on ladattu. - + %1 and %2 other files have been updated. %1 ja %2 muuta tiedostoa on päivitetty. - + %1 has been updated. %1 names a file. %1 on päivitetty. - + %1 has been renamed to %2 and %3 other files have been renamed. - + %1 has been renamed to %2. %1 and %2 name files. %1 on nimetty uudeelleen muotoon %2. - + %1 has been moved to %2 and %3 other files have been moved. - + %1 has been moved to %2. %1 on siirretty kohteeseen %2. - + Sync Activity Synkronointiaktiviteetti - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? - + Remove All Files? Poistetaanko kaikki tiedostot? - + Remove all files Poista kaikki tiedostot - + Keep files Säilytä tiedostot @@ -393,52 +393,52 @@ Are you sure you want to perform this operation? - + Undefined State. Määrittelemätön tila. - + Waits to start syncing. Odottaa synkronoinnin alkamista. - + Preparing for sync. Valmistellaan synkronointia. - + Sync is running. Synkronointi on meneillään. - + Last Sync was successful. Viimeisin synkronointi suoritettiin onnistuneesti. - + Last Sync was successful, but with warnings on individual files. Viimeisin synkronointi onnistui, mutta yksittäisten tiedostojen kanssa ilmeni varoituksia. - + Setup Error. Asetusvirhe. - + User Abort. - + Sync is paused. Synkronointi on keskeytetty. - + %1 (Sync is paused) %1 (Synkronointi on keskeytetty) @@ -447,17 +447,17 @@ Are you sure you want to perform this operation? Mirall::FolderStatusDelegate - + File Tiedosto - + Syncing all files in your account with - + Remote path: %1 Etäpolku: %1 @@ -1310,7 +1310,12 @@ Osoitteen käyttäminen ei ole suositeltavaa. - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 @@ -2043,132 +2048,137 @@ Osoitteen käyttäminen ei ole suositeltavaa. Mirall::ownCloudGui - + Please sign in Kirjaudu sisään - + Disconnected from server Yhteys palvelimeen katkaistu - + Folder %1: %2 Kansio %1: %2 - + No sync folders configured. Synkronointikansioita ei ole määritetty. - + + There are no sync folders configured. + + + + None. - + Recent Changes Viimeisimmät muutokset - + Open %1 folder Avaa %1-kansio - + Managed Folders: Hallitut kansiot: - + Open folder '%1' Avaa kansio '%1' - + Open %1 in browser Avaa %1 selaimeen - + Calculating quota... Lasketaan kiintiötä... - + Unknown status Tuntematon tila - + Settings... Asetukset... - + Details... Tiedot... - + Help Ohje - + Quit %1 Lopeta %1 - + Sign in... Kirjaudu sisään... - + Sign out Kirjaudu ulos - + Quota n/a - + %1% of %2 in use %1%/%2 käytössä - + No items synced recently Kohteita ei ole synkronoitu äskettäin - + Discovering %1 - + Syncing %1 of %2 (%3 left) Synkronoidaan %1/%2 (%3 jäljellä) - + Syncing %1 (%2 left) Synkronoidaan %1 (%2 jäljellä) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Ajan tasalla diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts index 06e18fc825..be6d84d134 100644 --- a/translations/mirall_fr.ts +++ b/translations/mirall_fr.ts @@ -129,53 +129,53 @@ Reprendre - + Confirm Folder Remove Confirmer le retrait du dossier - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Voulez-vous réellement arrêter la synchronisation du dossier <i>%1</i> ?</p><p><b>Note : </b> Cela ne supprimera pas les fichiers sur votre client.</p> - + Confirm Folder Reset Confirmation de la réinitialisation du dossier - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Voulez-vous réellement réinitialiser le dossier <i>%1</i> et reconstruire votre base de données cliente ?</p><p><b>Note :</b> Cette fonctionnalité existe pour des besoins de maintenance uniquement. Aucun fichier ne sera supprimé, mais cela peut causer un trafic de données conséquent et peut durer de plusieurs minutes à plusieurs heures, en fonction de la taille du dossier. Utilisez cette option uniquement sur avis de votre administrateur.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) de %2 d'espace utilisé sur le serveur. - + No connection to %1 at <a href="%2">%3</a>. Aucune connexion à %1 à <a href="%2">%3</a>. - + No %1 connection configured. Aucune connexion à %1 configurée - + Sync Running Synchronisation en cours @@ -185,35 +185,35 @@ Aucun compte configuré. - + The syncing operation is running.<br/>Do you want to terminate it? La synchronisation est en cours.<br/>Voulez-vous y mettre un terme? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 de %4) %5 restant à un débit de %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 de %2, fichier %3 de %4 Temps restant total %5 - + Connected to <a href="%1">%2</a>. Connecté à <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Connecté à <a href="%1">%2</a> en tant que <i>%3</i>. - + Currently there is no storage usage information available. Actuellement aucune information d'utilisation de stockage n'est disponible. @@ -292,73 +292,73 @@ Temps restant total %5 %1 ne peut pas être lu. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 et %2 autres fichiers ont été supprimés. - + %1 has been removed. %1 names a file. %1 a été supprimé. - + %1 and %2 other files have been downloaded. %1 names a file. %1 et %2 autres fichiers ont été téléchargés. - + %1 has been downloaded. %1 names a file. %1 a été téléchargé. - + %1 and %2 other files have been updated. %1 et %2 autres fichiers ont été mis à jour. - + %1 has been updated. %1 names a file. %1 a été mis à jour. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 a été renommé en %2 et %3 autres fichiers ont été renommés. - + %1 has been renamed to %2. %1 and %2 name files. %1 a été renommé en %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 a été déplacé vers %2 et %3 autres fichiers ont été déplacés. - + %1 has been moved to %2. %1 a été déplacé vers %2. - + Sync Activity Activité de synchronisation - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -367,17 +367,17 @@ Cela est peut-être du à une reconfiguration silencieuse du dossier, ou parce q Voulez-vous réellement effectuer cette opération ? - + Remove All Files? Supprimer tous les fichiers ? - + Remove all files Supprimer tous les fichiers - + Keep files Garder les fichiers @@ -395,52 +395,52 @@ Voulez-vous réellement effectuer cette opération ? Une synchronisation antérieure du journal de %1 a été trouvée, mais ne peut être supprimée. Veuillez vous assurer qu’aucune application n'est utilisée en ce moment. - + Undefined State. Statut indéfini. - + Waits to start syncing. En attente de synchronisation. - + Preparing for sync. Préparation de la synchronisation. - + Sync is running. La synchronisation est en cours. - + Last Sync was successful. Dernière synchronisation effectuée avec succès - + Last Sync was successful, but with warnings on individual files. La dernière synchronisation s'est achevée avec succès mais avec des messages d'avertissement sur des fichiers individuels. - + Setup Error. Erreur d'installation. - + User Abort. Abandon par l'utilisateur. - + Sync is paused. La synchronisation est en pause. - + %1 (Sync is paused) %1 (Synchronisation en pause) @@ -449,17 +449,17 @@ Voulez-vous réellement effectuer cette opération ? Mirall::FolderStatusDelegate - + File Fichier - + Syncing all files in your account with Synchroniser tous les fichiers sur votre compte avec - + Remote path: %1 Chemin distant: %1 @@ -1314,7 +1314,12 @@ Il est déconseillé de l'utiliser. ; Échec de la restauration : - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 Un fichier ou un dossier a été supprimé du partage en lecture seule, mais la restauration à échoué : %1 @@ -2048,132 +2053,137 @@ Il est déconseillé de l'utiliser. Mirall::ownCloudGui - + Please sign in Veuillez vous connecter - + Disconnected from server Déconnecte du serveur - + Folder %1: %2 Dossier %1 : %2 - + No sync folders configured. Aucun répertoire synchronisé n'est configuré. - + + There are no sync folders configured. + + + + None. Aucun. - + Recent Changes Modifications récentes - + Open %1 folder Ouvrir le répertoire %1 - + Managed Folders: Répertoires suivis : - + Open folder '%1' Ouvrir le dossier '%1' - + Open %1 in browser Ouvrir %1 dans le navigateur - + Calculating quota... Calcul du quota... - + Unknown status Statut inconnu - + Settings... Paramètres... - + Details... Détails... - + Help Aide - + Quit %1 Quitter %1 - + Sign in... Se connecter... - + Sign out Se déconnecter - + Quota n/a Quota n/a - + %1% of %2 in use %1% de %2 occupés - + No items synced recently Aucun item synchronisé récemment - + Discovering %1 - + Syncing %1 of %2 (%3 left) Synchronisation %1 de %2 (%3 restant) - + Syncing %1 (%2 left) Synchronisation %1 (%2 restant) - + %1 (%2, %3) %1 (%2, %3) - + Up to date À jour diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts index bf9c27c866..f73e8f48c5 100644 --- a/translations/mirall_gl.ts +++ b/translations/mirall_gl.ts @@ -129,53 +129,53 @@ Continuar - + Confirm Folder Remove Confirmar a eliminación do cartafol - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Confirma que quere deter a sincronización do cartafol <i>%1</i>?</p><p><b>Nota:</b> Isto non retirará os ficheiros no seu cliente.</p> - + Confirm Folder Reset Confirmar o restabelecemento do cartafol - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Confirma que quere restabelecer o cartafol <i>%1</i> e reconstruír as súa base datos no cliente?</p><p><b>Nota:</b> Esta función está deseñada só para fins de mantemento. Non se retirará ningún ficheiro, porén, isto pode xerar un tráfico de datos significativo e levarlle varios minutos ou horas en completarse, dependendo do tamaño do cartafol. Utilice esta opción só se o aconsella o administrador.</p> - + Discovering %1 Atopando %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. Espazo usado do servidor %1 (%3%) de %2. - + No connection to %1 at <a href="%2">%3</a>. Sen conexión con %1 en <a href="%2">%3</a>. - + No %1 connection configured. Non se configurou a conexión %1. - + Sync Running Sincronización en proceso @@ -185,35 +185,35 @@ Non hai contas configuradas. - + The syncing operation is running.<br/>Do you want to terminate it? Estase realizando a sincronización.<br/>Quere interrompela e rematala? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 de %4) restan %5 a unha taxa de %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 de %2, ficheiro %3 of %4 Tempo total restante %5 - + Connected to <a href="%1">%2</a>. Conectado a <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Conectado a <a href="%1">%2</a> como <i>%3</i>. - + Currently there is no storage usage information available. Actualmente non hai dispoñíbel ningunha información sobre o uso do almacenamento. @@ -292,73 +292,73 @@ Tempo total restante %5 %1 non é lexíbel. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. O ficheiro %1 e outros %2 foron retirados satisfactoriamente. - + %1 has been removed. %1 names a file. %1 foi retirado satisfactoriamente. - + %1 and %2 other files have been downloaded. %1 names a file. O ficheiro %1 e outros %2 foron descargados satisfactoriamente. - + %1 has been downloaded. %1 names a file. %1 foi descargado satisfactoriamente. - + %1 and %2 other files have been updated. O ficheiro %1 e outros %2 foron enviados satisfactoriamente. - + %1 has been updated. %1 names a file. %1 foi enviado satisfactoriamente. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 foi renomeado satisfactoriamente a %2 e outros %3 tamén foron renomeados satisfactoriamente. - + %1 has been renamed to %2. %1 and %2 name files. %1 foi renomeado satisfactoriamente a %2 - + %1 has been moved to %2 and %3 other files have been moved. %1 foi movido satisfactoriamente a %2 e outros %3 tamén foron movidos satisfactoriamente. - + %1 has been moved to %2. %1 foi movido satisfactoriamente a %2 - + Sync Activity Actividade de sincronización - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -367,17 +367,17 @@ Isto podería ser debido a que o cartafol foi reconfigurado en silencio, ou a qu Confirma que quere realizar esta operación? - + Remove All Files? Retirar todos os ficheiros? - + Remove all files Retirar todos os ficheiros - + Keep files Manter os ficheiros @@ -395,52 +395,52 @@ Confirma que quere realizar esta operación? Atopouse un rexistro de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningunha aplicación. - + Undefined State. Estado sen definir. - + Waits to start syncing. Agardando polo comezo da sincronización. - + Preparing for sync. Preparando para sincronizar. - + Sync is running. Estase sincronizando. - + Last Sync was successful. A última sincronización fíxose correctamente. - + Last Sync was successful, but with warnings on individual files. A última sincronización fíxose correctamente, mais con algún aviso en ficheiros individuais. - + Setup Error. Erro de configuración. - + User Abort. Interrompido polo usuario. - + Sync is paused. Sincronización en pausa. - + %1 (Sync is paused) %1 (sincronización en pausa) @@ -449,17 +449,17 @@ Confirma que quere realizar esta operación? Mirall::FolderStatusDelegate - + File Ficheiro - + Syncing all files in your account with Sincronizando todos os ficheiros na súa conta con - + Remote path: %1 Ruta remota: %1 @@ -1314,7 +1314,12 @@ Recomendámoslle que non o use. ; Fallou a restauración: - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 Foi retirado un ficheiro ou directorio desde unha compartición de só lectura, mais non foi posíbel a súa restauración: %1 @@ -2048,132 +2053,137 @@ Tente sincronizalos de novo. Mirall::ownCloudGui - + Please sign in Ten que rexistrarse - + Disconnected from server Desconectado do servidor - + Folder %1: %2 Cartafol %1: %2 - + No sync folders configured. Non se configuraron cartafoles de sincronización. - + + There are no sync folders configured. + + + + None. Nada. - + Recent Changes Cambios recentes - + Open %1 folder Abrir o cartafol %1 - + Managed Folders: Cartafoles xestionados: - + Open folder '%1' Abrir o cartafol «%1» - + Open %1 in browser Abrir %1 nun navegador - + Calculating quota... Calculando a cota... - + Unknown status Estado descoñecido - + Settings... Axustes... - + Details... Detalles... - + Help Axuda - + Quit %1 Saír de %1 - + Sign in... Rexistrarse... - + Sign out Saír - + Quota n/a Cota n/d - + %1% of %2 in use Usado %1% de %2 - + No items synced recently Non hai elementos sincronizados recentemente - + Discovering %1 Atopando %1 - + Syncing %1 of %2 (%3 left) Sincronizando %1 of %2 (restan %3) - + Syncing %1 (%2 left) Sincronizando %1 (restan %2) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Actualizado diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts index bdeeb6b6f0..054f5d9222 100644 --- a/translations/mirall_hu.ts +++ b/translations/mirall_hu.ts @@ -129,53 +129,53 @@ Folytatás - + Confirm Folder Remove Könyvtár törlésének megerősítése - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> - + Confirm Folder Reset - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. - + Sync Running Szinkronizálás fut @@ -185,34 +185,34 @@ Nincs beállított kapcsolat. - + The syncing operation is running.<br/>Do you want to terminate it? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. @@ -291,90 +291,90 @@ Total time left %5 %1 nem olvasható. - + %1: %2 - + %1 and %2 other files have been removed. %1 names a file. - + %1 has been removed. %1 names a file. - + %1 and %2 other files have been downloaded. %1 names a file. - + %1 has been downloaded. %1 names a file. - + %1 and %2 other files have been updated. - + %1 has been updated. %1 names a file. - + %1 has been renamed to %2 and %3 other files have been renamed. - + %1 has been renamed to %2. %1 and %2 name files. - + %1 has been moved to %2 and %3 other files have been moved. - + %1 has been moved to %2. - + Sync Activity - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? - + Remove All Files? El legyen távolítva az összes fájl? - + Remove all files Összes fájl eltávolítása - + Keep files Fájlok megtartása @@ -392,52 +392,52 @@ Are you sure you want to perform this operation? - + Undefined State. Ismeretlen állapot. - + Waits to start syncing. Várakozás a szinkronizálás elindítására. - + Preparing for sync. Előkészítés szinkronizációhoz. - + Sync is running. Szinkronizálás fut. - + Last Sync was successful. Legutolsó szinkronizálás sikeres volt. - + Last Sync was successful, but with warnings on individual files. - + Setup Error. Beállítás hiba. - + User Abort. - + Sync is paused. Szinkronizálás megállítva. - + %1 (Sync is paused) @@ -446,17 +446,17 @@ Are you sure you want to perform this operation? Mirall::FolderStatusDelegate - + File Fájl - + Syncing all files in your account with - + Remote path: %1 Távoli elérési út: %1 @@ -1307,7 +1307,12 @@ It is not advisable to use it. - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 @@ -2038,132 +2043,137 @@ It is not advisable to use it. Mirall::ownCloudGui - + Please sign in Belépés szükséges - + Disconnected from server - + Folder %1: %2 Mappa %1: %2 - + No sync folders configured. Nincsenek megadva szinkronizálandó mappák. - + + There are no sync folders configured. + + + + None. Nincs - + Recent Changes Legutóbbi változások - + Open %1 folder %1 mappa megnyitása - + Managed Folders: Kezelt mappák: - + Open folder '%1' - + Open %1 in browser - + Calculating quota... Kvóta kiszámítása... - + Unknown status Ismeretlen állapot - + Settings... Beállítások... - + Details... Részletek... - + Help Súgó - + Quit %1 - + Sign in... Belépés... - + Sign out Kilépés - + Quota n/a Kvóta n/a - + %1% of %2 in use - + No items synced recently - + Discovering %1 - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date Frissítve diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts index 8f85e872fa..7ed9689060 100644 --- a/translations/mirall_it.ts +++ b/translations/mirall_it.ts @@ -129,53 +129,53 @@ Riprendi - + Confirm Folder Remove Conferma la rimozione della cartella - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Vuoi davvero fermare la sincronizzazione della cartella <i>%1</i>?</p><p><b>Nota:</b> ciò non rimuoverà i file dal tuo client.</p> - + Confirm Folder Reset Conferma il ripristino della cartella - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Vuoi davvero ripristinare la cartella <i>%1</i> e ricostruire il database del client?</p><p><b>Nota:</b> questa funzione è destinata solo a scopi di manutenzione. Nessun file sarà rimosso, ma può causare un significativo traffico di dati e richiedere diversi minuti oppure ore, in base alla dimensione della cartella. Utilizza questa funzione solo se consigliata dal tuo amministratore.</p> - + Discovering %1 Rilevamento %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) di %2 spazio in uso sul server. - + No connection to %1 at <a href="%2">%3</a>. Nessuna connessione a %1 su <a href="%2">%3</a>. - + No %1 connection configured. Nessuna connessione di %1 configurata. - + Sync Running La sincronizzazione è in corso @@ -185,35 +185,35 @@ Nessun account configurato. - + The syncing operation is running.<br/>Do you want to terminate it? L'operazione di sincronizzazione è in corso.<br/>Vuoi terminarla? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 di %4). %5 rimanenti a una velocità di %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 di %2, file %3 di %4 Totale tempo rimanente %5 - + Connected to <a href="%1">%2</a>. Connesso a <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Connesso a <a href="%1">%2</a> come <i>%3</i>. - + Currently there is no storage usage information available. Non ci sono informazioni disponibili sull'utilizzo dello spazio di archiviazione. @@ -292,73 +292,73 @@ Totale tempo rimanente %5 %1 non è leggibile. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 e %2 altri file sono stati rimossi. - + %1 has been removed. %1 names a file. %1 è stato rimosso. - + %1 and %2 other files have been downloaded. %1 names a file. %1 e %2 altri file sono stati scaricati. - + %1 has been downloaded. %1 names a file. %1 è stato scaricato. - + %1 and %2 other files have been updated. %1 e %2 altri file sono stati aggiornati. - + %1 has been updated. %1 names a file. %1 è stato aggiornato. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 è stato rinominato in %2 e %3 altri file sono stati rinominati. - + %1 has been renamed to %2. %1 and %2 name files. %1 è stato rinominato in %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 è stato spostato in %2 e %3 altri file sono stati spostati. - + %1 has been moved to %2. %1 è stato spostato in %2. - + Sync Activity Sincronizza attività - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -367,17 +367,17 @@ Ciò potrebbe accadere in caso di riconfigurazione della cartella o di rimozione Sei sicuro di voler eseguire questa operazione? - + Remove All Files? Vuoi rimuovere tutti i file? - + Remove all files Rimuovi tutti i file - + Keep files Mantieni i file @@ -395,52 +395,52 @@ Sei sicuro di voler eseguire questa operazione? È stato trovato un vecchio registro di sincronizzazione '%1', ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando. - + Undefined State. Stato non definito. - + Waits to start syncing. Attende l'inizio della sincronizzazione. - + Preparing for sync. Preparazione della sincronizzazione. - + Sync is running. La sincronizzazione è in corso. - + Last Sync was successful. L'ultima sincronizzazione è stato completata correttamente. - + Last Sync was successful, but with warnings on individual files. Ultima sincronizzazione avvenuta, ma con avvisi relativi a singoli file. - + Setup Error. Errore di configurazione. - + User Abort. Interrotto dall'utente. - + Sync is paused. La sincronizzazione è sospesa. - + %1 (Sync is paused) %1 (La sincronizzazione è sospesa) @@ -449,17 +449,17 @@ Sei sicuro di voler eseguire questa operazione? Mirall::FolderStatusDelegate - + File File - + Syncing all files in your account with Sincronizza tutti i file nel tuo account con - + Remote path: %1 Percorso remoto: %1 @@ -1313,7 +1313,12 @@ Non è consigliabile utilizzarlo. ; Ripristino non riuscito: - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 Un file o una cartella è stato rimosso da una condivisione in sola lettura, ma il ripristino non è riuscito: %1 @@ -2047,132 +2052,137 @@ Prova a sincronizzare nuovamente. Mirall::ownCloudGui - + Please sign in Accedi - + Disconnected from server Disconnesso dal server - + Folder %1: %2 Cartella %1: %2 - + No sync folders configured. Nessuna cartella configurata per la sincronizzazione. - + + There are no sync folders configured. + + + + None. Nessuna. - + Recent Changes Modifiche recenti - + Open %1 folder Apri la cartella %1 - + Managed Folders: Cartelle gestite: - + Open folder '%1' Apri la cartella '%1' - + Open %1 in browser Apri %1 nel browser... - + Calculating quota... Calcolo quota in corso... - + Unknown status Stato sconosciuto - + Settings... Impostazioni... - + Details... Dettagli... - + Help Aiuto - + Quit %1 Esci da %1 - + Sign in... Accedi... - + Sign out Esci - + Quota n/a Quota n/d - + %1% of %2 in use %1% di %2 utilizzati - + No items synced recently Nessun elemento sincronizzato di recente - + Discovering %1 Rilevamento %1 - + Syncing %1 of %2 (%3 left) Sincronizzazione di %1 di %2 (%3 rimanenti) - + Syncing %1 (%2 left) Sincronizzazione di %1 (%2 rimanenti) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Aggiornato diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts index 43e8a44f82..65af623562 100644 --- a/translations/mirall_ja.ts +++ b/translations/mirall_ja.ts @@ -129,53 +129,53 @@ 再開 - + Confirm Folder Remove フォルダーの削除を確認 - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>フォルダー<i>%1</i>の同期を本当に止めますか？</p><p><b>注:</b> これによりクライアントからファイルが削除されることはありません。</p> - + Confirm Folder Reset フォルダーのリセットを確認 - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>本当にフォルダー <i>%1</i> をリセットしてクライアントのデータベースを再構築しますか?</p><p><b>注意:</b>この機能は保守目的のためだけにデザインされています。ファイルは削除されませんが、完了するまでにデータ通信が明らかに増大し、数分、あるいはフォルダーのサイズによっては数時間かかります。このオプションは管理者に指示された場合にのみ使用してください。 - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) / %2 使用中のサーバー領域 - + No connection to %1 at <a href="%2">%3</a>. <a href="%2">%3</a> に %1 への接続がありません。 - + No %1 connection configured. %1 の接続は設定されていません。 - + Sync Running 同期を実行中 @@ -185,35 +185,35 @@ アカウントが未設定です。 - + The syncing operation is running.<br/>Do you want to terminate it? 同期作業を実行中です。<br/>終了しますか？ - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%4 中 %3) 残り時間 %5 利用帯域 %6/s - + %1 of %2, file %3 of %4 Total time left %5 %2 のうち %1 , ファイル %4 のうち %3 残り時間 %5 - + Connected to <a href="%1">%2</a>. <a href="%1">%2</a> へ接続しました。 - + Connected to <a href="%1">%2</a> as <i>%3</i>. <a href="%1">%2</a> に <i>%3</i> として接続 - + Currently there is no storage usage information available. 現在、利用できるストレージ利用状況はありません。 @@ -292,73 +292,73 @@ Total time left %5 %1 は読み込み可能ではありません。 - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 と他 %2 個のファイルが削除されました。 - + %1 has been removed. %1 names a file. %1 は削除されました。 - + %1 and %2 other files have been downloaded. %1 names a file. %1 と他 %2 個のファイルがダウンロードされました。 - + %1 has been downloaded. %1 names a file. %1 はダウンロードされました。 - + %1 and %2 other files have been updated. %1 と他 %2 個のファイルが更新されました。 - + %1 has been updated. %1 names a file. %1 が更新されました。 - + %1 has been renamed to %2 and %3 other files have been renamed. %1 の名前が %2 に変更され、他 %3 個のファイルの名前が変更されました。 - + %1 has been renamed to %2. %1 and %2 name files. %1 の名前が %2 に変更されました。 - + %1 has been moved to %2 and %3 other files have been moved. %1 が %2 に移され、他 %3 個のファイルが移されました。 - + %1 has been moved to %2. %1 は %2 に移されました。 - + Sync Activity 同期アクティビティ - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -367,17 +367,17 @@ Are you sure you want to perform this operation? 本当にこの操作を実行しますか？ - + Remove All Files? すべてのファイルを削除しますか？ - + Remove all files すべてのファイルを削除 - + Keep files ファイルを残す @@ -395,52 +395,52 @@ Are you sure you want to perform this operation? 古い同期ジャーナル '%1' が見つかりましたが、削除できませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。 - + Undefined State. 未定義の状態。 - + Waits to start syncing. 同期開始を待機中 - + Preparing for sync. 同期の準備中。 - + Sync is running. 同期を実行中です。 - + Last Sync was successful. 最後の同期は成功しました。 - + Last Sync was successful, but with warnings on individual files. 最新の同期は成功しました。しかし、いくつかのファイルで問題がありました。 - + Setup Error. 設定エラー。 - + User Abort. ユーザーによる中止。 - + Sync is paused. 同期を一時停止しました。 - + %1 (Sync is paused) %1 (同期を一時停止) @@ -449,17 +449,17 @@ Are you sure you want to perform this operation? Mirall::FolderStatusDelegate - + File ファイル - + Syncing all files in your account with アカウントのすべてのファイルは同期済み - + Remote path: %1 リモートパス: %1 @@ -1312,7 +1312,12 @@ It is not advisable to use it. ; 復元に失敗: - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 ファイルまたはディレクトリが読み込み専用の共有から削除されましたが、復元に失敗しました: %1 @@ -2046,132 +2051,137 @@ It is not advisable to use it. Mirall::ownCloudGui - + Please sign in サインインしてください - + Disconnected from server サーバーから切断しました - + Folder %1: %2 フォルダー %1: %2 - + No sync folders configured. 同期フォルダーが設定されていません。 - + + There are no sync folders configured. + + + + None. なし - + Recent Changes 最近変更されたファイル - + Open %1 folder %1 フォルダーを開く - + Managed Folders: 管理フォルダー: - + Open folder '%1' フォルダー ’%1’ を開く - + Open %1 in browser %1をブラウザーで開く - + Calculating quota... クォータを計算中... - + Unknown status 不明な状態 - + Settings... 設定 - + Details... 詳細... - + Help ヘルプ - + Quit %1 %1 を終了 - + Sign in... サインイン... - + Sign out サインアウト - + Quota n/a クォータ n/a - + %1% of %2 in use %2 のうち %1% を使用中 - + No items synced recently 最近同期されたアイテムはありません。 - + Discovering %1 - + Syncing %1 of %2 (%3 left) 同期中 %2 中 %1 (残り %3) - + Syncing %1 (%2 left) 同期中 %1 (残り %2) - + %1 (%2, %3) %1 (%2, %3) - + Up to date 最新です diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts index 74bc2e301e..753774b854 100644 --- a/translations/mirall_nl.ts +++ b/translations/mirall_nl.ts @@ -129,53 +129,53 @@ Hervatten - + Confirm Folder Remove Bevestig het verwijderen van de map - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Weet u zeker dat u de synchronisatie van map <i>%1</i> wilt stoppen?</p><p><b>Opmerking:</b> Dit zal de bestanden niet van uw computer verwijderen.</p> - + Confirm Folder Reset Bevestig map reset - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Wilt u map <i>%1</i> echt resetten en de database opnieuw opbouwen?</p><p><b>Let op:</b> Deze functie is alleen ontworpen voor onderhoudsdoeleinden. Hoewel er geen bestanden worden verwijderd, kan dit een aanzienlijke hoeveelheid dataverkeer tot gevolg hebben en minuten tot zelfs uren duren, afhankelijk van de omvang van de map. Gebruik deze functie alleen als dit wordt geadviseerd door uw applicatiebeheerder.</p> - + Discovering %1 %1 onderzoeken - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) van %2 serverruimte in gebruik. - + No connection to %1 at <a href="%2">%3</a>. Geen verbinding naar %1 op <a href="%2">%3</a>. - + No %1 connection configured. Geen %1 connectie geconfigureerd. - + Sync Running Bezig met synchroniseren @@ -185,35 +185,35 @@ Geen account ingesteld. - + The syncing operation is running.<br/>Do you want to terminate it? Bezig met synchroniseren.<br/>Wil je stoppen met synchroniseren? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 of %4) %5 over bij een snelheid van %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 van %2, file %3 van %4 Totaal resterende tijd %5 - + Connected to <a href="%1">%2</a>. Verbonden met <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Verbonden met <a href="%1">%2</a> als <i>%3</i>. - + Currently there is no storage usage information available. Er is nu geen informatie over het gebruik van de opslagruimte beschikbaar. @@ -292,73 +292,73 @@ Totaal resterende tijd %5 %1 is niet leesbaar. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 en %2 andere bestanden zijn verwijderd. - + %1 has been removed. %1 names a file. %1 is verwijderd. - + %1 and %2 other files have been downloaded. %1 names a file. %1 en %2 andere bestanden zijn gedownloaded. - + %1 has been downloaded. %1 names a file. %1 is gedownloaded. - + %1 and %2 other files have been updated. %1 en %2 andere bestanden zijn bijgewerkt. - + %1 has been updated. %1 names a file. %1 is bijgewerkt. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 is hernoemd naar %2 en %3 andere bestanden zijn ook hernoemd. - + %1 has been renamed to %2. %1 and %2 name files. %1 is hernoemd naar %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 is verplaatst naar %2 en %3 andere bestanden zijn ook verplaatst. - + %1 has been moved to %2. %1 is verplaatst naar %2. - + Sync Activity Synchronisatie-activiteit - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -367,17 +367,17 @@ Dit kan komen doordat de map ongemerkt opnieuw geconfigureerd is of doordat alle Weet u zeker dat u deze bewerking wilt uitvoeren? - + Remove All Files? Verwijder alle bestanden? - + Remove all files Verwijder alle bestanden - + Keep files Bewaar bestanden @@ -395,52 +395,52 @@ Weet u zeker dat u deze bewerking wilt uitvoeren? Een oud synchronisatieverslag '%1' is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt. - + Undefined State. Ongedefiniëerde staat - + Waits to start syncing. In afwachting van synchronisatie. - + Preparing for sync. Synchronisatie wordt voorbereid - + Sync is running. Bezig met synchroniseren. - + Last Sync was successful. Laatste synchronisatie was succesvol. - + Last Sync was successful, but with warnings on individual files. Laatste synchronisatie geslaagd, maar met waarschuwingen over individuele bestanden. - + Setup Error. Installatiefout. - + User Abort. Afgebroken door gebruiker. - + Sync is paused. Synchronisatie gepauzeerd. - + %1 (Sync is paused) %1 (Synchronisatie onderbroken) @@ -449,17 +449,17 @@ Weet u zeker dat u deze bewerking wilt uitvoeren? Mirall::FolderStatusDelegate - + File Bestand - + Syncing all files in your account with Alle bestanden in uw account worden gesynchroniseerd met - + Remote path: %1 Extern pad: %1 @@ -1314,7 +1314,12 @@ We adviseren deze site niet te gebruiken. ; Herstel mislukte: - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 Er is een bestand of map verwijderd van een alleen-lezen share, maar herstellen is mislukt: %1 @@ -2048,132 +2053,137 @@ Probeer opnieuw te synchroniseren. Mirall::ownCloudGui - + Please sign in Log alstublieft in - + Disconnected from server Verbinding met server verbroken - + Folder %1: %2 Map %1: %2 - + No sync folders configured. Geen synchronisatie-mappen geconfigureerd. - + + There are no sync folders configured. + + + + None. Geen. - + Recent Changes Recente wijzigingen - + Open %1 folder Open %1 map - + Managed Folders: Beheerde mappen: - + Open folder '%1' Open map '%1' - + Open %1 in browser Open %1 in browser - + Calculating quota... Quota worden berekend ... - + Unknown status Onbekende status - + Settings... Instellingen... - + Details... Details ... - + Help Help - + Quit %1 %1 afsluiten - + Sign in... Inloggen... - + Sign out Uitloggen - + Quota n/a Quota niet beschikbaar - + %1% of %2 in use %1% van %2 gebruikt - + No items synced recently Recent niets gesynchroniseerd - + Discovering %1 %1 onderzoeken - + Syncing %1 of %2 (%3 left) Sync %1 van %2 (%3 over) - + Syncing %1 (%2 left) Sync %1 (%2 over) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Bijgewerkt diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts index deb287c3a6..23b4834c04 100644 --- a/translations/mirall_pl.ts +++ b/translations/mirall_pl.ts @@ -129,53 +129,53 @@ Wznów - + Confirm Folder Remove Potwierdź usunięcie katalogu - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Czy naprawdę chcesz przerwać synchronizację folderu <i>%1</i>?</p><p><b>Uwaga:</b> Ta czynność nie usunie plików z klienta.</p> - + Confirm Folder Reset Potwierdź reset folderu - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Czy rzeczywiście chcesz zresetować folder <i>%1</i> i przebudować bazę klientów?</p><p><b>Uwaga:</b> Ta funkcja została przewidziana wyłącznie do czynności technicznych. Nie zostaną usunięte żadne pliki, ale może to spowodować znaczący wzrost ruchu sieciowego i potrwać kilka minut lub godzin, w zależności od rozmiaru folderu. Używaj tej opcji wyłącznie, jeśli Twój administrator doradził Ci takie działanie.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) z %2 przestrzeni na serwerze w użyciu. - + No connection to %1 at <a href="%2">%3</a>. Brak połączenia do %1 na <a href="%2">%3</a>. - + No %1 connection configured. Połączenie %1 nie skonfigurowane. - + Sync Running Synchronizacja uruchomiona @@ -185,35 +185,35 @@ Brak skonfigurowanych kont. - + The syncing operation is running.<br/>Do you want to terminate it? Operacja synchronizacji jest uruchomiona.<br>Czy chcesz ją zakończyć? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 z %4) %5 pozostało z %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 z %2, plik %3 z %4 Pozostało czasu %5 - + Connected to <a href="%1">%2</a>. Podłączony do <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Podłączony do <a href="%1">%2</a> jako <i>%3</i>. - + Currently there is no storage usage information available. Obecnie nie ma dostępnych informacji o wykorzystaniu pamięci masowej. @@ -292,73 +292,73 @@ Pozostało czasu %5 %1 jest nie do odczytu. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 i %2 inne pliki zostały usunięte. - + %1 has been removed. %1 names a file. %1 został usunięty. - + %1 and %2 other files have been downloaded. %1 names a file. %1 i %2 pozostałe pliki zostały ściągnięte. - + %1 has been downloaded. %1 names a file. %1 został ściągnięty. - + %1 and %2 other files have been updated. %1 i %2 inne pliki zostały zaktualizowane. - + %1 has been updated. %1 names a file. %1 został uaktualniony. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 zmienił nazwę na %2 i %3 inne pliki mają zmienione nazwy. - + %1 has been renamed to %2. %1 and %2 name files. %1 zmienił nazwę na %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 został zmieniony na %2 i %3 inne pliku zostały przeniesione. - + %1 has been moved to %2. %1 został przeniesiony do %2. - + Sync Activity Aktywności synchronizacji - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -367,17 +367,17 @@ Mogło się tak zdarzyć z powodu niezauważonej rekonfiguracji folderu, lub te Czy jesteś pewien/pewna, że chcesz wykonać tę operację? - + Remove All Files? Usunąć wszystkie pliki? - + Remove all files Usuń wszystkie pliki - + Keep files Pozostaw pliki @@ -395,52 +395,52 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację? Stary sync journal '%1' został znaleziony, lecz nie mógł być usunięty. Proszę się upewnić, że żaden program go obecnie nie używa. - + Undefined State. Niezdefiniowany stan - + Waits to start syncing. Czekają na uruchomienie synchronizacji. - + Preparing for sync. Przygotowuję do synchronizacji - + Sync is running. Synchronizacja w toku - + Last Sync was successful. Ostatnia synchronizacja zakończona powodzeniem. - + Last Sync was successful, but with warnings on individual files. Ostatnia synchronizacja udana, ale istnieją ostrzeżenia z pojedynczymi plikami. - + Setup Error. Błąd ustawień. - + User Abort. Użytkownik anulował. - + Sync is paused. Synchronizacja wstrzymana - + %1 (Sync is paused) %1 (Synchronizacja jest zatrzymana) @@ -449,17 +449,17 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację? Mirall::FolderStatusDelegate - + File Plik - + Syncing all files in your account with Synchronizacja wszystkich plików na koncie z - + Remote path: %1 Zdalna ścieżka: %1 @@ -1314,7 +1314,12 @@ Niezalecane jest jego użycie. ; Przywracanie nie powiodło się: - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 Plik lub katalog został usunięty z udziału z prawem tylko do odczytu, ale przywrócenie nie powiodło się: %1 @@ -2048,132 +2053,137 @@ Niezalecane jest jego użycie. Mirall::ownCloudGui - + Please sign in Proszę się zalogować - + Disconnected from server Rozłączono z serwerem - + Folder %1: %2 Folder %1: %2 - + No sync folders configured. Nie skonfigurowano synchronizowanych folderów. - + + There are no sync folders configured. + + + + None. Brak. - + Recent Changes Ostatnie zmiany - + Open %1 folder Otwórz folder %1 - + Managed Folders: Zarządzane foldery: - + Open folder '%1' Otwórz katalog '%1' - + Open %1 in browser Otwórz %1 w przeglądarce - + Calculating quota... Obliczam quote... - + Unknown status Nieznany status - + Settings... Ustawienia... - + Details... Szczegóły... - + Help Pomoc - + Quit %1 Wyjdź %1 - + Sign in... Loguję... - + Sign out Wyloguj - + Quota n/a Quota n/a - + %1% of %2 in use %1% z %2 w użyciu - + No items synced recently Brak ostatnich synchronizacji - + Discovering %1 - + Syncing %1 of %2 (%3 left) Synchronizacja %1 z %2 (%3 pozostało) - + Syncing %1 (%2 left) Synchronizuję %1 (%2 pozostało) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Aktualne diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts index 8b423224c3..b7375c7a50 100644 --- a/translations/mirall_pt.ts +++ b/translations/mirall_pt.ts @@ -129,53 +129,53 @@ Resumir - + Confirm Folder Remove Confirme a remoção da pasta - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Quer mesmo parar a sincronização da pasta <i>%1</i>?</p><b>Nota:</b> Isto não irá remover os ficheiros no seu cliente.</p> - + Confirm Folder Reset Confirmar reposição da pasta - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Deseja mesmo repor a pasta <i>%1</i> e reconstruir a base de dados do seu cliente?</p><p><b>Nota:</b> Esta função é desenhada apenas para efeitos de manutenção. Os ficheiros não irão ser removidos, mas este processo pode aumentar o tráfego de dados e demorar alguns minutos ou horas a completar, dependendo do tamanho da pasta. Utilize esta funcionalidade apenas se aconselhado pelo seu administrador.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) de %2 de espaço utilizado. - + No connection to %1 at <a href="%2">%3</a>. Sem ligação a %1 em <a href="%2">%3</a>. - + No %1 connection configured. %1 sem ligação configurada. - + Sync Running A sincronização está a decorrer @@ -185,35 +185,35 @@ Nenhuma conta configurada. - + The syncing operation is running.<br/>Do you want to terminate it? A operação de sincronização está a ser executada.<br/>Deseja terminar? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 de %4) %5 faltando a uma taxa de %6/s - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. Conectado a <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Conectado a <a href="%1">%2</a> como <i>%3</i>. - + Currently there is no storage usage information available. Histórico de utilização de armazenamento não disponível. @@ -292,73 +292,73 @@ Total time left %5 Não é possível ler %1 - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 e %2 outros ficheiros foram removidos. - + %1 has been removed. %1 names a file. %1 foi removido. - + %1 and %2 other files have been downloaded. %1 names a file. Foi feito o download de outros ficheiros %1 e %2. - + %1 has been downloaded. %1 names a file. Fez o download de %1 - + %1 and %2 other files have been updated. Os ficheiros %1 e %2 foram actualizados. - + %1 has been updated. %1 names a file. %1 foi actualizado. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 foi renomeado para %2 e %3 outros ficheiros foram renomeados. - + %1 has been renamed to %2. %1 and %2 name files. %1 foi renomeado para %2 - + %1 has been moved to %2 and %3 other files have been moved. %1 foi movido para %2 e %3 outros ficheiros foram movidos. - + %1 has been moved to %2. %1 foi movido para %2 - + Sync Activity Actividade de sincronicação - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -366,17 +366,17 @@ Are you sure you want to perform this operation? Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha "Manter os ficheiros". Se quer apagar os seus dados, escolha "Remover todos os ficheiros". - + Remove All Files? Remover todos os ficheiros? - + Remove all files Remover todos os ficheiros - + Keep files Manter os ficheiros @@ -394,52 +394,52 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q Não foi possível remover o antigo 'journal sync' '%1'. Por favor certifique-se que nenhuma aplicação o está a utilizar. - + Undefined State. Estado indefinido. - + Waits to start syncing. A aguardar o inicio da sincronização. - + Preparing for sync. A preparar para sincronização. - + Sync is running. A sincronização está a correr. - + Last Sync was successful. A última sincronização foi efectuada com sucesso. - + Last Sync was successful, but with warnings on individual files. A última sincronização foi efectuada com sucesso, mas existem avisos sobre alguns ficheiros. - + Setup Error. Erro na instalação. - + User Abort. Cancelado pelo utilizador. - + Sync is paused. A sincronização está em pausa. - + %1 (Sync is paused) %1 (Sincronização em pausa) @@ -448,17 +448,17 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q Mirall::FolderStatusDelegate - + File Ficheiro - + Syncing all files in your account with A sincronizar todos os ficheiros sua conta com - + Remote path: %1 Pasta remota: %1 @@ -1311,7 +1311,12 @@ It is not advisable to use it. ; Restauração Falhou: - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 Um ficheiro ou um directório foi removido de uma partilha apenas de leitura, mas o restauro falhou: %1 @@ -2046,132 +2051,137 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n Mirall::ownCloudGui - + Please sign in Por favor inicie a sessão - + Disconnected from server Desligar do servidor - + Folder %1: %2 Pasta %1: %2 - + No sync folders configured. Nenhuma pasta de sincronização configurada. - + + There are no sync folders configured. + + + + None. Nada. - + Recent Changes Alterações recentes - + Open %1 folder Abrir a pasta %1 - + Managed Folders: Pastas Geridas: - + Open folder '%1' Abrir pasta '%1' - + Open %1 in browser Abrir %1 no browser - + Calculating quota... A calcular quota... - + Unknown status Estado desconhecido - + Settings... Configurações... - + Details... Detalhes... - + Help Ajuda - + Quit %1 Sair do %1 - + Sign in... Entrar... - + Sign out Sair - + Quota n/a Quota não disponível - + %1% of %2 in use %1% de %2 utilizado - + No items synced recently Sem itens sincronizados recentemente - + Discovering %1 - + Syncing %1 of %2 (%3 left) Sincronizar %1 de %2 (%3 faltando) - + Syncing %1 (%2 left) Sincronizando %1 (%2 faltando) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Actualizado diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts index c27d983df7..6bbe2b20c5 100644 --- a/translations/mirall_pt_BR.ts +++ b/translations/mirall_pt_BR.ts @@ -129,53 +129,53 @@ Resumir - + Confirm Folder Remove Confirma Remoção da Pasta - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Você realmente deseja parar de sincronizar a pasta <i>%1</i>?</p><p><b>Nota:</b> Isso não vai remover os arquivos de seu cliente.</p> - + Confirm Folder Reset Confirme Reiniciar Pasta - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Você realmente deseja redefinir a pasta <i>%1</i> e reconstruir seu banco de dados de clientes?</p><p><b>Nota:</b> Esta função é usada somente para manutenção. Nenhum arquivo será removido, mas isso pode causar significativo tráfego de dados e levar vários minutos ou horas, dependendo do tamanho da pasta. Somente use esta opção se adivertido por seu administrador.</p> - + Discovering %1 Descobrindo %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) de %2 do espaço em uso no servidor. - + No connection to %1 at <a href="%2">%3</a>. Nenhuma conexão para %1 em <a href="%2">%3</a>. - + No %1 connection configured. Nenhuma %1 conexão configurada. - + Sync Running Sincronização Acontecendo @@ -185,35 +185,35 @@ Nenhuma conta configurada. - + The syncing operation is running.<br/>Do you want to terminate it? A operação de sincronização está acontecendo.<br/>Você deseja finaliza-la? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 de %4) %5 faltando a uma taxa de %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 de %2, arquivo %3 de %4 Total de tempo que falta 5% - + Connected to <a href="%1">%2</a>. Conectado à <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Conectado a <a href="%1">%2</a> como <i>%3</i>. - + Currently there is no storage usage information available. Atualmente, não há informações de uso de armazenamento disponível. @@ -292,73 +292,73 @@ Total de tempo que falta 5% %1 não pode ser lido. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 e %2 outros arquivos foram removidos. - + %1 has been removed. %1 names a file. %1 foi removido. - + %1 and %2 other files have been downloaded. %1 names a file. %1 e %2 outros arquivos foram baixados. - + %1 has been downloaded. %1 names a file. %1 foi baixado. - + %1 and %2 other files have been updated. %1 e %2 outros arquivos foram atualizados. - + %1 has been updated. %1 names a file. %1 foi atualizado. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 foi renomeado para %2 e %3 outros três arquivos foram renomeados. - + %1 has been renamed to %2. %1 and %2 name files. %1 foi renomeado para %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 foi movido para %2 e %3 outros arquivos foram movidos. - + %1 has been moved to %2. %1 foi movido para %2. - + Sync Activity Atividade de Sincronização - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -367,17 +367,17 @@ Isso pode ser porque a pasta foi silenciosamente reconfigurada, ou todos os arqu Você tem certeza que quer executar esta operação? - + Remove All Files? Deseja Remover Todos os Arquivos? - + Remove all files Remover todos os arquivos - + Keep files Manter arquivos @@ -395,52 +395,52 @@ Você tem certeza que quer executar esta operação? Uma velha revista de sincronização '%1' foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está a usá-la. - + Undefined State. Estado indefinido. - + Waits to start syncing. Aguardando o inicio da sincronização. - + Preparing for sync. Preparando para sincronização. - + Sync is running. A sincronização está ocorrendo. - + Last Sync was successful. A última sincronização foi feita com sucesso. - + Last Sync was successful, but with warnings on individual files. A última sincronização foi executada com sucesso, mas com advertências em arquivos individuais. - + Setup Error. Erro de Configuração. - + User Abort. Usuário Abortou - + Sync is paused. Sincronização pausada. - + %1 (Sync is paused) %1 (Pausa na Sincronização) @@ -449,17 +449,17 @@ Você tem certeza que quer executar esta operação? Mirall::FolderStatusDelegate - + File Arquivo - + Syncing all files in your account with Sincronizando todos os arquivos em sua conta com - + Remote path: %1 Caminho remoto: %1 @@ -1312,7 +1312,12 @@ It is not advisable to use it. ; Falha na Restauração: - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 Um arquivo ou diretório foi removido de um compartilhamento somente de leitura, mas a restauração falhou: %1 @@ -2046,132 +2051,137 @@ Tente sincronizar novamente. Mirall::ownCloudGui - + Please sign in Favor conectar - + Disconnected from server Desconectado do servidor - + Folder %1: %2 Pasta %1: %2 - + No sync folders configured. Pastas de sincronização não configuradas. - + + There are no sync folders configured. + + + + None. Nenhum. - + Recent Changes Alterações Recentes - + Open %1 folder Abrir pasta %1 - + Managed Folders: Pastas Gerenciadas: - + Open folder '%1' Abrir pasta '%1' - + Open %1 in browser Abrir %1 no navegador - + Calculating quota... Calculando cota... - + Unknown status Status desconhecido - + Settings... Configurações... - + Details... Detalhes... - + Help Ajuda - + Quit %1 Sair %1 - + Sign in... Conectar em... - + Sign out Sair - + Quota n/a Cota n/a - + %1% of %2 in use %1% de %2 em uso - + No items synced recently Não há itens sincronizados recentemente - + Discovering %1 Descobrindo %1 - + Syncing %1 of %2 (%3 left) Sincronizar %1 de %2 (%3 faltando) - + Syncing %1 (%2 left) Sincronizando %1 (%2 faltando) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Até a data diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts index 31521ef328..4db103bb87 100644 --- a/translations/mirall_ru.ts +++ b/translations/mirall_ru.ts @@ -65,7 +65,7 @@ Selective Sync... - + Выборочная синхронизация... @@ -129,53 +129,53 @@ Продолжить - + Confirm Folder Remove Подтвердите удаление папки - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Вы действительно хотите прекратить синхронизацию папки <i>%1</i>?</p><p><b>Примечание:</b> Это действие не удалит файлы с клиента.</p> - + Confirm Folder Reset Подтвердить сброс папки - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Вы действительно хотите сбросить папку <i>%1</i> и перестроить клиентскую базу данных?</p><p><b>Важно:</b> Данный функционал предназначен только для технического обслуживания. Файлы не будут удалены, но, в зависимости от размера папки, операция может занять от нескольких минут до нескольких часов и может быть передан большой объем данных. Используйте данную операцию только по рекомендации администратора.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. Используется %1 (%3%) из %2 места на сервере. - + No connection to %1 at <a href="%2">%3</a>. Нет связи с %1 по адресу <a href="%2">%3</a>. - + No %1 connection configured. Нет настроенного подключения %1. - + Sync Running Синхронизация запущена @@ -185,35 +185,35 @@ Учётная запись не настроена. - + The syncing operation is running.<br/>Do you want to terminate it? Синхронизация запущена.<br/>Вы хотите, остановить ее? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 / %4) Осталось %5 на скорости %6/сек. - + %1 of %2, file %3 of %4 Total time left %5 %1 / %2, файл %3 / %4 Оставшееся время: %5 - + Connected to <a href="%1">%2</a>. Соединились с <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Подключён к <a href="%1">%2</a> как <i>%3</i>. - + Currently there is no storage usage information available. В данный момент информация о заполненности хранилища недоступна. @@ -292,73 +292,73 @@ Total time left %5 %1 не читается. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. '%1' и ещё %2 других файлов были удалены. - + %1 has been removed. %1 names a file. '%1' был удалён - + %1 and %2 other files have been downloaded. %1 names a file. '%1' и ещё %2 других файлов были загружены. - + %1 has been downloaded. %1 names a file. %1 был загружен. - + %1 and %2 other files have been updated. %1 и ещё %2 других файла были обновлены. - + %1 has been updated. %1 names a file. %1 был обновлён. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 был переименован в %2 и ещё %3 других файлов были переименованы. - + %1 has been renamed to %2. %1 and %2 name files. %1 был переименован в %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 был перемещён в %2 и ещё %3 других файлов были перемещены. - + %1 has been moved to %2. %1 был перемещён в %2. - + Sync Activity Журнал синхронизации - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -367,17 +367,17 @@ Are you sure you want to perform this operation? Вы уверены, что хотите выполнить операцию? - + Remove All Files? Удалить все файлы? - + Remove all files Удалить все файлы - + Keep files Сохранить файлы @@ -395,52 +395,52 @@ Are you sure you want to perform this operation? Найден старый журнал синхронизации '%1', и он не может быть удалён. Пожалуйста убедитесь что он не открыт в каком-либо приложении. - + Undefined State. Неопределенное состояние. - + Waits to start syncing. Ожидает, чтобы начать синхронизацию. - + Preparing for sync. Подготовка к синхронизации. - + Sync is running. Идет синхронизация. - + Last Sync was successful. Последняя синхронизация прошла успешно. - + Last Sync was successful, but with warnings on individual files. Последняя синхронизация прошла успешно, но были предупреждения о нескольких файлах. - + Setup Error. Ошибка установки. - + User Abort. Отмена пользователем. - + Sync is paused. Синхронизация приостановлена. - + %1 (Sync is paused) %! (синхронизация приостановлена) @@ -449,17 +449,17 @@ Are you sure you want to perform this operation? Mirall::FolderStatusDelegate - + File Файл - + Syncing all files in your account with Все файлы в вашей учётной записи синхронизируются с - + Remote path: %1 Удаленный путь: %1 @@ -589,7 +589,7 @@ Are you sure you want to perform this operation? Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. - + Выборочная синхронизация: снимите отметку с элементов, которые не хотите синхронизировать. @@ -1231,7 +1231,7 @@ It is not advisable to use it. Skip folders configuration - + Пропустить настройку папок @@ -1314,7 +1314,12 @@ It is not advisable to use it. ; Восстановление не удалось: - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 Файл или каталог был удалён из опубликованной папки с правами только для чтения, но восстановить его не удалось: %1 @@ -2048,132 +2053,137 @@ It is not advisable to use it. Mirall::ownCloudGui - + Please sign in Пожалуйста войдите в учётную запись - + Disconnected from server Отсоединен от сервера - + Folder %1: %2 Папка %1: %2 - + No sync folders configured. Нет папок для синхронизации. - + + There are no sync folders configured. + + + + None. Пусто - + Recent Changes Недавние изменения - + Open %1 folder Открыть %1 папку - + Managed Folders: Управляемые папки: - + Open folder '%1' Открыть папку '%1' - + Open %1 in browser Открыть %1 в браузере - + Calculating quota... Расчёт квоты... - + Unknown status Неизвестный статус - + Settings... Настройки... - + Details... Детали... - + Help Помощь - + Quit %1 Закрыть %1 - + Sign in... Войти... - + Sign out Выйти - + Quota n/a Квота недоступна - + %1% of %2 in use Используется %1% из %2. - + No items synced recently Недавно ничего не синхронизировалсь - + Discovering %1 - + Syncing %1 of %2 (%3 left) Синхронизация %1 из %2 (%3 осталось) - + Syncing %1 (%2 left) Синхронизация %1 (%2 осталось) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Актуальная версия diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts index 1bd0dc1e3f..07be288bb3 100644 --- a/translations/mirall_sk.ts +++ b/translations/mirall_sk.ts @@ -129,53 +129,53 @@ Obnovenie - + Confirm Folder Remove Potvrdiť odstránenie priečinka - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Určite chcete zastaviť synchronizáciu priečinka <i>%1</i>?</p><p><b>Poznámka:</b> Toto neodstráni súbory z vášho klienta.</p> - + Confirm Folder Reset Potvrdiť zresetovanie priečinka - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Skutočne chcete zresetovať priečinok <i>%1</i> a opätovne zostaviť klientskú databázu?</p><p><b>Poznámka:</b> Táto funkcia je navrhnutá len pre účely údržby. Žiadne súbory nebudú odstránené, ale môže to spôsobiť značnú dátovú prevádzku a vyžiadať si niekoľko minút alebo hodín pre dokončenie, v závislosti od veľkosti priečinka. Použite túto možnosť pokiaľ máte doporučenie od správcu.</p> - + Discovering %1 Objavuje sa %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) z %2 miesta na disku je použité. - + No connection to %1 at <a href="%2">%3</a>. Žiadne spojenie s %1 na <a href="%2">%3</a>. - + No %1 connection configured. Žiadne nakonfigurované %1 spojenie - + Sync Running Prebiehajúca synchronizácia @@ -185,35 +185,35 @@ Žiadny účet nie je nastavený. - + The syncing operation is running.<br/>Do you want to terminate it? Proces synchronizácie práve prebieha.<br/>Chcete ho ukončiť? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 z %4) %5 zostáva pri rýchlosti %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 z %2, súbor %3 z %4 Celkom zostáva %5 - + Connected to <a href="%1">%2</a>. Pripojené k <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Pripojené k <a href="%1">%2</a> ako <i>%3</i>. - + Currently there is no storage usage information available. Teraz nie sú k dispozícii žiadne informácie o využití úložiska. @@ -292,73 +292,73 @@ Celkom zostáva %5 %1 nie je čitateľný. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 a %2 ďalších súborov bolo zmazaných. - + %1 has been removed. %1 names a file. %1 bol zmazaný. - + %1 and %2 other files have been downloaded. %1 names a file. %1 a %2 ďalších súborov bolo stiahnutých. - + %1 has been downloaded. %1 names a file. %1 bol stiahnutý. - + %1 and %2 other files have been updated. %1 a %2 ďalších súborov bolo aktualizovaných. - + %1 has been updated. %1 names a file. %1 bol aktualizovaný. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 bol premenovaný na %2 a %3 ďalších súborov bolo premenovaných. - + %1 has been renamed to %2. %1 and %2 name files. %1 bol premenovaný na %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 bol presunutý do %2 a %3 ďalších súborov bolo presunutých. - + %1 has been moved to %2. %1 bol presunutý do %2. - + Sync Activity Aktivita synchronizácie - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -367,17 +367,17 @@ Toto môže byť kvôli tichej rekonfigurácii priečinka, prípadne boli všetk Ste si istý, že chcete uskutočniť danú operáciu? - + Remove All Files? Odstrániť všetky súbory? - + Remove all files Odstrániť všetky súbory - + Keep files Ponechať súbory @@ -395,52 +395,52 @@ Ste si istý, že chcete uskutočniť danú operáciu? Starý synchronizačný žurnál '%1' nájdený, avšak neodstrániteľný. Prosím uistite sa, že žiadna aplikácia ho práve nevyužíva. - + Undefined State. Nedefinovaný stav. - + Waits to start syncing. Čakanie na štart synchronizácie. - + Preparing for sync. Príprava na synchronizáciu. - + Sync is running. Synchronizácia prebieha. - + Last Sync was successful. Posledná synchronizácia sa úspešne skončila. - + Last Sync was successful, but with warnings on individual files. Posledná synchronizácia bola úspešná, ale z varovaniami pre individuálne súbory. - + Setup Error. Chyba pri inštalácii. - + User Abort. Zrušené používateľom. - + Sync is paused. Synchronizácia je pozastavená. - + %1 (Sync is paused) %1 (Synchronizácia je pozastavená) @@ -449,17 +449,17 @@ Ste si istý, že chcete uskutočniť danú operáciu? Mirall::FolderStatusDelegate - + File Súbor - + Syncing all files in your account with Synchronizácia všetkých súborov vo vašom účte z - + Remote path: %1 Vzdialená cesta: %1 @@ -1314,7 +1314,12 @@ Nie je vhodné ju používať. ; Obnovenie zlyhalo: - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 Súbor alebo priečinok bol odobratý zo zdieľania len na čítanie, ale jeho obnovenie zlyhalo: %1 @@ -2047,132 +2052,137 @@ Nie je vhodné ju používať. Mirall::ownCloudGui - + Please sign in Prihláste sa prosím - + Disconnected from server Odpojený od servera - + Folder %1: %2 Priečinok %1: %2 - + No sync folders configured. Nie sú nastavené žiadne synchronizačné priečinky. - + + There are no sync folders configured. + + + + None. Žiaden. - + Recent Changes Nedávne zmeny - + Open %1 folder Otvoriť %1 priečinok - + Managed Folders: Spravované priečinky: - + Open folder '%1' Otvoriť priečinok '%1' - + Open %1 in browser Otvoriť %1 v prehliadači - + Calculating quota... Počítanie kvóty... - + Unknown status Neznámy stav - + Settings... Nastavenia... - + Details... Podrobnosti... - + Help Pomoc - + Quit %1 Ukončiť %1 - + Sign in... Prihlásiť do... - + Sign out Odhlásiť - + Quota n/a Kvóta n/a - + %1% of %2 in use %1% z %2 sa používa - + No items synced recently Žiadne nedávno synchronizované položky - + Discovering %1 Objavuje sa %1 - + Syncing %1 of %2 (%3 left) Synchronizuje sa %1 z %2 (zostáva %3) - + Syncing %1 (%2 left) Synchronizuje sa %1 (zostáva %2) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Až do dnešného dňa diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts index d33ea5bed2..14ff2ebf4a 100644 --- a/translations/mirall_sl.ts +++ b/translations/mirall_sl.ts @@ -129,53 +129,53 @@ Nadaljuj - + Confirm Folder Remove Potrdi odstranitev mape - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Ali res želite zaustaviti usklajevanje mape <i>%1</i>?</p><p><b>Opomba:</b> s tem mape iz odjemalca ne bodo odstranjene.</p> - + Confirm Folder Reset Potrdi ponastavitev mape - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Ali ste prepričani, da želite mapo <i>%1</i> ponastaviti in ponovno izgraditi podatkovno zbirko?</p><p><b>Opozorilo:</b> Možnost je zasnovana za vzdrževanje. Datoteke sicer ne bodo spremenjene, vendar pa je opravilo lahko zelo dolgotrajno in lahko traja tudi več ur. Trajanje je odvisno od velikosti mape. Možnost uporabite le, če vam to svetuje skrbnik sistema.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) od %2 prostora strežnika je v uporabi. - + No connection to %1 at <a href="%2">%3</a>. Ni povezave z %1 pri <a href="%2">%3</a>. - + No %1 connection configured. Ni nastavljenih %1 povezav. - + Sync Running Usklajevanje je v teku @@ -185,34 +185,34 @@ Ni nastavljenega računa. - + The syncing operation is running.<br/>Do you want to terminate it? Izvaja se usklajevanje.<br/>Ali želite opravilo prekiniti? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. Vzpostavljena je povezava s strežnikom <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Vzpostavljena je povezava z <a href="%1">%2</a> kot <i>%3</i>. - + Currently there is no storage usage information available. Trenutno ni na voljo nobenih podatkov o porabi prostora. @@ -291,73 +291,73 @@ Total time left %5 %1 ni mogoče brati. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. Datoteka %1 in %2 drugih datotek je odstranjenih. - + %1 has been removed. %1 names a file. Datoteka %1 je odstranjena. - + %1 and %2 other files have been downloaded. %1 names a file. Datoteka %1 in %2 drugih datotek je prejetih. - + %1 has been downloaded. %1 names a file. Datoteka %1 je prejeta. - + %1 and %2 other files have been updated. %1 in %2 drugih datotek je posodobljenih. - + %1 has been updated. %1 names a file. Datoteka %1 je posodobljena. - + %1 has been renamed to %2 and %3 other files have been renamed. Datoteka %1 je preimenovana v %2. Preimenovanih je bilo še %3 datotek. - + %1 has been renamed to %2. %1 and %2 name files. Datoteka %1 je preimenovana v %2. - + %1 has been moved to %2 and %3 other files have been moved. Datoteka %1 je premaknjena v %2. Premaknjenih je bilo še %3 datotek. - + %1 has been moved to %2. Datoteka %1 je premaknjena v %2. - + Sync Activity Dejavnost usklajevanja - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -366,17 +366,17 @@ Mapa je bila morda odstranjena ali pa so bile nastavitve spremenjene. Ali sta prepričani, da želite izvesti to opravilo? - + Remove All Files? Ali naj bodo odstranjene vse datoteke? - + Remove all files Odstrani vse datoteke - + Keep files Ohrani datoteke @@ -394,52 +394,52 @@ Ali sta prepričani, da želite izvesti to opravilo? Obstaja starejši dnevnik usklajevanja '%1', vendar ga ni mogoče odstraniti. Preverite, da datoteka ni v uporabi. - + Undefined State. Nedoločeno stanje. - + Waits to start syncing. V čakanju na začetek usklajevanja. - + Preparing for sync. Poteka priprava za usklajevanje. - + Sync is running. Usklajevanje je v teku. - + Last Sync was successful. Zadnje usklajevanje je bilo uspešno končano. - + Last Sync was successful, but with warnings on individual files. Zadnje usklajevanje je bilo sicer uspešno, vendar z opozorili za posamezne datoteke. - + Setup Error. Napaka nastavitve. - + User Abort. Uporabniška prekinitev. - + Sync is paused. Usklajevanje je začasno v premoru. - + %1 (Sync is paused) %1 (usklajevanje je v premoru) @@ -448,17 +448,17 @@ Ali sta prepričani, da želite izvesti to opravilo? Mirall::FolderStatusDelegate - + File Datoteka - + Syncing all files in your account with Usklajevanje vseh datotek z mestom - + Remote path: %1 Oddaljena pot: %1 @@ -1313,7 +1313,12 @@ Uporaba ni priporočljiva. ; obnovitev je spodletela: - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 Datoteka ali mapa je bila odstranjena iz mesta v souporabi, ki je nastavljeno le za branje, obnavljanje pa je spodletelo: %1 @@ -2047,132 +2052,137 @@ Te je treba uskladiti znova. Mirall::ownCloudGui - + Please sign in Pred nadaljevanjem je zahtevana prijava - + Disconnected from server Povezava s strežnikom je prekinjena - + Folder %1: %2 Mapa %1: %2 - + No sync folders configured. Ni nastavljenih map za usklajevanje. - + + There are no sync folders configured. + + + + None. Brez - + Recent Changes Nedavne spremembe - + Open %1 folder Odpri %1 mapo - + Managed Folders: Upravljane mape: - + Open folder '%1' Odpri mapo '%1' - + Open %1 in browser Odpri %1 v brskalniku - + Calculating quota... Preračunavanje količinske omejitve ... - + Unknown status Neznano stanje - + Settings... Nastavitve ... - + Details... Podrobnosti ... - + Help Pomoč - + Quit %1 Končaj %1 - + Sign in... Prijava ... - + Sign out Odjava - + Quota n/a Količinska omejitev ni na voljo - + %1% of %2 in use %1% od %2 v uporabi - + No items synced recently Ni nedavno usklajenih predmetov - + Discovering %1 - + Syncing %1 of %2 (%3 left) Poteka usklajevanje %1 od %2 (preostaja %3) - + Syncing %1 (%2 left) Usklajevanje %1 (%2 do konca) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Ni posodobitev diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts index 2dbdc3137d..0b73428cb1 100644 --- a/translations/mirall_sv.ts +++ b/translations/mirall_sv.ts @@ -129,53 +129,53 @@ Återuppta - + Confirm Folder Remove Bekräfta radering av mapp - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Vill du verkligen stoppa synkroniseringen av mappen <i>%1</i>?</p><p><b>Notera:</b> Detta kommer inte att radera filerna från din klient.</p> - + Confirm Folder Reset Bekräfta återställning av mapp - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Vill du verkligen nollställa mappen <i>%1</i> och återställa din databas?</p><p><b>Notera:</b> Denna funktion är endast designad för underhållsuppgifter. Inga filer raderas, men kan skapa mycket datatrafik och ta allt från några minuter till flera timmar att slutföra, beroende på storleken på mappen. Använd endast detta alternativ om du har blivit uppmanad av din systemadministratör.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. %1 (%3%) av %2 server utrymme används. - + No connection to %1 at <a href="%2">%3</a>. Ingen anslutning till %1 vid <a href="%2">%3</a> - + No %1 connection configured. Ingen %1 anslutning konfigurerad. - + Sync Running Synkronisering pågår @@ -185,35 +185,35 @@ Inget konto är konfigurerat. - + The syncing operation is running.<br/>Do you want to terminate it? En synkronisering pågår.<br/>Vill du avbryta den? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3 of %4) %5 återstående. Hastighet %6/s - + %1 of %2, file %3 of %4 Total time left %5 %1 av %2, fil %3 av %4 Tid kvar %5 - + Connected to <a href="%1">%2</a>. Ansluten till <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. Ansluten till <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. Just nu finns ingen utrymmes information tillgänglig @@ -292,73 +292,73 @@ Tid kvar %5 %1 är inte läsbar. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 och %2 andra filer har tagits bort. - + %1 has been removed. %1 names a file. %1 har tagits bort. - + %1 and %2 other files have been downloaded. %1 names a file. %1 och %2 andra filer har laddats ner. - + %1 has been downloaded. %1 names a file. %1 har laddats ner. - + %1 and %2 other files have been updated. %1 och %2 andra filer har uppdaterats. - + %1 has been updated. %1 names a file. %1 har uppdaterats. - + %1 has been renamed to %2 and %3 other files have been renamed. %1 har döpts om till %2 och %3 andra filer har bytt namn. - + %1 has been renamed to %2. %1 and %2 name files. %1 har döpts om till %2. - + %1 has been moved to %2 and %3 other files have been moved. %1 har flyttats till %2 och %3 andra filer har tagits bort. - + %1 has been moved to %2. %1 har flyttats till %2. - + Sync Activity Synk aktivitet - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -367,17 +367,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file Är du säker på att du vill fortsätta? - + Remove All Files? Ta bort alla filer? - + Remove all files Ta bort alla filer - + Keep files Behåll filer @@ -395,52 +395,52 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file En gammal synkroniseringsjournal '%1' hittades, men kunde inte raderas. Vänligen se till att inga program för tillfället använder den. - + Undefined State. Okänt tillstånd. - + Waits to start syncing. Väntar på att starta synkronisering. - + Preparing for sync. Förbereder synkronisering - + Sync is running. Synkronisering pågår. - + Last Sync was successful. Senaste synkronisering lyckades. - + Last Sync was successful, but with warnings on individual files. Senaste synkning lyckades, men det finns varningar för vissa filer! - + Setup Error. Inställningsfel. - + User Abort. Användare Avbryt - + Sync is paused. Synkronisering är pausad. - + %1 (Sync is paused) %1 (Synk är stoppad) @@ -449,17 +449,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file Mirall::FolderStatusDelegate - + File Fil - + Syncing all files in your account with Synkroniserar alla filer i ditt konto med - + Remote path: %1 Fjärrsökväg: %1 @@ -1314,7 +1314,12 @@ Det är inte lämpligt använda den. ; Restaurering Misslyckades: - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 En fil eller katalog togs bort från en endast-läsbar delning, men återställning misslyckades: %1 @@ -2048,132 +2053,137 @@ Försök att synka dessa igen. Mirall::ownCloudGui - + Please sign in Vänliga logga in - + Disconnected from server Bortkopplad från servern - + Folder %1: %2 Mapp %1: %2 - + No sync folders configured. Ingen synkroniseringsmapp är konfigurerad. - + + There are no sync folders configured. + + + + None. Ingen. - + Recent Changes Senaste ändringar - + Open %1 folder Öppna %1 mappen - + Managed Folders: Hanterade mappar: - + Open folder '%1' Öppna mapp '%1' - + Open %1 in browser Öppna %1 i webbläsaren - + Calculating quota... Beräknar kvot... - + Unknown status Okänd status - + Settings... Inställningar... - + Details... Detaljer... - + Help Hjälp - + Quit %1 Avsluta %1 - + Sign in... Logga in... - + Sign out Logga ut - + Quota n/a Kvot n/a - + %1% of %2 in use %1% av %2 används - + No items synced recently Inga filer har synkroniseras nyligen - + Discovering %1 - + Syncing %1 of %2 (%3 left) Synkroniserar %1 av %2 (%3 kvar) - + Syncing %1 (%2 left) Synkroniserar %1 (%2 kvar) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Aktuell version diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts index b706922aae..b7addb8a38 100644 --- a/translations/mirall_th.ts +++ b/translations/mirall_th.ts @@ -129,53 +129,53 @@ ดำเนินการต่อ - + Confirm Folder Remove ยืนยันการลบโฟลเดอร์ - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> - + Confirm Folder Reset - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. ยังไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า - + Sync Running การซิงค์ข้อมูลกำลังทำงาน @@ -185,34 +185,34 @@ - + The syncing operation is running.<br/>Do you want to terminate it? การดำเนินการเพื่อถ่ายโอนข้อมูลกำลังทำงานอยู่ <br/>คุณต้องการสิ้นสุดการทำงานหรือไม่? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. @@ -291,90 +291,90 @@ Total time left %5 ไม่สามารถอ่านข้อมูล %1 ได้ - + %1: %2 - + %1 and %2 other files have been removed. %1 names a file. - + %1 has been removed. %1 names a file. - + %1 and %2 other files have been downloaded. %1 names a file. - + %1 has been downloaded. %1 names a file. - + %1 and %2 other files have been updated. - + %1 has been updated. %1 names a file. - + %1 has been renamed to %2 and %3 other files have been renamed. - + %1 has been renamed to %2. %1 and %2 name files. - + %1 has been moved to %2 and %3 other files have been moved. - + %1 has been moved to %2. - + Sync Activity - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? - + Remove All Files? - + Remove all files - + Keep files @@ -392,52 +392,52 @@ Are you sure you want to perform this operation? - + Undefined State. สถานะที่ยังไม่ได้ถูกกำหนด - + Waits to start syncing. รอการเริ่มต้นซิงค์ข้อมูล - + Preparing for sync. - + Sync is running. การซิงค์ข้อมูลกำลังทำงาน - + Last Sync was successful. การซิงค์ข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว - + Last Sync was successful, but with warnings on individual files. - + Setup Error. เกิดข้อผิดพลาดในการติดตั้ง - + User Abort. - + Sync is paused. การซิงค์ข้อมูลถูกหยุดไว้ชั่วคราว - + %1 (Sync is paused) @@ -446,17 +446,17 @@ Are you sure you want to perform this operation? Mirall::FolderStatusDelegate - + File - + Syncing all files in your account with - + Remote path: %1 ตำแหน่งพาธระยะไกล: %1 @@ -1307,7 +1307,12 @@ It is not advisable to use it. - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 @@ -2038,132 +2043,137 @@ It is not advisable to use it. Mirall::ownCloudGui - + Please sign in - + Disconnected from server - + Folder %1: %2 - + No sync folders configured. ยังไม่มีการกำหนดค่าโฟลเดอร์ที่ต้องการซิงค์ข้อมูล - + + There are no sync folders configured. + + + + None. - + Recent Changes - + Open %1 folder เปิดโฟลเดอร์ %1 - + Managed Folders: โฟลเดอร์ที่มีการจัดการแล้ว: - + Open folder '%1' - + Open %1 in browser - + Calculating quota... - + Unknown status - + Settings... - + Details... - + Help ช่วยเหลือ - + Quit %1 - + Sign in... - + Sign out - + Quota n/a - + %1% of %2 in use - + No items synced recently - + Discovering %1 - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts index 42ace71ac0..31044e0a64 100644 --- a/translations/mirall_tr.ts +++ b/translations/mirall_tr.ts @@ -129,53 +129,53 @@ Devam et - + Confirm Folder Remove Klasör Kaldırma İşlemini Onayla - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Gerçekten <i>%1</i> klasörünü eşitlemeyi durdurmak istiyor musunuz?</p><p><b>Not:</b> Bu işlem dosyaları istemcinizden kaldırmayacaktır.</p> - + Confirm Folder Reset Klasör Sıfırlamayı Onayla - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>Gerçekten <i>%1</i> klasörünü sıfırlamak ve istemci veritabanını yeniden inşa etmek istiyor musunuz?</p><p><b>Not:</b> Bu işlev sadece bakım amaçlı tasarlandı. Hiçbir dosya kaldırılmayacak, fakat bu işlem büyük veri trafiğine sebep olabilir ve klasör boyutuna bağlı olarak tamamlanması birkaç dakikadan birkaç saate kadar sürebilir. Bu seçeneği sadece yöneticiniz tarafından istenmişse kullanın.</p> - + Discovering %1 Ortaya çıkarılan: %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. Sunucudaki %2'lık kotanın %1'ı (%%3) kullanılıyor. - + No connection to %1 at <a href="%2">%3</a>. <a href="%2">%3</a> üzerinde %1 bağlantısı yok. - + No %1 connection configured. Hiç %1 bağlantısı yapılandırılmamış. - + Sync Running Eşitleme Çalışıyor @@ -185,35 +185,35 @@ Hiçbir hesap yapılandırılmamış. - + The syncing operation is running.<br/>Do you want to terminate it? Eşitleme işlemi devam ediyor.<br/>Durdurmak istiyor musunuz? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" %1 %2 (%3/%4) %6/s aktarım hızında kalan %5 - + %1 of %2, file %3 of %4 Total time left %5 %1/%2, dosya %3/%4 Toplam kalan süre %5 - + Connected to <a href="%1">%2</a>. <a href="%1">%2</a> ile bağlı. - + Connected to <a href="%1">%2</a> as <i>%3</i>. <a href="%1">%2</a> bağlantısı <i>%3</i> olarak yapıldı. - + Currently there is no storage usage information available. Şu anda depolama kullanım bilgisi mevcut değil. @@ -292,73 +292,73 @@ Toplam kalan süre %5 %1 okunabilir değil. - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. %1 ve diğer %2 dosya kaldırıldı. - + %1 has been removed. %1 names a file. %1 kaldırıldı. - + %1 and %2 other files have been downloaded. %1 names a file. %1 ve diğer %2 dosya indirildi. - + %1 has been downloaded. %1 names a file. %1 indirildi. - + %1 and %2 other files have been updated. %1 ve diğer %2 dosya güncellendi. - + %1 has been updated. %1 names a file. %1 güncellendi. - + %1 has been renamed to %2 and %3 other files have been renamed. %1, %2 olarak ve diğer %3 dosya adlandırıldı. - + %1 has been renamed to %2. %1 and %2 name files. %1, %2 olarak adlandırıldı. - + %1 has been moved to %2 and %3 other files have been moved. %1, %2 konumuna ve diğer %3 dosya taşındı. - + %1 has been moved to %2. %1, %2 konumuna taşındı. - + Sync Activity Eşitleme Etkinliği - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -367,17 +367,17 @@ Bu, klasörün sessizce yeniden yapılandırılması veya tüm dosyaların el il Bu işlemi gerçekleştirmek istediğinize emin misiniz? - + Remove All Files? Tüm Dosyalar Kaldırılsın mı? - + Remove all files Tüm dosyaları kaldır - + Keep files Dosyaları koru @@ -395,52 +395,52 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz? Eski eşitleme günlüğü '%1' bulundu ancak kaldırılamadı. Başka bir uygulama tarafından kullanılmadığından emin olun. - + Undefined State. Tanımlanmamış Durum. - + Waits to start syncing. Eşitleme başlatmak için bekleniyor. - + Preparing for sync. Eşitleme için hazırlanıyor. - + Sync is running. Eşitleme çalışıyor. - + Last Sync was successful. Son Eşitleme başarılı oldu. - + Last Sync was successful, but with warnings on individual files. Son eşitleme başarılıydı, ancak tekil dosyalarda uyarılar vardı. - + Setup Error. Kurulum Hatası. - + User Abort. Kullanıcı İptal Etti. - + Sync is paused. Eşitleme duraklatıldı. - + %1 (Sync is paused) %1 (Eşitleme duraklatıldı) @@ -449,17 +449,17 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz? Mirall::FolderStatusDelegate - + File Dosya - + Syncing all files in your account with Hesabınızdaki tüm dosyaların eşitlendiği klasör: - + Remote path: %1 Uzak yol: %1 @@ -1314,7 +1314,12 @@ Kullanmanız önerilmez. ; Geri Yükleme Başarısız: - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 Bir dosya veya dizin bir salt okunur paylaşımdan kaldırılmıştı, ancak geri yükleme başarısız oldu: %1 @@ -2048,132 +2053,137 @@ Bu dosyaları tekrar eşitlemeyi deneyin. Mirall::ownCloudGui - + Please sign in Lütfen oturum açın - + Disconnected from server Sunucu bağlantısı kesildi - + Folder %1: %2 Klasör %1: %2 - + No sync folders configured. Yapılandırılmış eşitleme klasörü yok. - + + There are no sync folders configured. + + + + None. Hiçbir şey. - + Recent Changes Son Değişiklikler - + Open %1 folder %1 klasörünü aç - + Managed Folders: Yönetilen Klasörler: - + Open folder '%1' '%1' klasörünü aç - + Open %1 in browser %1'ı tarayıcıda aç - + Calculating quota... Kota hesaplanıyor... - + Unknown status Bilinmeyen durum - + Settings... Ayarlar... - + Details... Ayrıntılar... - + Help Yardım - + Quit %1 %1'tan çık - + Sign in... Oturum aç... - + Sign out Oturumu kapat - + Quota n/a Kota kullanılamıyor - + %1% of %2 in use %2'ın % %1 kısmı kullanımda - + No items synced recently Yakın zamanda eşitlenen öge yok - + Discovering %1 Ortaya çıkarılan: %1 - + Syncing %1 of %2 (%3 left) Eşitlenen %1/%2 (%3 kaldı) - + Syncing %1 (%2 left) Eşitlenen %1 (%2 kaldı) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Güncel diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts index 9f6eaab9bb..7142249716 100644 --- a/translations/mirall_uk.ts +++ b/translations/mirall_uk.ts @@ -129,53 +129,53 @@ Відновлення - + Confirm Folder Remove Підтвердіть видалення каталогу - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>Дійсно бажаєте зупинити синхронізацію теки <i>%1</i>?</p><p><b>Примітка:</b> Файли у вашому клієнті не будуть видалені.</p> - + Confirm Folder Reset - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. Жодного %1 підключення не налаштовано. - + Sync Running Виконується синхронізація @@ -185,34 +185,34 @@ - + The syncing operation is running.<br/>Do you want to terminate it? Виконується процедура синхронізації.<br/>Бажаєте відмінити? - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. @@ -291,73 +291,73 @@ Total time left %5 %1 не читається. - + %1: %2 - + %1 and %2 other files have been removed. %1 names a file. - + %1 has been removed. %1 names a file. - + %1 and %2 other files have been downloaded. %1 names a file. - + %1 has been downloaded. %1 names a file. - + %1 and %2 other files have been updated. - + %1 has been updated. %1 names a file. - + %1 has been renamed to %2 and %3 other files have been renamed. - + %1 has been renamed to %2. %1 and %2 name files. - + %1 has been moved to %2 and %3 other files have been moved. - + %1 has been moved to %2. - + Sync Activity - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -366,17 +366,17 @@ Are you sure you want to perform this operation? Ви дійсно бажаєте продовжити цю операцію? - + Remove All Files? Видалити усі файли? - + Remove all files Видалити усі файли - + Keep files Зберегти файли @@ -394,52 +394,52 @@ Are you sure you want to perform this operation? - + Undefined State. Невизначений стан. - + Waits to start syncing. Очікування початку синхронізації. - + Preparing for sync. Підготовка до синхронізації - + Sync is running. Синхронізація запущена. - + Last Sync was successful. Остання синхронізація була успішною. - + Last Sync was successful, but with warnings on individual files. - + Setup Error. Помилка установки. - + User Abort. - + Sync is paused. - + %1 (Sync is paused) @@ -448,17 +448,17 @@ Are you sure you want to perform this operation? Mirall::FolderStatusDelegate - + File Файл - + Syncing all files in your account with Синхронізація усіх ваших файлів з - + Remote path: %1 Віддалений шлях: %1 @@ -1309,7 +1309,12 @@ It is not advisable to use it. - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 @@ -2040,132 +2045,137 @@ It is not advisable to use it. Mirall::ownCloudGui - + Please sign in - + Disconnected from server - + Folder %1: %2 - + No sync folders configured. Жодна тека не налаштована для синхронізації. - + + There are no sync folders configured. + + + + None. - + Recent Changes Недавні зміни - + Open %1 folder Відкрити %1 каталог - + Managed Folders: Керовані теки: - + Open folder '%1' - + Open %1 in browser - + Calculating quota... - + Unknown status - + Settings... - + Details... - + Help Допомога - + Quit %1 - + Sign in... - + Sign out - + Quota n/a - + %1% of %2 in use - + No items synced recently - + Discovering %1 - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts index 2c6a8b33d7..3aa82d765b 100644 --- a/translations/mirall_zh_CN.ts +++ b/translations/mirall_zh_CN.ts @@ -129,53 +129,53 @@ 继续 - + Confirm Folder Remove 确认移除文件夹 - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>你真的要停止 <i>%1%</i> 文件夹的同步吗？</p><p><b>注释：</b>这不会删除你客户端中的文件。</p> - + Confirm Folder Reset 确认文件夹重置 - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> <p>您真希望重置文件夹 <i>%1</i> 并重新构建您的客户端数据库吗？</p><p><b>注意：</b>此功能设计仅用作维护操作。没有文件将被移除，但这将导致大量的数据传输。根据文件夹的大小，这一过程将持续几分钟到几小时。请仅在管理员指导的情况下使用此功能。</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" %1 %2 - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. 没有 %1 连接配置。 - + Sync Running 同步正在运行 @@ -185,34 +185,34 @@ 没有配置的帐号。 - + The syncing operation is running.<br/>Do you want to terminate it? 正在执行同步。<br />您确定要关闭它吗？ - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. 已连接到<a href="%1">%2</a>。 - + Connected to <a href="%1">%2</a> as <i>%3</i>. 已作为 <i>%3</i> 连接到 <a href="%1">%2</a>。 - + Currently there is no storage usage information available. 目前没有储存使用量信息可用。 @@ -291,73 +291,73 @@ Total time left %5 %1 不可读。 - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. - + %1 has been removed. %1 names a file. %1 已移除。 - + %1 and %2 other files have been downloaded. %1 names a file. - + %1 has been downloaded. %1 names a file. %1 已下载。 - + %1 and %2 other files have been updated. %1 和 %2 个其它文件已更新。 - + %1 has been updated. %1 names a file. %1 已更新。 - + %1 has been renamed to %2 and %3 other files have been renamed. - + %1 has been renamed to %2. %1 and %2 name files. - + %1 has been moved to %2 and %3 other files have been moved. - + %1 has been moved to %2. %1 已移动至 %2。 - + Sync Activity 同步活动 - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? @@ -366,17 +366,17 @@ Are you sure you want to perform this operation? 你确定执行该操作吗？ - + Remove All Files? 删除所有文件？ - + Remove all files 删除所有文件 - + Keep files 保持所有文件 @@ -394,52 +394,52 @@ Are you sure you want to perform this operation? 一个旧的同步日志 '%1' 被找到，但是不能被移除。请确定没有应用程序正在使用它。 - + Undefined State. 未知状态。 - + Waits to start syncing. 等待启动同步。 - + Preparing for sync. 准备同步。 - + Sync is running. 同步正在运行。 - + Last Sync was successful. 最后一次同步成功。 - + Last Sync was successful, but with warnings on individual files. 上次同步已成功，不过一些文件出现了警告。 - + Setup Error. 安装失败 - + User Abort. 用户撤销。 - + Sync is paused. 同步已暂停。 - + %1 (Sync is paused) %1 (同步已暂停) @@ -448,17 +448,17 @@ Are you sure you want to perform this operation? Mirall::FolderStatusDelegate - + File 文件 - + Syncing all files in your account with 同步所有的文件到你的帐户里通过 - + Remote path: %1 远程路径： %1 @@ -1311,7 +1311,12 @@ It is not advisable to use it. - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 @@ -2044,132 +2049,137 @@ It is not advisable to use it. Mirall::ownCloudGui - + Please sign in 请登录 - + Disconnected from server 已从服务器断开 - + Folder %1: %2 文件夹 %1: %2 - + No sync folders configured. 没有已配置的同步文件夹。 - + + There are no sync folders configured. + + + + None. 无。 - + Recent Changes 最近修改 - + Open %1 folder 打开 %1 目录 - + Managed Folders: 管理的文件夹： - + Open folder '%1' 打开文件夹“%1” - + Open %1 in browser 在浏览器中打开%1 - + Calculating quota... 计算配额.... - + Unknown status 未知状态 - + Settings... 设置... - + Details... 细节... - + Help 帮助 - + Quit %1 退出 %1 - + Sign in... 登录... - + Sign out 注销 - + Quota n/a 配额无限制 - + %1% of %2 in use 已使用 %2，总计 %1% - + No items synced recently - + Discovering %1 - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) %1 (%2, %3) - + Up to date 更新 diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts index f74d9e50db..9985780d22 100644 --- a/translations/mirall_zh_TW.ts +++ b/translations/mirall_zh_TW.ts @@ -129,53 +129,53 @@ 繼續 - + Confirm Folder Remove 確認移除資料夾 - + <p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p> <p>您確定要停止同步資料夾<i>%1</i>?</p><p><b>注意:</b> 這不會從您的裝置移除檔案。</p> - + Confirm Folder Reset 資料夾重設確認 - + <p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p> - + Discovering %1 - + %1 %2 Example text: "uploading foobar.png" - + %1 (%3%) of %2 server space in use. - + No connection to %1 at <a href="%2">%3</a>. - + No %1 connection configured. 無%1連線設定 - + Sync Running 同步中 @@ -185,34 +185,34 @@ - + The syncing operation is running.<br/>Do you want to terminate it? 正在同步中<br/>你真的想要中斷？ - + %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - + %1 of %2, file %3 of %4 Total time left %5 - + Connected to <a href="%1">%2</a>. - + Connected to <a href="%1">%2</a> as <i>%3</i>. - + Currently there is no storage usage information available. @@ -291,90 +291,90 @@ Total time left %5 %1 是不可讀的 - + %1: %2 %1: %2 - + %1 and %2 other files have been removed. %1 names a file. - + %1 has been removed. %1 names a file. - + %1 and %2 other files have been downloaded. %1 names a file. - + %1 has been downloaded. %1 names a file. - + %1 and %2 other files have been updated. - + %1 has been updated. %1 names a file. - + %1 has been renamed to %2 and %3 other files have been renamed. - + %1 has been renamed to %2. %1 and %2 name files. - + %1 has been moved to %2 and %3 other files have been moved. - + %1 has been moved to %2. - + Sync Activity 同步啟用 - + This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation? - + Remove All Files? 移除所有檔案? - + Remove all files 移除所有檔案 - + Keep files 保留檔案 @@ -392,52 +392,52 @@ Are you sure you want to perform this operation? 發現較舊的同步處理日誌'%1'，但無法移除。請確認沒有應用程式正在使用它。 - + Undefined State. 未知狀態 - + Waits to start syncing. 等待啟動同步 - + Preparing for sync. 正在準備同步。 - + Sync is running. 同步執行中 - + Last Sync was successful. 最後一次同步成功 - + Last Sync was successful, but with warnings on individual files. - + Setup Error. 安裝失敗 - + User Abort. 使用者中斷。 - + Sync is paused. 同步已暫停 - + %1 (Sync is paused) %1 (同步暫停) @@ -446,17 +446,17 @@ Are you sure you want to perform this operation? Mirall::FolderStatusDelegate - + File 檔案 - + Syncing all files in your account with - + Remote path: %1 遠端路徑: %1 @@ -1307,7 +1307,12 @@ It is not advisable to use it. - + + Operation was canceled by user interaction. + + + + A file or directory was removed from a read only share, but restoring failed: %1 @@ -2038,132 +2043,137 @@ It is not advisable to use it. Mirall::ownCloudGui - + Please sign in 請登入 - + Disconnected from server - + Folder %1: %2 資料夾 %1: %2 - + No sync folders configured. 尚未指定同步資料夾 - + + There are no sync folders configured. + + + + None. 無。 - + Recent Changes - + Open %1 folder 開啟%1資料夾 - + Managed Folders: 管理的資料夾: - + Open folder '%1' 開啟 %1 資料夾 - + Open %1 in browser 瀏覽器中開啟 %1 - + Calculating quota... - + Unknown status 未知狀態 - + Settings... 設定… - + Details... 細節… - + Help 說明 - + Quit %1 離開 %1 - + Sign in... 登入中... - + Sign out 登出 - + Quota n/a 無配額 - + %1% of %2 in use - + No items synced recently - + Discovering %1 - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date 最新的 From 9743fee8f9cc17b0cb6fb12efa934eab2eb3539c Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Thu, 21 Aug 2014 02:06:14 -0400 Subject: [PATCH 78/94] [tx-robot] updated from transifex --- admin/win/nsi/l10n/Greek.nsh | 4 ++-- admin/win/nsi/l10n/Russian.nsh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/win/nsi/l10n/Greek.nsh b/admin/win/nsi/l10n/Greek.nsh index 32aba14a25..9debdf18e1 100644 --- a/admin/win/nsi/l10n/Greek.nsh +++ b/admin/win/nsi/l10n/Greek.nsh @@ -15,6 +15,8 @@ StrCpy $PageReinstall_SAME_Field_3 " StrCpy $UNINSTALLER_APPDATA_TITLE " ${APPLICATION_NAME}" StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE " ." StrCpy $SEC_APPLICATION_DETAILS " ${APPLICATION_NAME} ." +StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION " Windows" +StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint " Windows" StrCpy $OPTION_SECTION_SC_START_MENU_SECTION " " StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint " ${APPLICATION_NAME} ." StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION " " @@ -42,5 +44,3 @@ StrCpy $INIT_INSTALLER_RUNNING " StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN " , " StrCpy $INIT_UNINSTALLER_RUNNING " ." StrCpy $SectionGroup_Shortcuts "" -StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer" -StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons for Windows Explorer" diff --git a/admin/win/nsi/l10n/Russian.nsh b/admin/win/nsi/l10n/Russian.nsh index f314a34102..9c7cc86d5b 100644 --- a/admin/win/nsi/l10n/Russian.nsh +++ b/admin/win/nsi/l10n/Russian.nsh @@ -15,6 +15,8 @@ StrCpy $PageReinstall_SAME_Field_3 "Удалить ${APPLICATION_NAME}" StrCpy $UNINSTALLER_APPDATA_TITLE "Удалить ${APPLICATION_NAME}" StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Выберите опцию обслуживания для исполнения." StrCpy $SEC_APPLICATION_DETAILS "Установка зависимостей приложения ${APPLICATION_NAME}" +StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Значки статуса для проводника Windows" +StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Установка значков статуса для проводника Windows" StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Ярлык в меню Пуск" StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Добавление ярлыка ${APPLICATION_NAME} в меню Пуск" StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Ярлык на рабочем столе" @@ -42,5 +44,3 @@ StrCpy $INIT_INSTALLER_RUNNING "Установщик уже запущен." StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Этот деинсталятор требует права администратора, попытайтесь ещё" StrCpy $INIT_UNINSTALLER_RUNNING "Программа удаления уже выполняется." StrCpy $SectionGroup_Shortcuts "Ярлыки" -StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer" -StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons for Windows Explorer" From 54e2b9345b60666ebc57a6476c4d075a8d8b7a4d Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 21 Aug 2014 11:00:57 +0200 Subject: [PATCH 79/94] GUI: on Mac do not call slotUpdateAccountIcon --- src/mirall/owncloudgui.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp index 7e9e710648..994251a234 100644 --- a/src/mirall/owncloudgui.cpp +++ b/src/mirall/owncloudgui.cpp @@ -271,9 +271,11 @@ void ownCloudGui::slotComputeOverallSyncStatus() QIcon icon = Theme::instance()->syncStateIcon(SyncResult::Problem); _tray->setIcon( icon ); _tray->setToolTip(tr("There are no sync folders configured.")); +#if !defined Q_OS_MAC if( _settingsDialog ) { _settingsDialog->slotUpdateAccountIcon(icon); } +#endif } } } From 315c2eb4cabe5b80cd99e942c57a76feb2158f8d Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Thu, 21 Aug 2014 11:05:12 +0200 Subject: [PATCH 80/94] Windows Shell Integration: Ensure precedence --- .../OCShellExtensions/OCOverlays/DllMain.cpp | 2 +- .../OCOverlays/OverlayConstants.h | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/shell_integration/windows/OCShellExtensions/OCOverlays/DllMain.cpp b/shell_integration/windows/OCShellExtensions/OCOverlays/DllMain.cpp index 545f0c9a34..0539e3629d 100644 --- a/shell_integration/windows/OCShellExtensions/OCOverlays/DllMain.cpp +++ b/shell_integration/windows/OCShellExtensions/OCOverlays/DllMain.cpp @@ -108,7 +108,7 @@ HRESULT RegisterCLSID(LPCOLESTR guidStr, PCWSTR overlayStr, PCWSTR szModule) return hResult; } - hResult = OCOverlayRegistrationHandler::RegisterCOMObject(szModule, overlayStr, guid); + hResult = OCOverlayRegistrationHandler::RegisterCOMObject(szModule, OVERLAY_GENERIC_NAME, guid); if (!SUCCEEDED(hResult)) { return hResult; diff --git a/shell_integration/windows/OCShellExtensions/OCOverlays/OverlayConstants.h b/shell_integration/windows/OCShellExtensions/OCOverlays/OverlayConstants.h index 3af9e73dc2..410aa26606 100644 --- a/shell_integration/windows/OCShellExtensions/OCOverlays/OverlayConstants.h +++ b/shell_integration/windows/OCShellExtensions/OCOverlays/OverlayConstants.h @@ -22,14 +22,17 @@ #define OVERLAY_GUID_WARNING L"{0960F096-F328-48A3-B746-276B1E3C3722}" #define OVERLAY_GUID_WARNING_SHARED L"{0960F097-F328-48A3-B746-276B1E3C3722}" -#define OVERLAY_NAME_ERROR L"OCError" -#define OVERLAY_NAME_ERROR_SHARED L"OCErrorShared" -#define OVERLAY_NAME_OK L"OCOK" -#define OVERLAY_NAME_OK_SHARED L"OCOKShared" -#define OVERLAY_NAME_SYNC L"OCSync" -#define OVERLAY_NAME_SYNC_SHARED L"OCSyncShared" -#define OVERLAY_NAME_WARNING L"OCWarning" -#define OVERLAY_NAME_WARNING_SHARED L"OCWarningShared" +#define OVERLAY_GENERIC_NAME L"OC Overlay Handler" + +// two spaces to put us a head of the competition :/ +#define OVERLAY_NAME_ERROR L" OCError" +#define OVERLAY_NAME_ERROR_SHARED L" OCErrorShared" +#define OVERLAY_NAME_OK L" OCOK" +#define OVERLAY_NAME_OK_SHARED L" OCOKShared" +#define OVERLAY_NAME_SYNC L" OCSync" +#define OVERLAY_NAME_SYNC_SHARED L" OCSyncShared" +#define OVERLAY_NAME_WARNING L" OCWarning" +#define OVERLAY_NAME_WARNING_SHARED L" OCWarningShared" #define REGISTRY_OVERLAY_KEY L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ShellIconOverlayIdentifiers" #define REGISTRY_CLSID L"CLSID" From 1cf956ec214f87fe6799a03e5692b7641156b357 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 21 Aug 2014 11:26:34 +0200 Subject: [PATCH 81/94] Discovery phase: clear the callbacks after use --- src/mirall/discoveryphase.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/mirall/discoveryphase.cpp b/src/mirall/discoveryphase.cpp index 3963ccfee4..f81dc0a26d 100644 --- a/src/mirall/discoveryphase.cpp +++ b/src/mirall/discoveryphase.cpp @@ -83,7 +83,15 @@ void DiscoveryJob::start() { csync_set_log_level(_log_level); csync_set_log_userdata(_log_userdata); lastUpdateProgressCallbackCall.invalidate(); - emit finished(csync_update(_csync_ctx)); + int ret = csync_update(_csync_ctx); + + _csync_ctx->checkBlackListHook = 0; + _csync_ctx->checkBlackListData = 0; + + _csync_ctx->callbacks.update_callback = 0; + _csync_ctx->callbacks.update_callback_userdata = 0; + + emit finished(ret); deleteLater(); } From aabcf807744f322be5b63c966b7750a0003c8b25 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 21 Aug 2014 11:33:38 +0200 Subject: [PATCH 82/94] Sync engine: Take also in account the fact that the instruction can be IGNORE on both tree --- src/mirall/syncengine.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp index 2879bf3f9f..d282df4029 100644 --- a/src/mirall/syncengine.cpp +++ b/src/mirall/syncengine.cpp @@ -265,7 +265,8 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote ) item._file = fileUtf8; item._originalFile = item._file; - if (item._instruction == CSYNC_INSTRUCTION_NONE) { + if (item._instruction == CSYNC_INSTRUCTION_NONE + || (item._instruction == CSYNC_INSTRUCTION_IGNORE && file->instruction != CSYNC_INSTRUCTION_NONE)) { item._instruction = file->instruction; item._modtime = file->modtime; } else { From 2219d409a497a95e09a83a181dd4902db026fa40 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Thu, 21 Aug 2014 11:48:59 +0200 Subject: [PATCH 83/94] Update binary submodule --- binary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binary b/binary index 82d72bc62d..7dd863ea84 160000 --- a/binary +++ b/binary @@ -1 +1 @@ -Subproject commit 82d72bc62d1f036a4d73a8e9375b52db6e0573b3 +Subproject commit 7dd863ea84c465adf741bcfbeba0291eff652316 From dc8f437b31b16023453807c764f6d7bc5c8d48fd Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 21 Aug 2014 12:43:04 +0200 Subject: [PATCH 84/94] Excludes: Add an context free implementation of exclude file loading. So that we are more thread safe. --- csync/src/csync.c | 2 +- csync/src/csync_exclude.c | 48 +++++++++++++++++++++++---------------- csync/src/csync_exclude.h | 10 +++++++- src/mirall/folderman.cpp | 6 +++++ src/mirall/socketapi.cpp | 44 +++++++++++++++++++++++++++-------- src/mirall/socketapi.h | 8 ++++++- 6 files changed, 86 insertions(+), 32 deletions(-) diff --git a/csync/src/csync.c b/csync/src/csync.c index 5c4cab8a20..3d76791668 100644 --- a/csync/src/csync.c +++ b/csync/src/csync.c @@ -660,7 +660,7 @@ int csync_add_exclude_list(CSYNC *ctx, const char *path) { return -1; } - return csync_exclude_load(ctx, path); + return csync_exclude_load(path, &ctx->excludes); } void csync_clear_exclude_list(CSYNC *ctx) diff --git a/csync/src/csync_exclude.c b/csync/src/csync_exclude.c index eb97eeaa4b..7579df3b89 100644 --- a/csync/src/csync_exclude.c +++ b/csync/src/csync_exclude.c @@ -40,28 +40,28 @@ #define CSYNC_LOG_CATEGORY_NAME "csync.exclude" #include "csync_log.h" -static int _csync_exclude_add(CSYNC *ctx, const char *string) { +static int _csync_exclude_add(c_strlist_t **inList, const char *string) { c_strlist_t *list; - if (ctx->excludes == NULL) { - ctx->excludes = c_strlist_new(32); - if (ctx->excludes == NULL) { + if (*inList == NULL) { + *inList = c_strlist_new(32); + if (*inList == NULL) { return -1; } } - if (ctx->excludes->count == ctx->excludes->size) { - list = c_strlist_expand(ctx->excludes, 2 * ctx->excludes->size); + if ((*inList)->count == (*inList)->size) { + list = c_strlist_expand(*inList, 2 * (*inList)->size); if (list == NULL) { return -1; } - ctx->excludes = list; + *inList = list; } - return c_strlist_add(ctx->excludes, string); + return c_strlist_add(*inList, string); } -int csync_exclude_load(CSYNC *ctx, const char *fname) { +int csync_exclude_load(const char *fname, c_strlist_t **list) { int fd = -1; int i = 0; int rc = -1; @@ -70,7 +70,7 @@ int csync_exclude_load(CSYNC *ctx, const char *fname) { char *entry = NULL; mbchar_t *w_fname; - if (ctx == NULL || fname == NULL) { + if (fname == NULL) { return -1; } @@ -119,7 +119,7 @@ int csync_exclude_load(CSYNC *ctx, const char *fname) { buf[i] = '\0'; if (*entry != '#') { CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Adding entry: %s", entry); - rc = _csync_exclude_add(ctx, entry); + rc = _csync_exclude_add(list, entry); if (rc < 0) { goto out; } @@ -145,6 +145,21 @@ void csync_exclude_destroy(CSYNC *ctx) { } CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype) { + + CSYNC_EXCLUDE_TYPE match = CSYNC_NOT_EXCLUDED; + + match = csync_excluded_no_ctx( ctx->excludes, path, filetype ); + + if (match == CSYNC_NOT_EXCLUDED && ctx->checkBlackListHook) { + if (ctx->checkBlackListHook(ctx->checkBlackListData, path)) { + match = CSYNC_FILE_EXCLUDE_LIST; + } + } + + return match; +} + +CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path, int filetype) { size_t i = 0; const char *p = NULL; char *bname = NULL; @@ -226,14 +241,14 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype) { SAFE_FREE(bname); SAFE_FREE(dname); - if (ctx == NULL || ctx->excludes == NULL) { + if( ! excludes ) { goto out; } /* Loop over all exclude patterns and evaluate the given path */ - for (i = 0; match == CSYNC_NOT_EXCLUDED && i < ctx->excludes->count; i++) { + for (i = 0; match == CSYNC_NOT_EXCLUDED && i < excludes->count; i++) { bool match_dirs_only = false; - char *pattern_stored = c_strdup(ctx->excludes->vector[i]); + char *pattern_stored = c_strdup(excludes->vector[i]); char* pattern = pattern_stored; type = CSYNC_FILE_EXCLUDE_LIST; @@ -313,11 +328,6 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype) { SAFE_FREE(dname); } - if (match == CSYNC_NOT_EXCLUDED && ctx->checkBlackListHook) { - if (ctx->checkBlackListHook(ctx->checkBlackListData, path)) { - match = CSYNC_FILE_EXCLUDE_LIST; - } - } out: diff --git a/csync/src/csync_exclude.h b/csync/src/csync_exclude.h index fabeecafcd..9e30d8a73f 100644 --- a/csync/src/csync_exclude.h +++ b/csync/src/csync_exclude.h @@ -37,7 +37,7 @@ typedef enum csync_exclude_type_e CSYNC_EXCLUDE_TYPE; * * @return 0 on success, -1 if an error occured with errno set. */ -int csync_exclude_load(CSYNC *ctx, const char *fname); +int csync_exclude_load(const char *fname, c_strlist_t **list); /** * @brief Clear the exclude list in memory. @@ -65,6 +65,14 @@ void csync_exclude_destroy(CSYNC *ctx); */ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype); +/** + * @brief csync_excluded_no_ctx + * @param excludes + * @param path + * @param filetype + * @return + */ +CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path, int filetype); #endif /* _CSYNC_EXCLUDE_H */ /* vim: set ft=c.doxygen ts=8 sw=2 et cindent: */ diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp index c530c1794a..b8973d55f6 100644 --- a/src/mirall/folderman.cpp +++ b/src/mirall/folderman.cpp @@ -53,6 +53,7 @@ FolderMan::FolderMan(QObject *parent) : _instance = this; _socketApi = new SocketApi(this); + _socketApi->slotReadExcludes(); } FolderMan *FolderMan::instance() @@ -489,6 +490,11 @@ void FolderMan::slotScheduleFolderSync() _currentSyncFolder = alias; f->startSync( QStringList() ); + + // reread the excludes of the socket api + // FIXME: the excludes need rework. + _socketApi->slotClearExcludesList(); + _socketApi->slotReadExcludes(); } } } diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp index 2ef92795ef..f657cd4b79 100644 --- a/src/mirall/socketapi.cpp +++ b/src/mirall/socketapi.cpp @@ -43,8 +43,8 @@ enum csync_exclude_type_e { }; typedef enum csync_exclude_type_e CSYNC_EXCLUDE_TYPE; -CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype); - +CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path, int filetype); +int csync_exclude_load(const char *fname, c_strlist_t **list); } namespace { @@ -57,7 +57,7 @@ namespace Mirall { namespace SocketApiHelper { -SyncFileStatus fileStatus(Folder *folder, const QString& systemFileName ); +SyncFileStatus fileStatus(Folder *folder, const QString& systemFileName, c_strlist_t *excludes ); /** * @brief recursiveFolderStatus @@ -70,7 +70,7 @@ SyncFileStatus fileStatus(Folder *folder, const QString& systemFileName ); */ // compute the file status of a directory recursively. It returns either // "all in sync" or "needs update" or "error", no more details. -SyncFileStatus recursiveFolderStatus(Folder *folder, const QString& fileName ) +SyncFileStatus recursiveFolderStatus(Folder *folder, const QString& fileName, c_strlist_t *excludes ) { QDir dir(folder->path() + fileName); @@ -84,14 +84,14 @@ SyncFileStatus recursiveFolderStatus(Folder *folder, const QString& fileName ) SyncFileStatus sfs; if( fi.isDir() ) { - sfs = recursiveFolderStatus(folder, normalizedFile ); + sfs = recursiveFolderStatus(folder, normalizedFile, excludes ); } else { QString fs( normalizedFile ); if( fileName.isEmpty() ) { // toplevel, no slash etc. needed. fs = entry.normalized(QString::NormalizationForm_C); } - sfs = fileStatus(folder, fs ); + sfs = fileStatus(folder, fs, excludes); } if( sfs.tag() == SyncFileStatus::STATUS_STAT_ERROR || sfs.tag() == SyncFileStatus::STATUS_ERROR ) { @@ -106,7 +106,7 @@ SyncFileStatus recursiveFolderStatus(Folder *folder, const QString& fileName ) /** * Get status about a single file. */ -SyncFileStatus fileStatus(Folder *folder, const QString& systemFileName ) +SyncFileStatus fileStatus(Folder *folder, const QString& systemFileName, c_strlist_t *excludes ) { // FIXME: Find a way for STATUS_ERROR @@ -142,7 +142,8 @@ SyncFileStatus fileStatus(Folder *folder, const QString& systemFileName ) // '\' is ignored, so convert to unix path before passing the path in. QString unixFileName = QDir::fromNativeSeparators(fileName); - CSYNC_EXCLUDE_TYPE excl = csync_excluded(folder->csyncContext(), unixFileName.toUtf8(), type); + + CSYNC_EXCLUDE_TYPE excl = csync_excluded_no_ctx(excludes, unixFileName.toUtf8(), type); if( excl != CSYNC_NOT_EXCLUDED ) { return SyncFileStatus(SyncFileStatus::STATUS_IGNORE); } @@ -157,7 +158,7 @@ SyncFileStatus fileStatus(Folder *folder, const QString& systemFileName ) SyncFileStatus status(SyncFileStatus::STATUS_NONE); if( type == CSYNC_FTW_TYPE_DIR ) { // compute recursive status of the directory - status = recursiveFolderStatus( folder, fileName ); + status = recursiveFolderStatus( folder, fileName, excludes ); } else if(fi.lastModified() != rec._modtime ) { // file was locally modified. status.set(SyncFileStatus::STATUS_EVAL); @@ -179,6 +180,7 @@ SyncFileStatus fileStatus(Folder *folder, const QString& systemFileName ) SocketApi::SocketApi(QObject* parent) : QObject(parent) , _localServer(new QTcpServer(this)) + , _excludes(0) { // setup socket DEBUG << "Establishing SocketAPI server at" << PORT; @@ -197,6 +199,28 @@ SocketApi::~SocketApi() { DEBUG << "dtor"; _localServer->close(); + slotClearExcludesList(); +} + +void SocketApi::slotClearExcludesList() +{ + c_strlist_clear(_excludes); +} + +void SocketApi::slotReadExcludes() +{ + MirallConfigFile cfgFile; + slotClearExcludesList(); + QString excludeList = cfgFile.excludeFile( MirallConfigFile::SystemScope ); + if( !excludeList.isEmpty() ) { + qDebug() << "==== added system ignore list to socketapi:" << excludeList.toUtf8(); + csync_exclude_load(excludeList.toUtf8(), &_excludes); + } + excludeList = cfgFile.excludeFile( MirallConfigFile::UserScope ); + if( !excludeList.isEmpty() ) { + qDebug() << "==== added user defined ignore list to csync:" << excludeList.toUtf8(); + csync_exclude_load(excludeList.toUtf8(), &_excludes); + } } void SocketApi::slotNewConnection() @@ -366,7 +390,7 @@ void SocketApi::command_RETRIEVE_FILE_STATUS(const QString& argument, QTcpSocket statusString = QLatin1String("NOP"); } else { const QString file = argument.mid(syncFolder->path().length()); - SyncFileStatus fileStatus = SocketApiHelper::fileStatus(syncFolder, file); + SyncFileStatus fileStatus = SocketApiHelper::fileStatus(syncFolder, file, _excludes); statusString = fileStatus.toSocketAPIString(); } diff --git a/src/mirall/socketapi.h b/src/mirall/socketapi.h index e8f4ac02ca..cfab53ee68 100644 --- a/src/mirall/socketapi.h +++ b/src/mirall/socketapi.h @@ -16,6 +16,10 @@ #ifndef SOCKETAPI_H #define SOCKETAPI_H +extern "C" { +#include +} + #include #include #include @@ -40,7 +44,8 @@ public slots: void slotUpdateFolderView(const QString&); void slotUnregisterPath( const QString& alias ); void slotRegisterPath( const QString& alias ); - + void slotReadExcludes(); + void slotClearExcludesList(); private slots: void slotNewConnection(); void onLostConnection(); @@ -57,6 +62,7 @@ private: private: QTcpServer *_localServer; QList _listeners; + c_strlist_t *_excludes; }; } From e06e5fe55f16e664e639868cd7e224b15383e38f Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 21 Aug 2014 13:12:05 +0200 Subject: [PATCH 85/94] Excludes: Fix unit tests for the new exclude load interface. Also removed some commented lines. --- csync/tests/csync_tests/check_csync_exclude.c | 31 +++++-------------- 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/csync/tests/csync_tests/check_csync_exclude.c b/csync/tests/csync_tests/check_csync_exclude.c index f1fcb37cde..50c87808d0 100644 --- a/csync/tests/csync_tests/check_csync_exclude.c +++ b/csync/tests/csync_tests/check_csync_exclude.c @@ -25,6 +25,8 @@ #define CSYNC_TEST 1 #include "csync_exclude.c" +#define EXCLUDE_LIST_FILE SOURCEDIR"/../sync-exclude.lst" + static void setup(void **state) { CSYNC *csync; int rc; @@ -42,7 +44,7 @@ static void setup_init(void **state) { rc = csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2"); assert_int_equal(rc, 0); - rc = csync_exclude_load(csync, SOURCEDIR "/../sync-exclude.lst"); + rc = csync_exclude_load(EXCLUDE_LIST_FILE, &(csync->excludes)); assert_int_equal(rc, 0); *state = csync; @@ -66,7 +68,7 @@ static void teardown(void **state) { static void check_csync_exclude_add(void **state) { CSYNC *csync = *state; - _csync_exclude_add(csync, (const char *) "/tmp/check_csync1/*"); + _csync_exclude_add(&(csync->excludes), "/tmp/check_csync1/*"); assert_string_equal(csync->excludes->vector[0], "/tmp/check_csync1/*"); } @@ -75,10 +77,11 @@ static void check_csync_exclude_load(void **state) CSYNC *csync = *state; int rc; - rc = csync_exclude_load(csync, SOURCEDIR "/../sync-exclude.lst"); + rc = csync_exclude_load(EXCLUDE_LIST_FILE, &(csync->excludes) ); assert_int_equal(rc, 0); assert_string_equal(csync->excludes->vector[0], "*.filepart"); + assert_int_not_equal(csync->excludes->count, 0); } static void check_csync_excluded(void **state) @@ -106,15 +109,9 @@ static void check_csync_excluded(void **state) rc = csync_excluded(csync, "foo/bar/.apdisk", CSYNC_FTW_TYPE_DIR); assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST); - /* - * Pattern: .java/ - * A file wont be excluded but a directory .java will be. - */ - /* rc = csync_excluded(csync, ".java", CSYNC_FTW_TYPE_DIR); - assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST); rc = csync_excluded(csync, ".java", CSYNC_FTW_TYPE_FILE); assert_int_equal(rc, CSYNC_NOT_EXCLUDED); -*/ + /* Files in the ignored dir .java will also be ignored. */ rc = csync_excluded(csync, ".apdisk/totally_amazing.jar", CSYNC_FTW_TYPE_FILE); assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST); @@ -141,20 +138,6 @@ static void check_csync_excluded(void **state) /* Not excluded because the pattern .netscape/cache requires directory. */ rc = csync_excluded(csync, ".netscape/cache", CSYNC_FTW_TYPE_FILE); assert_int_equal(rc, CSYNC_NOT_EXCLUDED); -/* - rc = csync_excluded(csync, ".netscape/cache", CSYNC_FTW_TYPE_DIR); - assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);*/ - - /* Excluded because the parent dir .netscape/cache is ingored. */ -/* rc = csync_excluded(csync, ".netscape/cache/foo", CSYNC_FTW_TYPE_FILE); - assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST); - - rc = csync_excluded(csync, ".netscape/cache/bar.txt", CSYNC_FTW_TYPE_FILE); - assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST); - - rc = csync_excluded(csync, ".netscape/cache/longrun", CSYNC_FTW_TYPE_DIR); - assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST); -*/ } From 6025b3a91b17b080b31a5dbbd810321f652eb84d Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 21 Aug 2014 14:33:03 +0200 Subject: [PATCH 86/94] Bump version to beta1 --- VERSION.cmake | 2 +- binary | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index f0f324c73b..0105275b82 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -4,7 +4,7 @@ set( MIRALL_VERSION_PATCH 0 ) set( MIRALL_SOVERSION 0 ) if ( NOT DEFINED MIRALL_VERSION_SUFFIX ) - set( MIRALL_VERSION_SUFFIX "alpha1") #e.g. beta1, beta2, rc1 + set( MIRALL_VERSION_SUFFIX "beta1") #e.g. beta1, beta2, rc1 endif( NOT DEFINED MIRALL_VERSION_SUFFIX ) if( NOT DEFINED MIRALL_VERSION_BUILD ) diff --git a/binary b/binary index 7dd863ea84..82d72bc62d 160000 --- a/binary +++ b/binary @@ -1 +1 @@ -Subproject commit 7dd863ea84c465adf741bcfbeba0291eff652316 +Subproject commit 82d72bc62d1f036a4d73a8e9375b52db6e0573b3 From 933c7e36d192fd1291f5156bffb2ab08a839e4b2 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Thu, 21 Aug 2014 17:33:17 +0200 Subject: [PATCH 87/94] NSIS: fix target path for shell extension --- cmake/modules/NSIS.template.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index 6ece4765e4..b6a393ce00 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -476,12 +476,12 @@ SectionEnd Call InstallRedistributables ${If} ${RunningX64} !define LIBRARY_X64 - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\x64\OCUtil_x64.dll" "$INSTDIR/shellext/OCUtil_x64.dll" "$INSTDIR/shellext" - !insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\x64\OCOverlays_x64.dll" "$INSTDIR/shellext/OCOverlays_x64.dll" "$INSTDIR/shellext" + !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\x64\OCUtil_x64.dll" "$INSTDIR\shellext\OCUtil_x64.dll" "$INSTDIR\shellext" + !insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\x64\OCOverlays_x64.dll" "$INSTDIR\shellext\OCOverlays_x64.dll" "$INSTDIR\shellext" !undef LIBRARY_X64 ${Else} - !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\Win32\OCUtil_x86.dll" "$INSTDIR/shellext/OCUtil_x86.dll" "$INSTDIR/shellext" - !insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\Win32\OCOverlays_x86.dll" "$INSTDIR/shellext/OCOverlays_x86.dll" "$INSTDIR/shellext" + !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\Win32\OCUtil_x86.dll" "$INSTDIR\shellext\OCUtil_x86.dll" "$INSTDIR\shellext" + !insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\Win32\OCOverlays_x86.dll" "$INSTDIR\shellext\OCOverlays_x86.dll" "$INSTDIR\shellext" ${Endif} ${MementoSectionEnd} !endif From c60b433c422135fcaa539a12e175428bdfa344a5 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Thu, 21 Aug 2014 20:33:25 +0200 Subject: [PATCH 88/94] create shellext path --- cmake/modules/NSIS.template.in | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index b6a393ce00..ae10c1f4ba 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -474,6 +474,7 @@ SectionEnd File "${BUILD_PATH}\vcredist_x86.exe" File "${BUILD_PATH}\vcredist_x64.exe" Call InstallRedistributables + CreateDirectory "$INSTDIR\shellext" ${If} ${RunningX64} !define LIBRARY_X64 !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\x64\OCUtil_x64.dll" "$INSTDIR\shellext\OCUtil_x64.dll" "$INSTDIR\shellext" From a9f1e165b51159cc6a06ece1d6e2fa628a475982 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Fri, 22 Aug 2014 01:25:19 -0400 Subject: [PATCH 89/94] [tx-robot] updated from transifex --- translations/mirall_ca.ts | 98 ++++++++++++++++----------------- translations/mirall_cs.ts | 102 +++++++++++++++++------------------ translations/mirall_de.ts | 102 +++++++++++++++++------------------ translations/mirall_el.ts | 98 ++++++++++++++++----------------- translations/mirall_en.ts | 98 ++++++++++++++++----------------- translations/mirall_es.ts | 102 +++++++++++++++++------------------ translations/mirall_es_AR.ts | 98 ++++++++++++++++----------------- translations/mirall_et.ts | 98 ++++++++++++++++----------------- translations/mirall_eu.ts | 98 ++++++++++++++++----------------- translations/mirall_fa.ts | 98 ++++++++++++++++----------------- translations/mirall_fi.ts | 102 +++++++++++++++++------------------ translations/mirall_fr.ts | 98 ++++++++++++++++----------------- translations/mirall_gl.ts | 98 ++++++++++++++++----------------- translations/mirall_hu.ts | 98 ++++++++++++++++----------------- translations/mirall_it.ts | 102 +++++++++++++++++------------------ translations/mirall_ja.ts | 98 ++++++++++++++++----------------- translations/mirall_nl.ts | 102 +++++++++++++++++------------------ translations/mirall_pl.ts | 98 ++++++++++++++++----------------- translations/mirall_pt.ts | 98 ++++++++++++++++----------------- translations/mirall_pt_BR.ts | 102 +++++++++++++++++------------------ translations/mirall_ru.ts | 98 ++++++++++++++++----------------- translations/mirall_sk.ts | 98 ++++++++++++++++----------------- translations/mirall_sl.ts | 98 ++++++++++++++++----------------- translations/mirall_sv.ts | 98 ++++++++++++++++----------------- translations/mirall_th.ts | 98 ++++++++++++++++----------------- translations/mirall_tr.ts | 98 ++++++++++++++++----------------- translations/mirall_uk.ts | 98 ++++++++++++++++----------------- translations/mirall_zh_CN.ts | 98 ++++++++++++++++----------------- translations/mirall_zh_TW.ts | 98 ++++++++++++++++----------------- 29 files changed, 1435 insertions(+), 1435 deletions(-) diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts index 625c46e92c..dbd01575e0 100644 --- a/translations/mirall_ca.ts +++ b/translations/mirall_ca.ts @@ -385,62 +385,62 @@ Esteu segur que voleu executar aquesta operació? Mirall::FolderMan - + Could not reset folder state No es pot restablir l'estat de la carpeta - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. S'ha trobat un diari de sincronització antic '%1', però no s'ha pogut eliminar. Assegureu-vos que no hi ha cap aplicació que actualment en faci ús. - + Undefined State. Estat indefinit. - + Waits to start syncing. Espera per començar la sincronització. - + Preparing for sync. Perparant per la sincronització. - + Sync is running. S'està sincronitzant. - + Last Sync was successful. La darrera sincronització va ser correcta. - + Last Sync was successful, but with warnings on individual files. La última sincronització ha estat un èxit, però amb avisos en fitxers individuals. - + Setup Error. Error de configuració. - + User Abort. Cancel·la usuari. - + Sync is paused. La sincronització està en pausa. - + %1 (Sync is paused) %1 (Sync està pausat) @@ -1963,73 +1963,73 @@ Proveu de sincronitzar-los de nou. L'element no s'ha sincronitzat degut a errors previs: %1 - + Symbolic links are not supported in syncing. La sincronització d'enllaços simbòlics no està implementada. - + File is listed on the ignore list. El fitxer està a la llista d'ignorats. - + File contains invalid characters that can not be synced cross platform. El fitxer conté caràcters no vàlids que no es poden sincronitzar entre plataformes. - + Unable to initialize a sync journal. No es pot inicialitzar un periòdic de sincronització - + Cannot open the sync journal No es pot obrir el diari de sincronització - + Not allowed because you don't have permission to add sub-directories in that directory No es permet perquè no teniu permisos per afegir subcarpetes en aquesta carpeta - + Not allowed because you don't have permission to add parent directory No es permet perquè no teniu permisos per afegir una carpeta inferior - + Not allowed because you don't have permission to add files in that directory No es permet perquè no teniu permisos per afegir fitxers en aquesta carpeta - + Not allowed to upload this file because it is read-only on the server, restoring No es permet pujar aquest fitxer perquè només és de lectura en el servidor, es restaura - - + + Not allowed to remove, restoring No es permet l'eliminació, es restaura - + Move not allowed, item restored No es permet moure'l, l'element es restaura - + Move not allowed because %1 is read-only No es permet moure perquè %1 només és de lectura - + the destination el destí - + the source l'origen @@ -2078,112 +2078,112 @@ Proveu de sincronitzar-los de nou. - + None. Cap. - + Recent Changes Canvis recents - + Open %1 folder Obre la carpeta %1 - + Managed Folders: Fitxers gestionats: - + Open folder '%1' Obre carpeta '%1' - + Open %1 in browser Obre %1 en el navegador - + Calculating quota... Calculant la quota... - + Unknown status Estat desconegut - + Settings... Arranjament... - + Details... Detalls... - + Help Ajuda - + Quit %1 Surt %1 - + Sign in... Acredita... - + Sign out Surt - + Quota n/a Quota n/d - + %1% of %2 in use %1 de %2 en ús - + No items synced recently No hi ha elements sincronitzats recentment - + Discovering %1 - + Syncing %1 of %2 (%3 left) Sincronitzant %1 de %2 (%3 pendents) - + Syncing %1 (%2 left) Sincronitzant %1 (%2 pendents) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Actualitzat diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts index ae2e666fdc..20336ac7fc 100644 --- a/translations/mirall_cs.ts +++ b/translations/mirall_cs.ts @@ -385,62 +385,62 @@ Opravdu chcete provést tuto akci? Mirall::FolderMan - + Could not reset folder state Nelze obnovit stav složky - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. Byl nalezen starý záznam synchronizace '%1', ale nebylo možné jej odebrat. Ujistěte se, že není aktuálně používán jinou aplikací. - + Undefined State. Nedefinovaný stav. - + Waits to start syncing. Vyčkává na spuštění synchronizace. - + Preparing for sync. Příprava na synchronizaci. - + Sync is running. Synchronizace probíhá. - + Last Sync was successful. Poslední synchronizace byla úspěšná. - + Last Sync was successful, but with warnings on individual files. Poslední synchronizace byla úspěšná, ale s varováním u některých souborů - + Setup Error. Chyba nastavení. - + User Abort. Zrušení uživatelem. - + Sync is paused. Synchronizace pozastavena. - + %1 (Sync is paused) %1 (Synchronizace je pozastavena) @@ -1316,7 +1316,7 @@ Nedoporučuje se jí používat. Operation was canceled by user interaction. - + Operace byla ukončena na základě vstupu uživatele @@ -1964,73 +1964,73 @@ Zkuste provést novou synchronizaci. Položka nebyla synchronizována kvůli předchozí chybě: %1 - + Symbolic links are not supported in syncing. Symbolické odkazy nejsou při synchronizaci podporovány. - + File is listed on the ignore list. Soubor se nachází na seznamu ignorovaných. - + File contains invalid characters that can not be synced cross platform. Soubor obsahuje alespoň jeden neplatný znak, který narušuje synchronizaci v prostředí více platforem. - + Unable to initialize a sync journal. Nemohu inicializovat synchronizační žurnál. - + Cannot open the sync journal Nelze otevřít synchronizační žurnál - + Not allowed because you don't have permission to add sub-directories in that directory Není povoleno, protože nemáte oprávnění vytvářet podadresáře v tomto adresáři. - + Not allowed because you don't have permission to add parent directory Není povoleno, protože nemáte oprávnění vytvořit rodičovský adresář. - + Not allowed because you don't have permission to add files in that directory Není povoleno, protože nemáte oprávnění přidávat soubory do tohoto adresáře - + Not allowed to upload this file because it is read-only on the server, restoring Není povoleno nahrát tento soubor, protože je na serveru uložen pouze pro čtení, obnovuji - - + + Not allowed to remove, restoring Odstranění není povoleno, obnovuji - + Move not allowed, item restored Přesun není povolen, položka obnovena - + Move not allowed because %1 is read-only Přesun není povolen, protože %1 je pouze pro čtení - + the destination cílové umístění - + the source zdroj @@ -2076,115 +2076,115 @@ Zkuste provést novou synchronizaci. There are no sync folders configured. - + Nejsou nastaveny žádné složky pro synchronizaci. - + None. Nic. - + Recent Changes Poslední změny - + Open %1 folder Otevřít složku %1 - + Managed Folders: Spravované složky: - + Open folder '%1' Otevřít složku '%1' - + Open %1 in browser Otevřít %1 v prohlížeči - + Calculating quota... Počítám kvóty... - + Unknown status Neznámý stav - + Settings... Nastavení... - + Details... Podrobnosti... - + Help Nápověda - + Quit %1 Ukončit %1 - + Sign in... Přihlásit... - + Sign out Odhlásit - + Quota n/a Kvóta nedostupná - + %1% of %2 in use %1% z %2 v používání - + No items synced recently Žádné položky nebyly nedávno synchronizovány - + Discovering %1 Hledám %1 - + Syncing %1 of %2 (%3 left) Synchronizuji %1 ze %2 (zbývá %3) - + Syncing %1 (%2 left) Synchronizuji %1 (zbývá %2) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Aktuální diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts index de854de7c8..739a1549d7 100644 --- a/translations/mirall_de.ts +++ b/translations/mirall_de.ts @@ -386,62 +386,62 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen? Mirall::FolderMan - + Could not reset folder state Konnte Ordner-Zustand nicht zurücksetzen - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. Ein altes Synchronisations-Journal '%1' wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet. - + Undefined State. Undefinierter Zustand. - + Waits to start syncing. Wartet auf Beginn der Synchronistation - + Preparing for sync. Synchronisation wird vorbereitet. - + Sync is running. Synchronisation läuft. - + Last Sync was successful. Die letzte Synchronisation war erfolgreich. - + Last Sync was successful, but with warnings on individual files. Letzte Synchronisation war erfolgreich, aber mit Warnungen für einzelne Dateien. - + Setup Error. Setup-Fehler. - + User Abort. Benutzer-Abbruch - + Sync is paused. Synchronisation wurde angehalten. - + %1 (Sync is paused) %1 (Synchronisation ist pausiert) @@ -1317,7 +1317,7 @@ Es ist nicht ratsam, diese zu benutzen. Operation was canceled by user interaction. - + Der Vorgang wurde durch einen Nutzereingriff abgebrochen. @@ -1964,73 +1964,73 @@ Versuchen Sie diese nochmals zu synchronisieren. Das Element ist aufgrund vorheriger Fehler nicht synchronisiert: %1 - + Symbolic links are not supported in syncing. Symbolische Verknüpfungen werden bei der Synchronisation nicht unterstützt. - + File is listed on the ignore list. Die Datei ist in der Ignorierliste geführt. - + File contains invalid characters that can not be synced cross platform. Die Datei beinhaltet ungültige Zeichen und kann nicht plattformübergreifend synchronisiert werden. - + Unable to initialize a sync journal. Synchronisationsbericht konnte nicht initialisiert werden. - + Cannot open the sync journal Synchronisationsbericht kann nicht geöffnet werden - + Not allowed because you don't have permission to add sub-directories in that directory Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben - + Not allowed because you don't have permission to add parent directory Nicht erlaubt, da Sie keine Rechte zur Erstellung von Hauptordnern haben - + Not allowed because you don't have permission to add files in that directory Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben - + Not allowed to upload this file because it is read-only on the server, restoring Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist, Wiederherstellung - - + + Not allowed to remove, restoring Löschen nicht erlaubt, Wiederherstellung - + Move not allowed, item restored Verschieben nicht erlaubt, Element wiederhergestellt - + Move not allowed because %1 is read-only Verschieben nicht erlaubt, da %1 schreibgeschützt ist - + the destination Das Ziel - + the source Die Quelle @@ -2076,115 +2076,115 @@ Versuchen Sie diese nochmals zu synchronisieren. There are no sync folders configured. - + Es wurden keine Synchonisationsordner konfiguriert. - + None. Keine. - + Recent Changes Letzte Änderungen - + Open %1 folder Ordner %1 öffnen - + Managed Folders: Verwaltete Ordner: - + Open folder '%1' Ordner '%1' öffnen - + Open %1 in browser %1 im Browser öffnen - + Calculating quota... Berechne Quote... - + Unknown status Unbekannter Status - + Settings... Einstellungen - + Details... Details... - + Help Hilfe - + Quit %1 %1 beenden - + Sign in... Anmeldung... - + Sign out Abmeldung - + Quota n/a Quote unbekannt - + %1% of %2 in use %1% von %2 benutzt - + No items synced recently Keine kürzlich synchronisierten Elemente - + Discovering %1 Entdecke %1 - + Syncing %1 of %2 (%3 left) Synchronisiere %1 von %2 (%3 übrig) - + Syncing %1 (%2 left) Synchronisiere %1 (%2 übrig) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Aktuell diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts index bfc941bb61..b7ef044c42 100644 --- a/translations/mirall_el.ts +++ b/translations/mirall_el.ts @@ -386,62 +386,62 @@ Are you sure you want to perform this operation? Mirall::FolderMan - + Could not reset folder state Δεν ήταν δυνατό να επαναφερθεί η κατάσταση του φακέλου - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. Βρέθηκε ένα παλαιότερο αρχείο συγχρονισμού '%1', αλλά δεν μπόρεσε να αφαιρεθεί. Παρακαλώ βεβαιωθείτε ότι καμμία εφαρμογή δεν το χρησιμοποιεί αυτή τη στιγμή. - + Undefined State. Απροσδιόριστη Κατάσταση. - + Waits to start syncing. Αναμονή έναρξης συγχρονισμού. - + Preparing for sync. Προετοιμασία για συγχρονισμό. - + Sync is running. Ο συγχρονισμός εκτελείται. - + Last Sync was successful. Ο τελευταίος συγχρονισμός ήταν επιτυχής. - + Last Sync was successful, but with warnings on individual files. Ο τελευταίος συγχρονισμός ήταν επιτυχής, αλλά υπήρχαν προειδοποιήσεις σε συγκεκριμένα αρχεία. - + Setup Error. Σφάλμα Ρύθμισης. - + User Abort. Ματαίωση από Χρήστη. - + Sync is paused. Παύση συγχρονισμού. - + %1 (Sync is paused) %1 (Παύση συγχρονισμού) @@ -1964,73 +1964,73 @@ It is not advisable to use it. Το αντικείμενο δεν είναι συγχρονισμένο λόγω προηγούμενων σφαλμάτων: %1 - + Symbolic links are not supported in syncing. Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό. - + File is listed on the ignore list. Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση. - + File contains invalid characters that can not be synced cross platform. Το αρχείο περιέχει άκυρους χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα. - + Unable to initialize a sync journal. Αδυναμία προετοιμασίας αρχείου συγχρονισμού. - + Cannot open the sync journal Αδυναμία ανοίγματος του αρχείου συγχρονισμού - + Not allowed because you don't have permission to add sub-directories in that directory Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε υπο-καταλόγους σε αυτό τον κατάλογο - + Not allowed because you don't have permission to add parent directory Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε στο γονεϊκό κατάλογο - + Not allowed because you don't have permission to add files in that directory Δεν επιτρέπεται επειδή δεν έχεται δικαιώματα να προσθέσετε αρχεία σε αυτόν τον κατάλογο - + Not allowed to upload this file because it is read-only on the server, restoring Δεν επιτρέπεται να μεταφορτώσετε αυτό το αρχείο επειδή είναι μόνο για ανάγνωση στο διακομιστή, αποκατάσταση σε εξέλιξη - - + + Not allowed to remove, restoring Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη - + Move not allowed, item restored Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε - + Move not allowed because %1 is read-only Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση - + the destination ο προορισμός - + the source η προέλευση @@ -2079,112 +2079,112 @@ It is not advisable to use it. - + None. Κανένας. - + Recent Changes Πρόσφατες Αλλαγές - + Open %1 folder Άνοιγμα %1 φακέλου - + Managed Folders: Φάκελοι υπό Διαχείριση: - + Open folder '%1' Άνοιγμα φακέλου '%1' - + Open %1 in browser Άνοιγμα %1 στον περιηγητή - + Calculating quota... Υπολογισμός μεριδίου χώρου αποθήκευσης... - + Unknown status Άγνωστη κατάσταση - + Settings... Ρυθμίσεις... - + Details... Λεπτομέρειες... - + Help Βοήθεια - + Quit %1 Κλείσιμο %1 - + Sign in... Σύνδεση... - + Sign out Αποσύνδεση - + Quota n/a Μερίδιο χώρου αποθήκευσης μ/δ - + %1% of %2 in use %1% από %2 σε χρήση - + No items synced recently Κανένα στοιχείο δεν συγχρονίστηκε πρόσφατα - + Discovering %1 - + Syncing %1 of %2 (%3 left) Συγχρονισμός %1 από %2 (%3 απομένουν) - + Syncing %1 (%2 left) Συγχρονισμός %1 (%2 απομένουν) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Ενημερωμένο diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts index 0d23a5fb8c..7e7b749134 100644 --- a/translations/mirall_en.ts +++ b/translations/mirall_en.ts @@ -384,62 +384,62 @@ Are you sure you want to perform this operation? Mirall::FolderMan - + Could not reset folder state - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. - + Undefined State. - + Waits to start syncing. - + Preparing for sync. - + Sync is running. - + Last Sync was successful. - + Last Sync was successful, but with warnings on individual files. - + Setup Error. - + User Abort. - + Sync is paused. - + %1 (Sync is paused) @@ -1955,73 +1955,73 @@ It is not advisable to use it. - + Symbolic links are not supported in syncing. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2070,112 +2070,112 @@ It is not advisable to use it. - + None. - + Recent Changes - + Open %1 folder - + Managed Folders: - + Open folder '%1' - + Open %1 in browser - + Calculating quota... - + Unknown status - + Settings... - + Details... - + Help - + Quit %1 - + Sign in... - + Sign out - + Quota n/a - + %1% of %2 in use - + No items synced recently - + Discovering %1 - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts index 387a050764..0e14ea31c5 100644 --- a/translations/mirall_es.ts +++ b/translations/mirall_es.ts @@ -385,62 +385,62 @@ Está seguro de que desea realizar esta operación? Mirall::FolderMan - + Could not reset folder state No se ha podido restablecer el estado de la carpeta - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. Un antiguo registro (journal) de sincronización '%1' se ha encontrado, pero no se ha podido eliminar. Por favor asegúrese que ninguna aplicación la está utilizando. - + Undefined State. Estado no definido. - + Waits to start syncing. Esperando el inicio de la sincronización. - + Preparing for sync. Preparándose para sincronizar. - + Sync is running. Sincronización en funcionamiento. - + Last Sync was successful. La última sincronización fue exitosa. - + Last Sync was successful, but with warnings on individual files. La última sincronización fue exitosa pero con advertencias para archivos individuales. - + Setup Error. Error de configuración. - + User Abort. Interrumpir. - + Sync is paused. La sincronización está en pausa. - + %1 (Sync is paused) %1 (Sincronización en pausa) @@ -1316,7 +1316,7 @@ No se recomienda usarlo. Operation was canceled by user interaction. - + La operación fue cancelada por interacción del usuario. @@ -1963,73 +1963,73 @@ Intente sincronizar los archivos nuevamente. El elemento no está sincronizado por errores previos: %1 - + Symbolic links are not supported in syncing. Los enlaces simbolicos no estan sopertados. - + File is listed on the ignore list. El fichero está en la lista de ignorados - + File contains invalid characters that can not be synced cross platform. El fichero contiene caracteres inválidos que no pueden ser sincronizados con la plataforma. - + Unable to initialize a sync journal. No se pudo inicializar un registro (journal) de sincronización. - + Cannot open the sync journal No es posible abrir el diario de sincronización - + Not allowed because you don't have permission to add sub-directories in that directory No está permitido, porque no tiene permisos para añadir subcarpetas en este directorio. - + Not allowed because you don't have permission to add parent directory No está permitido porque no tiene permisos para añadir un directorio - + Not allowed because you don't have permission to add files in that directory No está permitido, porque no tiene permisos para crear archivos en este directorio - + Not allowed to upload this file because it is read-only on the server, restoring No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando. - - + + Not allowed to remove, restoring No está permitido borrar, restaurando. - + Move not allowed, item restored No está permitido mover, elemento restaurado. - + Move not allowed because %1 is read-only No está permitido mover, porque %1 es solo lectura. - + the destination destino - + the source origen @@ -2075,115 +2075,115 @@ Intente sincronizar los archivos nuevamente. There are no sync folders configured. - + No hay carpetas configuradas para sincronizar. - + None. Ninguno. - + Recent Changes Cambios recientes - + Open %1 folder Abrir carpeta %1 - + Managed Folders: Carpetas administradas: - + Open folder '%1' Abrir carpeta '%1' - + Open %1 in browser Abrir %1 en el navegador - + Calculating quota... Calculando cuota... - + Unknown status Estado desconocido - + Settings... Configuraciones... - + Details... Detalles... - + Help Ayuda - + Quit %1 Salir de %1 - + Sign in... Registrarse... - + Sign out Cerrar sesión - + Quota n/a Cuota no disponible - + %1% of %2 in use %1% de %2 en uso - + No items synced recently No se han sincronizado elementos recientemente - + Discovering %1 Descubriendo %1 - + Syncing %1 of %2 (%3 left) Sincronizando %1 de %2 (quedan %3) - + Syncing %1 (%2 left) Sincronizando %1 (quedan %2) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Actualizado diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts index 1f08e5e497..b94c8c833f 100644 --- a/translations/mirall_es_AR.ts +++ b/translations/mirall_es_AR.ts @@ -384,62 +384,62 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o Mirall::FolderMan - + Could not reset folder state No se pudo - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. Una antigua sincronización con journaling '%1' fue encontrada, pero no se pudo eliminar. Por favor, asegurate que ninguna aplicación la está utilizando. - + Undefined State. Estado no definido. - + Waits to start syncing. Esperando el comienzo de la sincronización. - + Preparing for sync. Preparando la sincronización. - + Sync is running. Sincronización en funcionamiento. - + Last Sync was successful. La última sincronización fue exitosa. - + Last Sync was successful, but with warnings on individual files. El último Sync fue exitoso, pero hubo advertencias en archivos individuales. - + Setup Error. Error de configuración. - + User Abort. Interrumpir. - + Sync is paused. La sincronización está en pausa. - + %1 (Sync is paused) %1 (Sincronización en pausa) @@ -1958,73 +1958,73 @@ Intente sincronizar estos nuevamente. - + Symbolic links are not supported in syncing. Los vínculos simbólicos no está soportados al sincronizar. - + File is listed on the ignore list. El archivo está en la lista de ignorados. - + File contains invalid characters that can not be synced cross platform. El archivo contiene caracteres inválidos que no pueden ser sincronizados entre plataforma. - + Unable to initialize a sync journal. Imposible inicializar un diario de sincronización. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2073,112 +2073,112 @@ Intente sincronizar estos nuevamente. - + None. Ninguno. - + Recent Changes Cambios recientes - + Open %1 folder Abrir directorio %1 - + Managed Folders: Directorios administrados: - + Open folder '%1' Abrir carpeta '%1' - + Open %1 in browser Abrir %1 en el navegador... - + Calculating quota... Calculando cuota... - + Unknown status Estado desconocido - + Settings... Configuraciones... - + Details... Detalles... - + Help Ayuda - + Quit %1 Cancelar %1 - + Sign in... Iniciando sesión... - + Sign out Salir - + Quota n/a Cuota no disponible - + %1% of %2 in use %1% de %2 en uso - + No items synced recently No se sincronizaron elementos recientemente - + Discovering %1 - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) %1 (%2, %3) - + Up to date actualizado diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts index 00517c5bb6..632af65f43 100644 --- a/translations/mirall_et.ts +++ b/translations/mirall_et.ts @@ -385,62 +385,62 @@ Oled kindel, et soovid seda operatsiooni teostada? Mirall::FolderMan - + Could not reset folder state Ei suutnud tühistada kataloogi staatust - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. Leiti vana sünkroniseeringu zurnaal '%1', kuid selle eemaldamine ebaõnnenstus. Palun veendu, et seda kasutaks ükski programm. - + Undefined State. Määramata staatus. - + Waits to start syncing. Ootab sünkroniseerimise alustamist. - + Preparing for sync. Valmistun sünkroniseerima. - + Sync is running. Sünkroniseerimine on käimas. - + Last Sync was successful. Viimane sünkroniseerimine oli edukas. - + Last Sync was successful, but with warnings on individual files. Viimane sünkroniseering oli edukas, kuid mõned failid põhjustasid tõrkeid. - + Setup Error. Seadistamise viga. - + User Abort. Kasutaja tühistamine. - + Sync is paused. Sünkroniseerimine on peatatud. - + %1 (Sync is paused) %1 (Sünkroniseerimine on peatatud) @@ -1963,73 +1963,73 @@ Proovi neid uuesti sünkroniseerida. Üksust ei sünkroniseeritud eelnenud vigade tõttu: %1 - + Symbolic links are not supported in syncing. Sümboolsed lingid ei ole sünkroniseerimisel toetatud. - + File is listed on the ignore list. Fail on märgitud ignoreeritavate nimistus. - + File contains invalid characters that can not be synced cross platform. Fail sisaldab sobimatuid sümboleid, mida ei saa sünkroniseerida erinevate platvormide vahel. - + Unable to initialize a sync journal. Ei suuda lähtestada sünkroniseeringu zurnaali. - + Cannot open the sync journal Ei suuda avada sünkroniseeringu zurnaali - + Not allowed because you don't have permission to add sub-directories in that directory Pole lubatud, kuna sul puuduvad õigused lisada sellesse kataloogi lisada alam-kataloogi - + Not allowed because you don't have permission to add parent directory Pole lubatud, kuna sul puuduvad õigused lisada ülemkataloog - + Not allowed because you don't have permission to add files in that directory Pole lubatud, kuna sul puuduvad õigused sellesse kataloogi faile lisada - + Not allowed to upload this file because it is read-only on the server, restoring Pole lubatud üles laadida, kuna tegemist on ainult-loetava serveriga, taastan - - + + Not allowed to remove, restoring Eemaldamine pole lubatud, taastan - + Move not allowed, item restored Liigutamine pole lubatud, üksus taastatud - + Move not allowed because %1 is read-only Liigutamien pole võimalik kuna %1 on ainult lugemiseks - + the destination sihtkoht - + the source allikas @@ -2078,112 +2078,112 @@ Proovi neid uuesti sünkroniseerida. - + None. Pole. - + Recent Changes Hiljutised muudatused - + Open %1 folder Ava kaust %1 - + Managed Folders: Hallatavad kaustad: - + Open folder '%1' Ava kaust '%1' - + Open %1 in browser Ava %1 veebilehitsejas - + Calculating quota... Mahupiiri arvutamine... - + Unknown status Tundmatu staatus - + Settings... Seaded... - + Details... Üksikasjad... - + Help Abiinfo - + Quit %1 Lõpeta %1 - + Sign in... Logi sisse... - + Sign out Logi välja - + Quota n/a Mahupiir n/a - + %1% of %2 in use Kasutusel %1% / %2 - + No items synced recently Ühtegi üksust pole hiljuti sünkroniseeritud - + Discovering %1 - + Syncing %1 of %2 (%3 left) Sünkroniseerin %1 %2-st (%3 veel) - + Syncing %1 (%2 left) Sünkroniseerin %1 (%2 veel) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Ajakohane diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts index 5a09c92c03..8234b9c6c8 100644 --- a/translations/mirall_eu.ts +++ b/translations/mirall_eu.ts @@ -385,62 +385,62 @@ Ziur zaude eragiketa hau egin nahi duzula? Mirall::FolderMan - + Could not reset folder state Ezin izan da karpetaren egoera berrezarri - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. Aurkitu da '%1' sinkronizazio erregistro zaharra, baina ezin da ezabatu. Ziurtatu aplikaziorik ez dela erabiltzen ari. - + Undefined State. Definitu gabeko egoera. - + Waits to start syncing. Itxoiten sinkronizazioa hasteko. - + Preparing for sync. Sinkronizazioa prestatzen. - + Sync is running. Sinkronizazioa martxan da. - + Last Sync was successful. Azkeneko sinkronizazioa ongi burutu zen. - + Last Sync was successful, but with warnings on individual files. Azkenengo sinkronizazioa ongi burutu zen, baina banakako fitxategi batzuetan abisuak egon dira. - + Setup Error. Konfigurazio errorea. - + User Abort. Erabiltzaileak bertan behera utzi. - + Sync is paused. Sinkronizazioa pausatuta dago. - + %1 (Sync is paused) %1 (Sinkronizazioa pausatuta dago) @@ -1961,73 +1961,73 @@ Saiatu horiek berriz sinkronizatzen. - + Symbolic links are not supported in syncing. Esteka sinbolikoak ezin dira sinkronizatu. - + File is listed on the ignore list. Fitxategia baztertutakoen zerrendan dago. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. Ezin izan da sinkronizazio egunerokoa hasieratu. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2076,112 +2076,112 @@ Saiatu horiek berriz sinkronizatzen. - + None. Bat ere ez. - + Recent Changes Azkenengo Aldaketak - + Open %1 folder Ireki %1 karpeta - + Managed Folders: Kudeatutako karpetak: - + Open folder '%1' Ireki '%1' karpeta - + Open %1 in browser Ireki %1 arakatzailean - + Calculating quota... - + Unknown status Egoera ezezaguna - + Settings... Ezarpenak... - + Details... Xehetasunak... - + Help Laguntza - + Quit %1 %1etik Irten - + Sign in... Saioa hasi... - + Sign out Saioa bukatu - + Quota n/a - + %1% of %2 in use %2tik %%1 erabilita - + No items synced recently Ez da azken aldian ezer sinkronizatu - + Discovering %1 Aurkitzen %1 - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Eguneratua diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts index ad24b9612b..1ba26e4856 100644 --- a/translations/mirall_fa.ts +++ b/translations/mirall_fa.ts @@ -382,62 +382,62 @@ Are you sure you want to perform this operation? Mirall::FolderMan - + Could not reset folder state نمی تواند حالت پوشه را تنظیم مجدد کند - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. - + Undefined State. موقعیت تعریف نشده - + Waits to start syncing. صبر کنید تا همگام سازی آغاز شود - + Preparing for sync. - + Sync is running. همگام سازی در حال اجراست - + Last Sync was successful. آخرین همگام سازی موفقیت آمیز بود - + Last Sync was successful, but with warnings on individual files. - + Setup Error. خطا در پیکر بندی. - + User Abort. خارج کردن کاربر. - + Sync is paused. همگام سازی فعلا متوقف شده است - + %1 (Sync is paused) @@ -1953,73 +1953,73 @@ It is not advisable to use it. - + Symbolic links are not supported in syncing. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2068,112 +2068,112 @@ It is not advisable to use it. - + None. - + Recent Changes - + Open %1 folder بازکردن %1 پوشه - + Managed Folders: پوشه های مدیریت شده: - + Open folder '%1' - + Open %1 in browser - + Calculating quota... - + Unknown status - + Settings... - + Details... - + Help راه‌نما - + Quit %1 - + Sign in... - + Sign out - + Quota n/a - + %1% of %2 in use - + No items synced recently - + Discovering %1 - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date تا تاریخ diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts index 92d5e3b077..d2636196e1 100644 --- a/translations/mirall_fi.ts +++ b/translations/mirall_fi.ts @@ -65,7 +65,7 @@ Selective Sync... - + Valikoiva synkronointi... @@ -383,62 +383,62 @@ Are you sure you want to perform this operation? Mirall::FolderMan - + Could not reset folder state Kansion tilaa ei voitu alustaa - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. - + Undefined State. Määrittelemätön tila. - + Waits to start syncing. Odottaa synkronoinnin alkamista. - + Preparing for sync. Valmistellaan synkronointia. - + Sync is running. Synkronointi on meneillään. - + Last Sync was successful. Viimeisin synkronointi suoritettiin onnistuneesti. - + Last Sync was successful, but with warnings on individual files. Viimeisin synkronointi onnistui, mutta yksittäisten tiedostojen kanssa ilmeni varoituksia. - + Setup Error. Asetusvirhe. - + User Abort. - + Sync is paused. Synkronointi on keskeytetty. - + %1 (Sync is paused) %1 (Synkronointi on keskeytetty) @@ -1958,73 +1958,73 @@ Osoitteen käyttäminen ei ole suositeltavaa. Kohdetta ei synkronoitu aiempien virheiden vuoksi: %1 - + Symbolic links are not supported in syncing. Symboliset linkit eivät ole tuettuja synkronoinnissa. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory Ei sallittu, koska sinulla ei ole oikeutta lisätä tiedostoja kyseiseen kansioon - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring Poistaminen ei ole sallittua, palautetaan - + Move not allowed, item restored Siirtäminen ei ole sallittua, kohde palautettu - + Move not allowed because %1 is read-only Siirto ei ole sallittu, koska %1 on "vain luku"-tilassa - + the destination kohde - + the source lähde @@ -2070,115 +2070,115 @@ Osoitteen käyttäminen ei ole suositeltavaa. There are no sync folders configured. - + Synkronointikansioita ei ole määritelty. - + None. - + Recent Changes Viimeisimmät muutokset - + Open %1 folder Avaa %1-kansio - + Managed Folders: Hallitut kansiot: - + Open folder '%1' Avaa kansio '%1' - + Open %1 in browser Avaa %1 selaimeen - + Calculating quota... Lasketaan kiintiötä... - + Unknown status Tuntematon tila - + Settings... Asetukset... - + Details... Tiedot... - + Help Ohje - + Quit %1 Lopeta %1 - + Sign in... Kirjaudu sisään... - + Sign out Kirjaudu ulos - + Quota n/a - + %1% of %2 in use %1%/%2 käytössä - + No items synced recently Kohteita ei ole synkronoitu äskettäin - + Discovering %1 - + Syncing %1 of %2 (%3 left) Synkronoidaan %1/%2 (%3 jäljellä) - + Syncing %1 (%2 left) Synkronoidaan %1 (%2 jäljellä) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Ajan tasalla diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts index be6d84d134..d8f5cb5c16 100644 --- a/translations/mirall_fr.ts +++ b/translations/mirall_fr.ts @@ -385,62 +385,62 @@ Voulez-vous réellement effectuer cette opération ? Mirall::FolderMan - + Could not reset folder state Impossible de réinitialiser l'état du dossier - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. Une synchronisation antérieure du journal de %1 a été trouvée, mais ne peut être supprimée. Veuillez vous assurer qu’aucune application n'est utilisée en ce moment. - + Undefined State. Statut indéfini. - + Waits to start syncing. En attente de synchronisation. - + Preparing for sync. Préparation de la synchronisation. - + Sync is running. La synchronisation est en cours. - + Last Sync was successful. Dernière synchronisation effectuée avec succès - + Last Sync was successful, but with warnings on individual files. La dernière synchronisation s'est achevée avec succès mais avec des messages d'avertissement sur des fichiers individuels. - + Setup Error. Erreur d'installation. - + User Abort. Abandon par l'utilisateur. - + Sync is paused. La synchronisation est en pause. - + %1 (Sync is paused) %1 (Synchronisation en pause) @@ -1963,73 +1963,73 @@ Il est déconseillé de l'utiliser. Cet élément n'a pas été synchronisé en raison des erreurs précédentes : %1 - + Symbolic links are not supported in syncing. Les liens symboliques ne sont pas supportés par la synchronisation. - + File is listed on the ignore list. Le fichier est présent dans la liste de fichiers à ignorer. - + File contains invalid characters that can not be synced cross platform. Le fichier contient des caractères invalides qui ne peuvent être synchronisés entre plate-formes. - + Unable to initialize a sync journal. Impossible d'initialiser un journal de synchronisation. - + Cannot open the sync journal Impossible d'ouvrir le journal de synchronisation - + Not allowed because you don't have permission to add sub-directories in that directory Non autorisé parce-que vous n'avez pas la permission d'ajouter des sous-dossiers dans ce dossier - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory Non autorisé parce-que vous n'avez pas la permission d'ajouter des fichiers dans ce dossier - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored Déplacement non autorisé, élément restauré - + Move not allowed because %1 is read-only Déplacement non autorisé car %1 est en mode lecture seule - + the destination la destination - + the source la source @@ -2078,112 +2078,112 @@ Il est déconseillé de l'utiliser. - + None. Aucun. - + Recent Changes Modifications récentes - + Open %1 folder Ouvrir le répertoire %1 - + Managed Folders: Répertoires suivis : - + Open folder '%1' Ouvrir le dossier '%1' - + Open %1 in browser Ouvrir %1 dans le navigateur - + Calculating quota... Calcul du quota... - + Unknown status Statut inconnu - + Settings... Paramètres... - + Details... Détails... - + Help Aide - + Quit %1 Quitter %1 - + Sign in... Se connecter... - + Sign out Se déconnecter - + Quota n/a Quota n/a - + %1% of %2 in use %1% de %2 occupés - + No items synced recently Aucun item synchronisé récemment - + Discovering %1 - + Syncing %1 of %2 (%3 left) Synchronisation %1 de %2 (%3 restant) - + Syncing %1 (%2 left) Synchronisation %1 (%2 restant) - + %1 (%2, %3) %1 (%2, %3) - + Up to date À jour diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts index f73e8f48c5..9c2eb836ec 100644 --- a/translations/mirall_gl.ts +++ b/translations/mirall_gl.ts @@ -385,62 +385,62 @@ Confirma que quere realizar esta operación? Mirall::FolderMan - + Could not reset folder state Non foi posíbel restabelecer o estado do cartafol - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. Atopouse un rexistro de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningunha aplicación. - + Undefined State. Estado sen definir. - + Waits to start syncing. Agardando polo comezo da sincronización. - + Preparing for sync. Preparando para sincronizar. - + Sync is running. Estase sincronizando. - + Last Sync was successful. A última sincronización fíxose correctamente. - + Last Sync was successful, but with warnings on individual files. A última sincronización fíxose correctamente, mais con algún aviso en ficheiros individuais. - + Setup Error. Erro de configuración. - + User Abort. Interrompido polo usuario. - + Sync is paused. Sincronización en pausa. - + %1 (Sync is paused) %1 (sincronización en pausa) @@ -1963,73 +1963,73 @@ Tente sincronizalos de novo. Este elemento non foi sincronizado por mor de erros anteriores: %1 - + Symbolic links are not supported in syncing. As ligazóns simbolicas non son admitidas nas sincronizacións - + File is listed on the ignore list. O ficheiro está na lista de ignorados. - + File contains invalid characters that can not be synced cross platform. O ficheiro conten caracteres incorrectos que non poden sincronizarse entre distintas plataformas. - + Unable to initialize a sync journal. Non é posíbel iniciar un rexistro de sincronización. - + Cannot open the sync journal Non foi posíbel abrir o rexistro de sincronización - + Not allowed because you don't have permission to add sub-directories in that directory Non está permitido xa que non ten permiso para engadir subdirectorios nese directorio - + Not allowed because you don't have permission to add parent directory Non está permitido xa que non ten permiso para engadir un directorio pai - + Not allowed because you don't have permission to add files in that directory Non está permitido xa que non ten permiso para engadir ficheiros nese directorio - + Not allowed to upload this file because it is read-only on the server, restoring Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando - - + + Not allowed to remove, restoring Non está permitido retiralo, restaurando - + Move not allowed, item restored Nos está permitido movelo, elemento restaurado - + Move not allowed because %1 is read-only Bon está permitido movelo xa que %1 é só de lectura - + the destination o destino - + the source a orixe @@ -2078,112 +2078,112 @@ Tente sincronizalos de novo. - + None. Nada. - + Recent Changes Cambios recentes - + Open %1 folder Abrir o cartafol %1 - + Managed Folders: Cartafoles xestionados: - + Open folder '%1' Abrir o cartafol «%1» - + Open %1 in browser Abrir %1 nun navegador - + Calculating quota... Calculando a cota... - + Unknown status Estado descoñecido - + Settings... Axustes... - + Details... Detalles... - + Help Axuda - + Quit %1 Saír de %1 - + Sign in... Rexistrarse... - + Sign out Saír - + Quota n/a Cota n/d - + %1% of %2 in use Usado %1% de %2 - + No items synced recently Non hai elementos sincronizados recentemente - + Discovering %1 Atopando %1 - + Syncing %1 of %2 (%3 left) Sincronizando %1 of %2 (restan %3) - + Syncing %1 (%2 left) Sincronizando %1 (restan %2) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Actualizado diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts index 054f5d9222..7417cb105c 100644 --- a/translations/mirall_hu.ts +++ b/translations/mirall_hu.ts @@ -382,62 +382,62 @@ Are you sure you want to perform this operation? Mirall::FolderMan - + Could not reset folder state - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. - + Undefined State. Ismeretlen állapot. - + Waits to start syncing. Várakozás a szinkronizálás elindítására. - + Preparing for sync. Előkészítés szinkronizációhoz. - + Sync is running. Szinkronizálás fut. - + Last Sync was successful. Legutolsó szinkronizálás sikeres volt. - + Last Sync was successful, but with warnings on individual files. - + Setup Error. Beállítás hiba. - + User Abort. - + Sync is paused. Szinkronizálás megállítva. - + %1 (Sync is paused) @@ -1953,73 +1953,73 @@ It is not advisable to use it. - + Symbolic links are not supported in syncing. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2068,112 +2068,112 @@ It is not advisable to use it. - + None. Nincs - + Recent Changes Legutóbbi változások - + Open %1 folder %1 mappa megnyitása - + Managed Folders: Kezelt mappák: - + Open folder '%1' - + Open %1 in browser - + Calculating quota... Kvóta kiszámítása... - + Unknown status Ismeretlen állapot - + Settings... Beállítások... - + Details... Részletek... - + Help Súgó - + Quit %1 - + Sign in... Belépés... - + Sign out Kilépés - + Quota n/a Kvóta n/a - + %1% of %2 in use - + No items synced recently - + Discovering %1 - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date Frissítve diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts index 7ed9689060..dcaa25cbca 100644 --- a/translations/mirall_it.ts +++ b/translations/mirall_it.ts @@ -385,62 +385,62 @@ Sei sicuro di voler eseguire questa operazione? Mirall::FolderMan - + Could not reset folder state Impossibile ripristinare lo stato della cartella - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. È stato trovato un vecchio registro di sincronizzazione '%1', ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando. - + Undefined State. Stato non definito. - + Waits to start syncing. Attende l'inizio della sincronizzazione. - + Preparing for sync. Preparazione della sincronizzazione. - + Sync is running. La sincronizzazione è in corso. - + Last Sync was successful. L'ultima sincronizzazione è stato completata correttamente. - + Last Sync was successful, but with warnings on individual files. Ultima sincronizzazione avvenuta, ma con avvisi relativi a singoli file. - + Setup Error. Errore di configurazione. - + User Abort. Interrotto dall'utente. - + Sync is paused. La sincronizzazione è sospesa. - + %1 (Sync is paused) %1 (La sincronizzazione è sospesa) @@ -1315,7 +1315,7 @@ Non è consigliabile utilizzarlo. Operation was canceled by user interaction. - + L'operazione è stata annullata dall'utente. @@ -1962,73 +1962,73 @@ Prova a sincronizzare nuovamente. L'elemento non è sincronizzato a causa dell'errore precedente: %1 - + Symbolic links are not supported in syncing. I collegamenti simbolici non sono supportati dalla sincronizzazione. - + File is listed on the ignore list. Il file è stato aggiunto alla lista ignorati. - + File contains invalid characters that can not be synced cross platform. Il file contiene caratteri non validi che non possono essere sincronizzati su diverse piattaforme. - + Unable to initialize a sync journal. Impossibile inizializzare il registro di sincronizzazione. - + Cannot open the sync journal Impossibile aprire il registro di sincronizzazione - + Not allowed because you don't have permission to add sub-directories in that directory Non consentito poiché non disponi dei permessi per aggiungere sottocartelle in quella cartella - + Not allowed because you don't have permission to add parent directory Non consentito poiché non disponi dei permessi per aggiungere la cartella superiore - + Not allowed because you don't have permission to add files in that directory Non consentito poiché non disponi dei permessi per aggiungere file in quella cartella - + Not allowed to upload this file because it is read-only on the server, restoring Il caricamento di questo file non è consentito poiché è in sola lettura sul server, ripristino - - + + Not allowed to remove, restoring Rimozione non consentita, ripristino - + Move not allowed, item restored Spostamento non consentito, elemento ripristinato - + Move not allowed because %1 is read-only Spostamento non consentito poiché %1 è in sola lettura - + the destination la destinazione - + the source l'origine @@ -2074,115 +2074,115 @@ Prova a sincronizzare nuovamente. There are no sync folders configured. - + Non è stata configurata alcuna cartella per la sincronizzazione. - + None. Nessuna. - + Recent Changes Modifiche recenti - + Open %1 folder Apri la cartella %1 - + Managed Folders: Cartelle gestite: - + Open folder '%1' Apri la cartella '%1' - + Open %1 in browser Apri %1 nel browser... - + Calculating quota... Calcolo quota in corso... - + Unknown status Stato sconosciuto - + Settings... Impostazioni... - + Details... Dettagli... - + Help Aiuto - + Quit %1 Esci da %1 - + Sign in... Accedi... - + Sign out Esci - + Quota n/a Quota n/d - + %1% of %2 in use %1% di %2 utilizzati - + No items synced recently Nessun elemento sincronizzato di recente - + Discovering %1 Rilevamento %1 - + Syncing %1 of %2 (%3 left) Sincronizzazione di %1 di %2 (%3 rimanenti) - + Syncing %1 (%2 left) Sincronizzazione di %1 (%2 rimanenti) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Aggiornato diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts index 65af623562..d0a1733376 100644 --- a/translations/mirall_ja.ts +++ b/translations/mirall_ja.ts @@ -385,62 +385,62 @@ Are you sure you want to perform this operation? Mirall::FolderMan - + Could not reset folder state フォルダーの状態をリセットできませんでした - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. 古い同期ジャーナル '%1' が見つかりましたが、削除できませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。 - + Undefined State. 未定義の状態。 - + Waits to start syncing. 同期開始を待機中 - + Preparing for sync. 同期の準備中。 - + Sync is running. 同期を実行中です。 - + Last Sync was successful. 最後の同期は成功しました。 - + Last Sync was successful, but with warnings on individual files. 最新の同期は成功しました。しかし、いくつかのファイルで問題がありました。 - + Setup Error. 設定エラー。 - + User Abort. ユーザーによる中止。 - + Sync is paused. 同期を一時停止しました。 - + %1 (Sync is paused) %1 (同期を一時停止) @@ -1961,73 +1961,73 @@ It is not advisable to use it. このアイテムは、以前にエラーが発生していたため同期させません: %1 - + Symbolic links are not supported in syncing. 同期の際にシンボリックリンクはサポートしていません - + File is listed on the ignore list. ファイルは除外リストに登録されています。 - + File contains invalid characters that can not be synced cross platform. ファイルに無効な文字が含まれているため、クロスプラットフォーム環境での同期ができません。 - + Unable to initialize a sync journal. 同期ジャーナルの初期化ができません。 - + Cannot open the sync journal 同期ジャーナルを開くことができません - + Not allowed because you don't have permission to add sub-directories in that directory そのディレクトリにサブディレクトリを追加する権限がありません - + Not allowed because you don't have permission to add parent directory 親ディレクトリを追加する権限がありません - + Not allowed because you don't have permission to add files in that directory そのディレクトリにファイルを追加する権限がありません - + Not allowed to upload this file because it is read-only on the server, restoring サーバーでは読み取り専用となっているため、このファイルをアップロードすることはできません、復元しています - - + + Not allowed to remove, restoring 削除できません、復元しています - + Move not allowed, item restored 移動できません、項目を復元しました - + Move not allowed because %1 is read-only %1 は読み取り専用のため移動できません - + the destination 移動先 - + the source 移動元 @@ -2076,112 +2076,112 @@ It is not advisable to use it. - + None. なし - + Recent Changes 最近変更されたファイル - + Open %1 folder %1 フォルダーを開く - + Managed Folders: 管理フォルダー: - + Open folder '%1' フォルダー ’%1’ を開く - + Open %1 in browser %1をブラウザーで開く - + Calculating quota... クォータを計算中... - + Unknown status 不明な状態 - + Settings... 設定 - + Details... 詳細... - + Help ヘルプ - + Quit %1 %1 を終了 - + Sign in... サインイン... - + Sign out サインアウト - + Quota n/a クォータ n/a - + %1% of %2 in use %2 のうち %1% を使用中 - + No items synced recently 最近同期されたアイテムはありません。 - + Discovering %1 - + Syncing %1 of %2 (%3 left) 同期中 %2 中 %1 (残り %3) - + Syncing %1 (%2 left) 同期中 %1 (残り %2) - + %1 (%2, %3) %1 (%2, %3) - + Up to date 最新です diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts index 753774b854..1831ee172a 100644 --- a/translations/mirall_nl.ts +++ b/translations/mirall_nl.ts @@ -385,62 +385,62 @@ Weet u zeker dat u deze bewerking wilt uitvoeren? Mirall::FolderMan - + Could not reset folder state Kan de beginstaat van de map niet terugzetten - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. Een oud synchronisatieverslag '%1' is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt. - + Undefined State. Ongedefiniëerde staat - + Waits to start syncing. In afwachting van synchronisatie. - + Preparing for sync. Synchronisatie wordt voorbereid - + Sync is running. Bezig met synchroniseren. - + Last Sync was successful. Laatste synchronisatie was succesvol. - + Last Sync was successful, but with warnings on individual files. Laatste synchronisatie geslaagd, maar met waarschuwingen over individuele bestanden. - + Setup Error. Installatiefout. - + User Abort. Afgebroken door gebruiker. - + Sync is paused. Synchronisatie gepauzeerd. - + %1 (Sync is paused) %1 (Synchronisatie onderbroken) @@ -1316,7 +1316,7 @@ We adviseren deze site niet te gebruiken. Operation was canceled by user interaction. - + Verwerking afgebroken door gebruikersinteractie. @@ -1963,73 +1963,73 @@ Probeer opnieuw te synchroniseren. Dit onderwerp is niet gesynchroniseerd door eerdere fouten: %1 - + Symbolic links are not supported in syncing. Symbolic links worden niet ondersteund bij het synchroniseren. - + File is listed on the ignore list. De file is opgenomen op de negeerlijst. - + File contains invalid characters that can not be synced cross platform. Bestand bevat ongeldige karakters die niet tussen platformen gesynchroniseerd kunnen worden. - + Unable to initialize a sync journal. Niet in staat om een synchornisatie journaal te starten. - + Cannot open the sync journal Kan het sync journal niet openen - + Not allowed because you don't have permission to add sub-directories in that directory Niet toegestaan, omdat u geen rechten hebt om sub-directories aan te maken in die directory - + Not allowed because you don't have permission to add parent directory Niet toegestaan, omdat u geen rechten hebt om een bovenliggende directories toe te voegen - + Not allowed because you don't have permission to add files in that directory Niet toegestaan, omdat u geen rechten hebt om bestanden in die directory toe te voegen - + Not allowed to upload this file because it is read-only on the server, restoring Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen - - + + Not allowed to remove, restoring Niet toegestaan te verwijderen, herstellen - + Move not allowed, item restored Verplaatsen niet toegestaan, object hersteld - + Move not allowed because %1 is read-only Verplaatsen niet toegestaan omdat %1 alleen-lezen is - + the destination bestemming - + the source bron @@ -2075,115 +2075,115 @@ Probeer opnieuw te synchroniseren. There are no sync folders configured. - + Er zijn geen sync mappen geconfigureerd. - + None. Geen. - + Recent Changes Recente wijzigingen - + Open %1 folder Open %1 map - + Managed Folders: Beheerde mappen: - + Open folder '%1' Open map '%1' - + Open %1 in browser Open %1 in browser - + Calculating quota... Quota worden berekend ... - + Unknown status Onbekende status - + Settings... Instellingen... - + Details... Details ... - + Help Help - + Quit %1 %1 afsluiten - + Sign in... Inloggen... - + Sign out Uitloggen - + Quota n/a Quota niet beschikbaar - + %1% of %2 in use %1% van %2 gebruikt - + No items synced recently Recent niets gesynchroniseerd - + Discovering %1 %1 onderzoeken - + Syncing %1 of %2 (%3 left) Sync %1 van %2 (%3 over) - + Syncing %1 (%2 left) Sync %1 (%2 over) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Bijgewerkt diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts index 23b4834c04..e36bc45664 100644 --- a/translations/mirall_pl.ts +++ b/translations/mirall_pl.ts @@ -385,62 +385,62 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację? Mirall::FolderMan - + Could not reset folder state Nie udało się zresetować stanu folderu - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. Stary sync journal '%1' został znaleziony, lecz nie mógł być usunięty. Proszę się upewnić, że żaden program go obecnie nie używa. - + Undefined State. Niezdefiniowany stan - + Waits to start syncing. Czekają na uruchomienie synchronizacji. - + Preparing for sync. Przygotowuję do synchronizacji - + Sync is running. Synchronizacja w toku - + Last Sync was successful. Ostatnia synchronizacja zakończona powodzeniem. - + Last Sync was successful, but with warnings on individual files. Ostatnia synchronizacja udana, ale istnieją ostrzeżenia z pojedynczymi plikami. - + Setup Error. Błąd ustawień. - + User Abort. Użytkownik anulował. - + Sync is paused. Synchronizacja wstrzymana - + %1 (Sync is paused) %1 (Synchronizacja jest zatrzymana) @@ -1963,73 +1963,73 @@ Niezalecane jest jego użycie. Ten element nie jest zsynchronizowane z powodu poprzednich błędów: %1 - + Symbolic links are not supported in syncing. Linki symboliczne nie są wspierane przy synchronizacji. - + File is listed on the ignore list. Plik jest na liście plików ignorowanych. - + File contains invalid characters that can not be synced cross platform. Plik zawiera nieprawidłowe znaki, które nie mogą być synchronizowane wieloplatformowo. - + Unable to initialize a sync journal. Nie można zainicjować synchronizacji dziennika. - + Cannot open the sync journal Nie można otworzyć dziennika synchronizacji - + Not allowed because you don't have permission to add sub-directories in that directory Nie masz uprawnień do dodawania podkatalogów w tym katalogu. - + Not allowed because you don't have permission to add parent directory Nie masz uprawnień by dodać katalog nadrzędny - + Not allowed because you don't have permission to add files in that directory Nie masz uprawnień by dodać pliki w tym katalogu - + Not allowed to upload this file because it is read-only on the server, restoring Wgrywanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie - - + + Not allowed to remove, restoring Brak uprawnień by usunąć, przywracanie - + Move not allowed, item restored Przenoszenie niedozwolone, obiekt przywrócony - + Move not allowed because %1 is read-only Przenoszenie niedozwolone, ponieważ %1 jest tylko do odczytu - + the destination docelowy - + the source źródło @@ -2078,112 +2078,112 @@ Niezalecane jest jego użycie. - + None. Brak. - + Recent Changes Ostatnie zmiany - + Open %1 folder Otwórz folder %1 - + Managed Folders: Zarządzane foldery: - + Open folder '%1' Otwórz katalog '%1' - + Open %1 in browser Otwórz %1 w przeglądarce - + Calculating quota... Obliczam quote... - + Unknown status Nieznany status - + Settings... Ustawienia... - + Details... Szczegóły... - + Help Pomoc - + Quit %1 Wyjdź %1 - + Sign in... Loguję... - + Sign out Wyloguj - + Quota n/a Quota n/a - + %1% of %2 in use %1% z %2 w użyciu - + No items synced recently Brak ostatnich synchronizacji - + Discovering %1 - + Syncing %1 of %2 (%3 left) Synchronizacja %1 z %2 (%3 pozostało) - + Syncing %1 (%2 left) Synchronizuję %1 (%2 pozostało) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Aktualne diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts index b7375c7a50..3162f88ef5 100644 --- a/translations/mirall_pt.ts +++ b/translations/mirall_pt.ts @@ -384,62 +384,62 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q Mirall::FolderMan - + Could not reset folder state Não foi possível repor o estado da pasta - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. Não foi possível remover o antigo 'journal sync' '%1'. Por favor certifique-se que nenhuma aplicação o está a utilizar. - + Undefined State. Estado indefinido. - + Waits to start syncing. A aguardar o inicio da sincronização. - + Preparing for sync. A preparar para sincronização. - + Sync is running. A sincronização está a correr. - + Last Sync was successful. A última sincronização foi efectuada com sucesso. - + Last Sync was successful, but with warnings on individual files. A última sincronização foi efectuada com sucesso, mas existem avisos sobre alguns ficheiros. - + Setup Error. Erro na instalação. - + User Abort. Cancelado pelo utilizador. - + Sync is paused. A sincronização está em pausa. - + %1 (Sync is paused) %1 (Sincronização em pausa) @@ -1961,73 +1961,73 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n O item não está sincronizado devido a erros anteriores: %1 - + Symbolic links are not supported in syncing. Hiperligações simbólicas não são suportadas em sincronização. - + File is listed on the ignore list. O ficheiro está na lista de ficheiros a ignorar. - + File contains invalid characters that can not be synced cross platform. O ficheiro contém caracteres inválidos que não podem ser sincronizados pelas várias plataformas. - + Unable to initialize a sync journal. Impossível inicializar sincronização 'journal'. - + Cannot open the sync journal Impossível abrir o jornal de sincronismo - + Not allowed because you don't have permission to add sub-directories in that directory Não permitido, porque não tem permissão para adicionar sub-directórios ao directório - + Not allowed because you don't have permission to add parent directory Não permitido, porque não tem permissão para adicionar o directório principal - + Not allowed because you don't have permission to add files in that directory Não permitido, porque não tem permissão para adicionar ficheiros no directório - + Not allowed to upload this file because it is read-only on the server, restoring Não é permitido fazer o envio deste ficheiro porque é só de leitura no servidor, restaurando - - + + Not allowed to remove, restoring Não autorizado para remoção, restaurando - + Move not allowed, item restored Mover não foi permitido, item restaurado - + Move not allowed because %1 is read-only Mover não foi autorizado porque %1 é só de leitura - + the destination o destino - + the source a origem @@ -2076,112 +2076,112 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n - + None. Nada. - + Recent Changes Alterações recentes - + Open %1 folder Abrir a pasta %1 - + Managed Folders: Pastas Geridas: - + Open folder '%1' Abrir pasta '%1' - + Open %1 in browser Abrir %1 no browser - + Calculating quota... A calcular quota... - + Unknown status Estado desconhecido - + Settings... Configurações... - + Details... Detalhes... - + Help Ajuda - + Quit %1 Sair do %1 - + Sign in... Entrar... - + Sign out Sair - + Quota n/a Quota não disponível - + %1% of %2 in use %1% de %2 utilizado - + No items synced recently Sem itens sincronizados recentemente - + Discovering %1 - + Syncing %1 of %2 (%3 left) Sincronizar %1 de %2 (%3 faltando) - + Syncing %1 (%2 left) Sincronizando %1 (%2 faltando) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Actualizado diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts index 6bbe2b20c5..1889146db3 100644 --- a/translations/mirall_pt_BR.ts +++ b/translations/mirall_pt_BR.ts @@ -385,62 +385,62 @@ Você tem certeza que quer executar esta operação? Mirall::FolderMan - + Could not reset folder state Não foi possível redefinir o estado da pasta - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. Uma velha revista de sincronização '%1' foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está a usá-la. - + Undefined State. Estado indefinido. - + Waits to start syncing. Aguardando o inicio da sincronização. - + Preparing for sync. Preparando para sincronização. - + Sync is running. A sincronização está ocorrendo. - + Last Sync was successful. A última sincronização foi feita com sucesso. - + Last Sync was successful, but with warnings on individual files. A última sincronização foi executada com sucesso, mas com advertências em arquivos individuais. - + Setup Error. Erro de Configuração. - + User Abort. Usuário Abortou - + Sync is paused. Sincronização pausada. - + %1 (Sync is paused) %1 (Pausa na Sincronização) @@ -1314,7 +1314,7 @@ It is not advisable to use it. Operation was canceled by user interaction. - + A operação foi cancelada pela interação do usuário. @@ -1961,73 +1961,73 @@ Tente sincronizar novamente. O item não está sincronizado devido a erros anteriores: %1 - + Symbolic links are not supported in syncing. Linques simbólicos não são suportados em sincronização. - + File is listed on the ignore list. O arquivo está listado na lista de ignorados. - + File contains invalid characters that can not be synced cross platform. Arquivos que contém caracteres inválidos não podem ser sincronizados através de plataformas. - + Unable to initialize a sync journal. Impossibilitado de iniciar a sincronização. - + Cannot open the sync journal Não é possível abrir o arquivo de sincronização - + Not allowed because you don't have permission to add sub-directories in that directory Não permitido porque você não tem permissão de criar sub-pastas nesta pasta - + Not allowed because you don't have permission to add parent directory Não permitido porque você não tem permissão de criar pastas mãe - + Not allowed because you don't have permission to add files in that directory Não permitido porque você não tem permissão de adicionar arquivos a esta pasta - + Not allowed to upload this file because it is read-only on the server, restoring Não é permitido fazer o upload deste arquivo porque ele é somente leitura no servidor, restaurando - - + + Not allowed to remove, restoring Não é permitido remover, restaurando - + Move not allowed, item restored Não é permitido mover, item restaurado - + Move not allowed because %1 is read-only Não é permitido mover porque %1 é somente para leitura - + the destination o destino - + the source a fonte @@ -2073,115 +2073,115 @@ Tente sincronizar novamente. There are no sync folders configured. - + Não há pastas de sincronização configuradas. - + None. Nenhum. - + Recent Changes Alterações Recentes - + Open %1 folder Abrir pasta %1 - + Managed Folders: Pastas Gerenciadas: - + Open folder '%1' Abrir pasta '%1' - + Open %1 in browser Abrir %1 no navegador - + Calculating quota... Calculando cota... - + Unknown status Status desconhecido - + Settings... Configurações... - + Details... Detalhes... - + Help Ajuda - + Quit %1 Sair %1 - + Sign in... Conectar em... - + Sign out Sair - + Quota n/a Cota n/a - + %1% of %2 in use %1% de %2 em uso - + No items synced recently Não há itens sincronizados recentemente - + Discovering %1 Descobrindo %1 - + Syncing %1 of %2 (%3 left) Sincronizar %1 de %2 (%3 faltando) - + Syncing %1 (%2 left) Sincronizando %1 (%2 faltando) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Até a data diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts index 4db103bb87..8f4beb4c55 100644 --- a/translations/mirall_ru.ts +++ b/translations/mirall_ru.ts @@ -385,62 +385,62 @@ Are you sure you want to perform this operation? Mirall::FolderMan - + Could not reset folder state Невозможно сбросить состояние папки - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. Найден старый журнал синхронизации '%1', и он не может быть удалён. Пожалуйста убедитесь что он не открыт в каком-либо приложении. - + Undefined State. Неопределенное состояние. - + Waits to start syncing. Ожидает, чтобы начать синхронизацию. - + Preparing for sync. Подготовка к синхронизации. - + Sync is running. Идет синхронизация. - + Last Sync was successful. Последняя синхронизация прошла успешно. - + Last Sync was successful, but with warnings on individual files. Последняя синхронизация прошла успешно, но были предупреждения о нескольких файлах. - + Setup Error. Ошибка установки. - + User Abort. Отмена пользователем. - + Sync is paused. Синхронизация приостановлена. - + %1 (Sync is paused) %! (синхронизация приостановлена) @@ -1963,73 +1963,73 @@ It is not advisable to use it. Путь не синхронизируется из-за произошедших ошибок: %1 - + Symbolic links are not supported in syncing. Синхронизация символических ссылок не поддерживается. - + File is listed on the ignore list. Файл присутствует в списке игнорируемых. - + File contains invalid characters that can not be synced cross platform. Файл содержит недопустимые символы, которые невозможно синхронизировать между платформами. - + Unable to initialize a sync journal. Не удалось инициализировать журнал синхронизации. - + Cannot open the sync journal Не удаётся открыть журнал синхронизации - + Not allowed because you don't have permission to add sub-directories in that directory Недопустимо из-за отсутствия у вас разрешений на добавление подпапок в этой папке - + Not allowed because you don't have permission to add parent directory Недопустимо из-за отсутствия у вас разрешений на добавление родительской папки - + Not allowed because you don't have permission to add files in that directory Недопустимо из-за отсутствия у вас разрешений на добавление файлов в эту папку - + Not allowed to upload this file because it is read-only on the server, restoring Недопустимо отправить этот файл поскольку на севрере он помечен только для чтения, восстанавливаем - - + + Not allowed to remove, restoring Недопустимо удалить, восстанавливаем - + Move not allowed, item restored Перемещение недопустимо, элемент восстановлен - + Move not allowed because %1 is read-only Перемещение недопустимо, поскольку %1 помечен только для чтения - + the destination Назначение - + the source Источник @@ -2078,112 +2078,112 @@ It is not advisable to use it. - + None. Пусто - + Recent Changes Недавние изменения - + Open %1 folder Открыть %1 папку - + Managed Folders: Управляемые папки: - + Open folder '%1' Открыть папку '%1' - + Open %1 in browser Открыть %1 в браузере - + Calculating quota... Расчёт квоты... - + Unknown status Неизвестный статус - + Settings... Настройки... - + Details... Детали... - + Help Помощь - + Quit %1 Закрыть %1 - + Sign in... Войти... - + Sign out Выйти - + Quota n/a Квота недоступна - + %1% of %2 in use Используется %1% из %2. - + No items synced recently Недавно ничего не синхронизировалсь - + Discovering %1 - + Syncing %1 of %2 (%3 left) Синхронизация %1 из %2 (%3 осталось) - + Syncing %1 (%2 left) Синхронизация %1 (%2 осталось) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Актуальная версия diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts index 07be288bb3..514d804e4d 100644 --- a/translations/mirall_sk.ts +++ b/translations/mirall_sk.ts @@ -385,62 +385,62 @@ Ste si istý, že chcete uskutočniť danú operáciu? Mirall::FolderMan - + Could not reset folder state Nemožno resetovať stav priečinka - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. Starý synchronizačný žurnál '%1' nájdený, avšak neodstrániteľný. Prosím uistite sa, že žiadna aplikácia ho práve nevyužíva. - + Undefined State. Nedefinovaný stav. - + Waits to start syncing. Čakanie na štart synchronizácie. - + Preparing for sync. Príprava na synchronizáciu. - + Sync is running. Synchronizácia prebieha. - + Last Sync was successful. Posledná synchronizácia sa úspešne skončila. - + Last Sync was successful, but with warnings on individual files. Posledná synchronizácia bola úspešná, ale z varovaniami pre individuálne súbory. - + Setup Error. Chyba pri inštalácii. - + User Abort. Zrušené používateľom. - + Sync is paused. Synchronizácia je pozastavená. - + %1 (Sync is paused) %1 (Synchronizácia je pozastavená) @@ -1962,73 +1962,73 @@ Nie je vhodné ju používať. Položka nebola synchronizovaná kvôli predchádzajúcej chybe: %1 - + Symbolic links are not supported in syncing. Symbolické odkazy nie sú podporované pri synchronizácii. - + File is listed on the ignore list. Súbor je zapísaný na zozname ignorovaných. - + File contains invalid characters that can not be synced cross platform. Súbor obsahuje neplatné znaky, ktoré nemôžu byť zosynchronizované medzi platformami. - + Unable to initialize a sync journal. Nemôžem inicializovať synchronizačný žurnál. - + Cannot open the sync journal Nemožno otvoriť sync žurnál - + Not allowed because you don't have permission to add sub-directories in that directory Nie je dovolené, pretože nemáte oprávnenie pridávať do tohto adresára podadresáre. - + Not allowed because you don't have permission to add parent directory Nie je dovolené, pretože nemáte oprávnenie pridať nadradený adresár. - + Not allowed because you don't have permission to add files in that directory Nie je dovolené, pretože nemáte oprávnenie pridávať do tohto adresára súbory. - + Not allowed to upload this file because it is read-only on the server, restoring Nie je dovolené tento súbor nahrať, pretože je na serveri iba na čítanie. Obnovuje sa. - - + + Not allowed to remove, restoring Nie je dovolené odstrániť. Obnovuje sa. - + Move not allowed, item restored Presunutie nie je dovolené. Položka obnovená. - + Move not allowed because %1 is read-only Presunutie nie je dovolené, pretože %1 je na serveri iba na čítanie - + the destination cieľ - + the source zdroj @@ -2077,112 +2077,112 @@ Nie je vhodné ju používať. - + None. Žiaden. - + Recent Changes Nedávne zmeny - + Open %1 folder Otvoriť %1 priečinok - + Managed Folders: Spravované priečinky: - + Open folder '%1' Otvoriť priečinok '%1' - + Open %1 in browser Otvoriť %1 v prehliadači - + Calculating quota... Počítanie kvóty... - + Unknown status Neznámy stav - + Settings... Nastavenia... - + Details... Podrobnosti... - + Help Pomoc - + Quit %1 Ukončiť %1 - + Sign in... Prihlásiť do... - + Sign out Odhlásiť - + Quota n/a Kvóta n/a - + %1% of %2 in use %1% z %2 sa používa - + No items synced recently Žiadne nedávno synchronizované položky - + Discovering %1 Objavuje sa %1 - + Syncing %1 of %2 (%3 left) Synchronizuje sa %1 z %2 (zostáva %3) - + Syncing %1 (%2 left) Synchronizuje sa %1 (zostáva %2) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Až do dnešného dňa diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts index 14ff2ebf4a..e8c7bf3d3f 100644 --- a/translations/mirall_sl.ts +++ b/translations/mirall_sl.ts @@ -384,62 +384,62 @@ Ali sta prepričani, da želite izvesti to opravilo? Mirall::FolderMan - + Could not reset folder state Ni mogoče ponastaviti stanja mape - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. Obstaja starejši dnevnik usklajevanja '%1', vendar ga ni mogoče odstraniti. Preverite, da datoteka ni v uporabi. - + Undefined State. Nedoločeno stanje. - + Waits to start syncing. V čakanju na začetek usklajevanja. - + Preparing for sync. Poteka priprava za usklajevanje. - + Sync is running. Usklajevanje je v teku. - + Last Sync was successful. Zadnje usklajevanje je bilo uspešno končano. - + Last Sync was successful, but with warnings on individual files. Zadnje usklajevanje je bilo sicer uspešno, vendar z opozorili za posamezne datoteke. - + Setup Error. Napaka nastavitve. - + User Abort. Uporabniška prekinitev. - + Sync is paused. Usklajevanje je začasno v premoru. - + %1 (Sync is paused) %1 (usklajevanje je v premoru) @@ -1962,73 +1962,73 @@ Te je treba uskladiti znova. Predmet ni usklajen zaradi predhodne napake: %1 - + Symbolic links are not supported in syncing. Usklajevanje simbolnih povezav ni podprto. - + File is listed on the ignore list. Datoteka je na seznamu prezrtih datotek. - + File contains invalid characters that can not be synced cross platform. Ime datoteke vsebuje neveljavne znake, ki niso podprti na vseh okoljih. - + Unable to initialize a sync journal. Dnevnika usklajevanja ni mogoče začeti. - + Cannot open the sync journal Ni mogoče odpreti dnevnika usklajevanja - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination cilj - + the source vir @@ -2077,112 +2077,112 @@ Te je treba uskladiti znova. - + None. Brez - + Recent Changes Nedavne spremembe - + Open %1 folder Odpri %1 mapo - + Managed Folders: Upravljane mape: - + Open folder '%1' Odpri mapo '%1' - + Open %1 in browser Odpri %1 v brskalniku - + Calculating quota... Preračunavanje količinske omejitve ... - + Unknown status Neznano stanje - + Settings... Nastavitve ... - + Details... Podrobnosti ... - + Help Pomoč - + Quit %1 Končaj %1 - + Sign in... Prijava ... - + Sign out Odjava - + Quota n/a Količinska omejitev ni na voljo - + %1% of %2 in use %1% od %2 v uporabi - + No items synced recently Ni nedavno usklajenih predmetov - + Discovering %1 - + Syncing %1 of %2 (%3 left) Poteka usklajevanje %1 od %2 (preostaja %3) - + Syncing %1 (%2 left) Usklajevanje %1 (%2 do konca) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Ni posodobitev diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts index 0b73428cb1..102259fc83 100644 --- a/translations/mirall_sv.ts +++ b/translations/mirall_sv.ts @@ -385,62 +385,62 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file Mirall::FolderMan - + Could not reset folder state Kunde inte återställa mappens skick - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. En gammal synkroniseringsjournal '%1' hittades, men kunde inte raderas. Vänligen se till att inga program för tillfället använder den. - + Undefined State. Okänt tillstånd. - + Waits to start syncing. Väntar på att starta synkronisering. - + Preparing for sync. Förbereder synkronisering - + Sync is running. Synkronisering pågår. - + Last Sync was successful. Senaste synkronisering lyckades. - + Last Sync was successful, but with warnings on individual files. Senaste synkning lyckades, men det finns varningar för vissa filer! - + Setup Error. Inställningsfel. - + User Abort. Användare Avbryt - + Sync is paused. Synkronisering är pausad. - + %1 (Sync is paused) %1 (Synk är stoppad) @@ -1963,73 +1963,73 @@ Försök att synka dessa igen. Objektet kunde inte synkas på grund av tidigare fel: %1 - + Symbolic links are not supported in syncing. Symboliska länkar stöds ej i synkningen. - + File is listed on the ignore list. Filen är listad i ignorerings listan. - + File contains invalid characters that can not be synced cross platform. Filen innehåller ogiltiga tecken som inte kan synkas oberoende av plattform. - + Unable to initialize a sync journal. Kan inte initialisera en synk journal. - + Cannot open the sync journal Kunde inte öppna synk journalen - + Not allowed because you don't have permission to add sub-directories in that directory Går ej att genomföra då du saknar rättigheter att lägga till underkataloger i den katalogen - + Not allowed because you don't have permission to add parent directory Går ej att genomföra då du saknar rättigheter att lägga till någon moderkatalog - + Not allowed because you don't have permission to add files in that directory Går ej att genomföra då du saknar rättigheter att lägga till filer i den katalogen - + Not allowed to upload this file because it is read-only on the server, restoring Inte behörig att ladda upp denna fil då den är skrivskyddad på servern, återställer - - + + Not allowed to remove, restoring Inte behörig att radera, återställer - + Move not allowed, item restored Det gick inte att genomföra flytten, objektet återställs - + Move not allowed because %1 is read-only Det gick inte att genomföra flytten då %1 är skrivskyddad - + the destination destinationen - + the source källan @@ -2078,112 +2078,112 @@ Försök att synka dessa igen. - + None. Ingen. - + Recent Changes Senaste ändringar - + Open %1 folder Öppna %1 mappen - + Managed Folders: Hanterade mappar: - + Open folder '%1' Öppna mapp '%1' - + Open %1 in browser Öppna %1 i webbläsaren - + Calculating quota... Beräknar kvot... - + Unknown status Okänd status - + Settings... Inställningar... - + Details... Detaljer... - + Help Hjälp - + Quit %1 Avsluta %1 - + Sign in... Logga in... - + Sign out Logga ut - + Quota n/a Kvot n/a - + %1% of %2 in use %1% av %2 används - + No items synced recently Inga filer har synkroniseras nyligen - + Discovering %1 - + Syncing %1 of %2 (%3 left) Synkroniserar %1 av %2 (%3 kvar) - + Syncing %1 (%2 left) Synkroniserar %1 (%2 kvar) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Aktuell version diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts index b7addb8a38..e970ada269 100644 --- a/translations/mirall_th.ts +++ b/translations/mirall_th.ts @@ -382,62 +382,62 @@ Are you sure you want to perform this operation? Mirall::FolderMan - + Could not reset folder state - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. - + Undefined State. สถานะที่ยังไม่ได้ถูกกำหนด - + Waits to start syncing. รอการเริ่มต้นซิงค์ข้อมูล - + Preparing for sync. - + Sync is running. การซิงค์ข้อมูลกำลังทำงาน - + Last Sync was successful. การซิงค์ข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว - + Last Sync was successful, but with warnings on individual files. - + Setup Error. เกิดข้อผิดพลาดในการติดตั้ง - + User Abort. - + Sync is paused. การซิงค์ข้อมูลถูกหยุดไว้ชั่วคราว - + %1 (Sync is paused) @@ -1953,73 +1953,73 @@ It is not advisable to use it. - + Symbolic links are not supported in syncing. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2068,112 +2068,112 @@ It is not advisable to use it. - + None. - + Recent Changes - + Open %1 folder เปิดโฟลเดอร์ %1 - + Managed Folders: โฟลเดอร์ที่มีการจัดการแล้ว: - + Open folder '%1' - + Open %1 in browser - + Calculating quota... - + Unknown status - + Settings... - + Details... - + Help ช่วยเหลือ - + Quit %1 - + Sign in... - + Sign out - + Quota n/a - + %1% of %2 in use - + No items synced recently - + Discovering %1 - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts index 31044e0a64..8227d3938d 100644 --- a/translations/mirall_tr.ts +++ b/translations/mirall_tr.ts @@ -385,62 +385,62 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz? Mirall::FolderMan - + Could not reset folder state Klasör durumu sıfırılanamadı - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. Eski eşitleme günlüğü '%1' bulundu ancak kaldırılamadı. Başka bir uygulama tarafından kullanılmadığından emin olun. - + Undefined State. Tanımlanmamış Durum. - + Waits to start syncing. Eşitleme başlatmak için bekleniyor. - + Preparing for sync. Eşitleme için hazırlanıyor. - + Sync is running. Eşitleme çalışıyor. - + Last Sync was successful. Son Eşitleme başarılı oldu. - + Last Sync was successful, but with warnings on individual files. Son eşitleme başarılıydı, ancak tekil dosyalarda uyarılar vardı. - + Setup Error. Kurulum Hatası. - + User Abort. Kullanıcı İptal Etti. - + Sync is paused. Eşitleme duraklatıldı. - + %1 (Sync is paused) %1 (Eşitleme duraklatıldı) @@ -1963,73 +1963,73 @@ Bu dosyaları tekrar eşitlemeyi deneyin. Bu öge önceki hatalar koşullarından dolayı eşitlenemiyor: %1 - + Symbolic links are not supported in syncing. Sembolik bağlantılar eşitlemede desteklenmiyor. - + File is listed on the ignore list. Dosya yoksayma listesinde. - + File contains invalid characters that can not be synced cross platform. Dosya, çapraz platform arasında eşitlenemeyecek karakterler içeriyor. - + Unable to initialize a sync journal. Bir eşitleme günlüğü başlatılamadı. - + Cannot open the sync journal Eşitleme günlüğü açılamıyor - + Not allowed because you don't have permission to add sub-directories in that directory Bu dizine alt dizin ekleme yetkiniz olmadığından izin verilmedi - + Not allowed because you don't have permission to add parent directory Üst dizin ekleme yetkiniz olmadığından izin verilmedi - + Not allowed because you don't have permission to add files in that directory Bu dizine dosya ekleme yetkiniz olmadığından izin verilmedi - + Not allowed to upload this file because it is read-only on the server, restoring Sunucuda salt okunur olduğundan, bu dosya yüklenemedi, geri alınıyor - - + + Not allowed to remove, restoring Kaldırmaya izin verilmedi, geri alınıyor - + Move not allowed, item restored Taşımaya izin verilmedi, öge geri alındı - + Move not allowed because %1 is read-only %1 salt okunur olduğundan taşımaya izin verilmedi - + the destination hedef - + the source kaynak @@ -2078,112 +2078,112 @@ Bu dosyaları tekrar eşitlemeyi deneyin. - + None. Hiçbir şey. - + Recent Changes Son Değişiklikler - + Open %1 folder %1 klasörünü aç - + Managed Folders: Yönetilen Klasörler: - + Open folder '%1' '%1' klasörünü aç - + Open %1 in browser %1'ı tarayıcıda aç - + Calculating quota... Kota hesaplanıyor... - + Unknown status Bilinmeyen durum - + Settings... Ayarlar... - + Details... Ayrıntılar... - + Help Yardım - + Quit %1 %1'tan çık - + Sign in... Oturum aç... - + Sign out Oturumu kapat - + Quota n/a Kota kullanılamıyor - + %1% of %2 in use %2'ın % %1 kısmı kullanımda - + No items synced recently Yakın zamanda eşitlenen öge yok - + Discovering %1 Ortaya çıkarılan: %1 - + Syncing %1 of %2 (%3 left) Eşitlenen %1/%2 (%3 kaldı) - + Syncing %1 (%2 left) Eşitlenen %1 (%2 kaldı) - + %1 (%2, %3) %1 (%2, %3) - + Up to date Güncel diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts index 7142249716..faeb81d124 100644 --- a/translations/mirall_uk.ts +++ b/translations/mirall_uk.ts @@ -384,62 +384,62 @@ Are you sure you want to perform this operation? Mirall::FolderMan - + Could not reset folder state Не вдалося скинути стан теки - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. - + Undefined State. Невизначений стан. - + Waits to start syncing. Очікування початку синхронізації. - + Preparing for sync. Підготовка до синхронізації - + Sync is running. Синхронізація запущена. - + Last Sync was successful. Остання синхронізація була успішною. - + Last Sync was successful, but with warnings on individual files. - + Setup Error. Помилка установки. - + User Abort. - + Sync is paused. - + %1 (Sync is paused) @@ -1955,73 +1955,73 @@ It is not advisable to use it. - + Symbolic links are not supported in syncing. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2070,112 +2070,112 @@ It is not advisable to use it. - + None. - + Recent Changes Недавні зміни - + Open %1 folder Відкрити %1 каталог - + Managed Folders: Керовані теки: - + Open folder '%1' - + Open %1 in browser - + Calculating quota... - + Unknown status - + Settings... - + Details... - + Help Допомога - + Quit %1 - + Sign in... - + Sign out - + Quota n/a - + %1% of %2 in use - + No items synced recently - + Discovering %1 - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts index 3aa82d765b..61fab984ca 100644 --- a/translations/mirall_zh_CN.ts +++ b/translations/mirall_zh_CN.ts @@ -384,62 +384,62 @@ Are you sure you want to perform this operation? Mirall::FolderMan - + Could not reset folder state 不能重置文件夹状态 - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. 一个旧的同步日志 '%1' 被找到，但是不能被移除。请确定没有应用程序正在使用它。 - + Undefined State. 未知状态。 - + Waits to start syncing. 等待启动同步。 - + Preparing for sync. 准备同步。 - + Sync is running. 同步正在运行。 - + Last Sync was successful. 最后一次同步成功。 - + Last Sync was successful, but with warnings on individual files. 上次同步已成功，不过一些文件出现了警告。 - + Setup Error. 安装失败 - + User Abort. 用户撤销。 - + Sync is paused. 同步已暂停。 - + %1 (Sync is paused) %1 (同步已暂停) @@ -1959,73 +1959,73 @@ It is not advisable to use it. - + Symbolic links are not supported in syncing. 符号链接不被同步支持。 - + File is listed on the ignore list. 文件在忽略列表中。 - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. 无法初始化同步日志 - + Cannot open the sync journal 无法打开同步日志 - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2074,112 +2074,112 @@ It is not advisable to use it. - + None. 无。 - + Recent Changes 最近修改 - + Open %1 folder 打开 %1 目录 - + Managed Folders: 管理的文件夹： - + Open folder '%1' 打开文件夹“%1” - + Open %1 in browser 在浏览器中打开%1 - + Calculating quota... 计算配额.... - + Unknown status 未知状态 - + Settings... 设置... - + Details... 细节... - + Help 帮助 - + Quit %1 退出 %1 - + Sign in... 登录... - + Sign out 注销 - + Quota n/a 配额无限制 - + %1% of %2 in use 已使用 %2，总计 %1% - + No items synced recently - + Discovering %1 - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) %1 (%2, %3) - + Up to date 更新 diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts index 9985780d22..57731e932c 100644 --- a/translations/mirall_zh_TW.ts +++ b/translations/mirall_zh_TW.ts @@ -382,62 +382,62 @@ Are you sure you want to perform this operation? Mirall::FolderMan - + Could not reset folder state 無法重置資料夾狀態 - + An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it. 發現較舊的同步處理日誌'%1'，但無法移除。請確認沒有應用程式正在使用它。 - + Undefined State. 未知狀態 - + Waits to start syncing. 等待啟動同步 - + Preparing for sync. 正在準備同步。 - + Sync is running. 同步執行中 - + Last Sync was successful. 最後一次同步成功 - + Last Sync was successful, but with warnings on individual files. - + Setup Error. 安裝失敗 - + User Abort. 使用者中斷。 - + Sync is paused. 同步已暫停 - + %1 (Sync is paused) %1 (同步暫停) @@ -1953,73 +1953,73 @@ It is not advisable to use it. - + Symbolic links are not supported in syncing. - + File is listed on the ignore list. - + File contains invalid characters that can not be synced cross platform. - + Unable to initialize a sync journal. - + Cannot open the sync journal - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2068,112 +2068,112 @@ It is not advisable to use it. - + None. 無。 - + Recent Changes - + Open %1 folder 開啟%1資料夾 - + Managed Folders: 管理的資料夾: - + Open folder '%1' 開啟 %1 資料夾 - + Open %1 in browser 瀏覽器中開啟 %1 - + Calculating quota... - + Unknown status 未知狀態 - + Settings... 設定… - + Details... 細節… - + Help 說明 - + Quit %1 離開 %1 - + Sign in... 登入中... - + Sign out 登出 - + Quota n/a 無配額 - + %1% of %2 in use - + No items synced recently - + Discovering %1 - + Syncing %1 of %2 (%3 left) - + Syncing %1 (%2 left) - + %1 (%2, %3) - + Up to date 最新的 From de96350bee38e7b9e7753aa4f5822cf6098a3624 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 23 Aug 2014 01:25:22 -0400 Subject: [PATCH 90/94] [tx-robot] updated from transifex --- translations/mirall_cs.ts | 2 +- translations/mirall_pl.ts | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts index 20336ac7fc..0f7467c740 100644 --- a/translations/mirall_cs.ts +++ b/translations/mirall_cs.ts @@ -2194,7 +2194,7 @@ Zkuste provést novou synchronizaci. <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> - + <p>Verze %2. Pro více informací navštivte <a href="%3">%4</a></p><p><small>Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz a další.<br/>Na základě kódu Mirall, Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licencováno pod GNU General Public License (GPL) Version 2.0<br/>ownCloud a ownCloud logo jsou registrované obchodní známky ownCloud, Inc. ve Spojených státech, ostatních zemích nebo obojí</p> diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts index e36bc45664..1b681aa7ce 100644 --- a/translations/mirall_pl.ts +++ b/translations/mirall_pl.ts @@ -65,7 +65,7 @@ Selective Sync... - + Selektywny Sync... @@ -151,7 +151,7 @@ Discovering %1 - + Rozpoznaję %1 @@ -589,7 +589,7 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację? Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. - + Seelktywny Sync: Możesz opcjonalnie odznaczyć podfoldery, których nie chcesz synchronizować. @@ -1316,7 +1316,7 @@ Niezalecane jest jego użycie. Operation was canceled by user interaction. - + Operacja została przerwana przez użytkownika @@ -2047,7 +2047,7 @@ Niezalecane jest jego użycie. <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - + <p>Wersja %1 Aby uzyskać więcej informacji kliknij <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Rozprowadzany przez %4 i licencjonowany według GNU General Public License (GPL) Wersja 2.0.<br/>%5 oraz logo %5 są zarejestrowanymi znakami towarowymi %4 w Stanach Zjednoczonych, innych krajach lub obydwu.</p> @@ -2075,7 +2075,7 @@ Niezalecane jest jego użycie. There are no sync folders configured. - + Nie skonfigurowano żadnych folderów synchronizacji. @@ -2165,7 +2165,7 @@ Niezalecane jest jego użycie. Discovering %1 - + Rozpoznaję %1 @@ -2193,7 +2193,7 @@ Niezalecane jest jego użycie. <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> - + <p>Wersja %2. Aby uzyskać więcej informacji kliknij <a href="%3">%4</a></p><p><small>Przez Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz i innych.<br/></small></p><p>Oparte na Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licencjonowany według GNU General Public License (GPL) Wersja 2.0.<br/>ownCloud oraz logo ownCloud są zarejestrowanymi znakami towarowymi ownCloud w Stanach Zjednoczonych, innych krajach lub obydwu.</p> From cd6950d9840624b723e29d4f10e5e14475694233 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 24 Aug 2014 01:25:18 -0400 Subject: [PATCH 91/94] [tx-robot] updated from transifex --- translations/mirall_sv.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts index 102259fc83..be0340f56b 100644 --- a/translations/mirall_sv.ts +++ b/translations/mirall_sv.ts @@ -65,7 +65,7 @@ Selective Sync... - + Selektiv Sync... @@ -151,7 +151,7 @@ Discovering %1 - + Söker igenom %1 @@ -193,14 +193,14 @@ %1 %2 (%3 of %4) %5 left at a rate of %6/s Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" - %1 %2 (%3 of %4) %5 återstående. Hastighet %6/s + %1 %2 (%3 of %4). Tid kvar enskild fil %5. Hastighet %6/s %1 of %2, file %3 of %4 Total time left %5 %1 av %2, fil %3 av %4 -Tid kvar %5 +Total tid kvar %5 @@ -2165,7 +2165,7 @@ Försök att synka dessa igen. Discovering %1 - + Söker igenom %1 From 15c11ea1720960c5d49a86b2b8c1038d8ff34780 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 24 Aug 2014 02:06:11 -0400 Subject: [PATCH 92/94] [tx-robot] updated from transifex --- admin/win/nsi/l10n/Swedish.nsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/win/nsi/l10n/Swedish.nsh b/admin/win/nsi/l10n/Swedish.nsh index 60ea987b03..b6049e7273 100644 --- a/admin/win/nsi/l10n/Swedish.nsh +++ b/admin/win/nsi/l10n/Swedish.nsh @@ -15,6 +15,8 @@ StrCpy $PageReinstall_SAME_Field_3 "Avinstallera ${APPLICATION_NAME}" StrCpy $UNINSTALLER_APPDATA_TITLE "Avinstallera ${APPLICATION_NAME}" StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Välj underhålls alternativ att utföra." StrCpy $SEC_APPLICATION_DETAILS "Installerar ${APPLICATION_NAME} väsentligheter." +StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Statusikoner för Windows Explorer" +StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installerar statusikoner för Windows Explorer" StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start-meny program genväg" StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Lägger till genväg för ${APPLICATION_NAME} till Start-menyn." StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Skrivbordsgenväg" @@ -42,5 +44,3 @@ StrCpy $INIT_INSTALLER_RUNNING "Installationsprogrammet körs redan." StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Detta avinstallationsprogram kräver administratörs rättigheter, försök igen" StrCpy $INIT_UNINSTALLER_RUNNING "Avinstallationsprogrammet körs redan." StrCpy $SectionGroup_Shortcuts "Genvägar" -StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer" -StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons for Windows Explorer" From 9291ace5580865cb9936cf621db2b5c95f8095b3 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Mon, 25 Aug 2014 01:25:17 -0400 Subject: [PATCH 93/94] [tx-robot] updated from transifex --- translations/mirall_el.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts index b7ef044c42..565e054004 100644 --- a/translations/mirall_el.ts +++ b/translations/mirall_el.ts @@ -65,7 +65,7 @@ Selective Sync... - + Επιλεκτικός Συγχρονισμός... @@ -151,7 +151,7 @@ Discovering %1 - + Ανακαλύπτοντας %1 @@ -590,7 +590,7 @@ Are you sure you want to perform this operation? Selective Sync: You can optionally deselect subfolders you do not wish to synchronize. - + Επιλεκτικός Συγχρονισμός: Μπορείτε προαιρετικά να αποεπιλέξετε τους υποφακέλους που δεν επιθυμείτε να συγχρονίσετε. @@ -1232,7 +1232,7 @@ It is not advisable to use it. Skip folders configuration - + Παράλειψη διαμόρφωσης φακέλων @@ -1317,7 +1317,7 @@ It is not advisable to use it. Operation was canceled by user interaction. - + Η λειτουργία ακυρώθηκε από αλληλεπίδραση του χρήστη. @@ -1797,7 +1797,7 @@ It is not advisable to use it. Expiration Date: %1 - + Ημερομηνία Λήξης: %1 @@ -2048,7 +2048,7 @@ It is not advisable to use it. <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - + <p>Έκδοση %1 Για περισσότερες πληροφορίες, παρακαλώ επισκεφθείτε την ιστοσελίδα <a href='%2'>%3</a>.</p><p>Πνευματική ιδιοκτησία ownCloud, Inc.<p><p>Διανέμεται από %4 και αδειοδοτείται με την GNU General Public License (GPL) Έκδοση 2.0.<br>%5 και το %5 λογότυπο είναι σήμα κατατεθέν του %4 στις Ηνωμένες Πολιτείες, άλλες χώρες ή όλες.</p> @@ -2076,7 +2076,7 @@ It is not advisable to use it. There are no sync folders configured. - + Δεν έχουν οριστεί φάκελοι συγχρονισμού. @@ -2166,7 +2166,7 @@ It is not advisable to use it. Discovering %1 - + Ανακαλύπτοντας %1 @@ -2194,7 +2194,7 @@ It is not advisable to use it. <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> - + <p>Έκδοση %2. Για περισσότερες πληροφορίες επισκεφθείτε <a href="%3">%4</a></p><p><small>Από τους Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Βασισμένο στο Mirall από τον Duncan Mac-Vicar P.</small></p><p>Πνευματικά δικαιώματα ownCloud, Inc.</p><p>Αδειοδοτημένο δυνάμει της Δημόσιας Άδειας GNU (GPL) Η Έκδοση 2.0<br/>ownCloud και το λογότυπο ownCloud είναι σήματα κατατεθέντα της ownCloud, Inc. στις Ηνωμένες Πολιτείες, άλλες χώρες, ή και στις δύο</p> From 03dc27a3271fff5bc8be06e1bd714fbf528a2d69 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Tue, 26 Aug 2014 01:25:22 -0400 Subject: [PATCH 94/94] [tx-robot] updated from transifex --- translations/mirall_ru.ts | 12 ++++++------ translations/mirall_sl.ts | 12 ++++++------ translations/mirall_tr.ts | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts index 8f4beb4c55..c617e354e0 100644 --- a/translations/mirall_ru.ts +++ b/translations/mirall_ru.ts @@ -151,7 +151,7 @@ Discovering %1 - + Обнаружение %1 @@ -1316,7 +1316,7 @@ It is not advisable to use it. Operation was canceled by user interaction. - + Операция отменена пользователем @@ -2047,7 +2047,7 @@ It is not advisable to use it. <p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p> - + <p>Версия %1. Дополнительная информация доступна по ссылке <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Распространяется под %4 и лицензировано по GNU General Public License (GPL) Версии 2.0.<br/>%5 и логотип %5 зарегистрированные торговые марки %4 в США, и/или в других странах.</p> @@ -2075,7 +2075,7 @@ It is not advisable to use it. There are no sync folders configured. - + Нет настроенных папок для синхронизации @@ -2165,7 +2165,7 @@ It is not advisable to use it. Discovering %1 - + Обнаружение %1 @@ -2193,7 +2193,7 @@ It is not advisable to use it. <p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both</p> - + <p>Версия %2. Дополнительная информация доступна по ссылке <a href="%3">%4</a></p><p><small>Авторы: Клаас Фрейтаг, Дэниель Молкентин, Жан-Кристоф Бошард, Оливер Гоффарт, Маркус Гётс и другие.<br/>Основано на Mirall от Дункана Мак-Викара П.</small></p><p>Права принадлежат ownCloud, Inc.</p><p>Лицинзируемой под GNU Public License (GPL) Версии 2.0<br/>ownCloud и логотип ownCloud зарегистрированные торговые марки ownCloud, Inc. в Соединенных Штатах, и/или других странах</p> diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts index e8c7bf3d3f..fcf9a09d5b 100644 --- a/translations/mirall_sl.ts +++ b/translations/mirall_sl.ts @@ -65,7 +65,7 @@ Selective Sync... - + Izbirno usklajevanje ... @@ -615,7 +615,7 @@ Ali sta prepričani, da želite izvesti to opravilo? Server returned wrong content-range - + Odziv strežnika kaže na neveljaven obseg vsebine @@ -974,7 +974,7 @@ zahteva skrbniška dovoljenja za dokončanje opravila. New version %1 available. Please use the system's update tool to install it. - + Na voljo je nova različica %1. Uporabite orodje za namestitev in posodobitev sistema. @@ -1230,7 +1230,7 @@ Uporaba ni priporočljiva. Skip folders configuration - + Preskoči nastavitve map @@ -1289,7 +1289,7 @@ Uporaba ni priporočljiva. Server returned wrong content-range - + Odziv strežnika kaže na neveljaven obseg vsebine @@ -1412,7 +1412,7 @@ Uporaba ni priporočljiva. The local file was removed during sync. - + Krajevna datoteka je bila me usklajevanjem odstranjena. diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts index 8227d3938d..f3f2ab4414 100644 --- a/translations/mirall_tr.ts +++ b/translations/mirall_tr.ts @@ -1316,7 +1316,7 @@ Kullanmanız önerilmez. Operation was canceled by user interaction. - + İşlem kullanıcı etkileşimi tarafından iptal edildi. @@ -2075,7 +2075,7 @@ Bu dosyaları tekrar eşitlemeyi deneyin. There are no sync folders configured. - + Yapılandırılmış eşitleme klasörü yok.