From 336e22233dff35d2f9139e2bb3b968af30cf2172 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 14 Nov 2013 14:40:21 +0100 Subject: [PATCH 01/42] Do not create uninstall shortcut in start menu According to Microsoft Design guidelines (http://msdn.microsoft.com/en-us/library/windows/desktop/aa511447.aspx) no icons for uninstallers should be created. Signed-off-by: Sven Strickroth --- cmake/modules/NSIS.template.in | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index 634cc3711..a20f99ffd 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -368,7 +368,6 @@ SectionGroup "Shortcuts" ;CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\LICENSE.lnk" "$INSTDIR\LICENSE.txt" CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_EXECUTABLE}" ;CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Release notes.lnk" "$INSTDIR\NOTES.txt" - CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" SetShellVarContext current ${MementoSectionEnd} !endif From ed5b0973dda29c6908a788f2466d50b006c53bda Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 14 Nov 2013 14:41:08 +0100 Subject: [PATCH 02/42] Do not create folder for single link Signed-off-by: Sven Strickroth --- cmake/modules/NSIS.template.in | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index a20f99ffd..5e3cf9c1b 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -357,17 +357,13 @@ SectionEnd SectionGroup "Shortcuts" !ifdef OPTION_SECTION_SC_START_MENU - ${MementoSection} "Start Menu Program Group" SEC_START_MENU + ${MementoSection} "Start Menu Program Shortcut" SEC_START_MENU SectionIn 1 2 3 SetDetailsPrint textonly - DetailPrint "Adding shortcuts for the ${APPLICATION_NAME} program group to the Start Menu." + DetailPrint "Adding shortcut for ${APPLICATION_NAME} to the Start Menu." SetDetailsPrint listonly SetShellVarContext all - RMDir /r "$SMPROGRAMS\${APPLICATION_NAME}" - CreateDirectory "$SMPROGRAMS\${APPLICATION_NAME}" - ;CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\LICENSE.lnk" "$INSTDIR\LICENSE.txt" - CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_EXECUTABLE}" - ;CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Release notes.lnk" "$INSTDIR\NOTES.txt" + CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_EXECUTABLE}" SetShellVarContext current ${MementoSectionEnd} !endif @@ -400,7 +396,7 @@ ${MementoSectionDone} ;-------------------------------- !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APPLICATION} "${APPLICATION_NAME} essentials." -!insertmacro MUI_DESCRIPTION_TEXT ${SEC_START_MENU} "${APPLICATION_NAME} program group." +!insertmacro MUI_DESCRIPTION_TEXT ${SEC_START_MENU} "${APPLICATION_NAME} shortcut." !insertmacro MUI_DESCRIPTION_TEXT ${SEC_DESKTOP} "Desktop shortcut for ${APPLICATION_NAME}." !insertmacro MUI_DESCRIPTION_TEXT ${SEC_QUICK_LAUNCH} "Quick Launch shortcut for ${APPLICATION_NAME}." !insertmacro MUI_FUNCTION_DESCRIPTION_END @@ -508,7 +504,7 @@ Section Uninstall ;Start menu shortcuts. !ifdef OPTION_SECTION_SC_START_MENU SetShellVarContext all - RMDir /r "$SMPROGRAMS\${APPLICATION_NAME}" + Delete "$SMPROGRAMS\${APPLICATION_NAME}.lnk" SetShellVarContext current !endif From aa17be40cc2de62ecf63bc4a6c071a18ae7010d5 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Wed, 20 Nov 2013 18:19:14 +0100 Subject: [PATCH 03/42] Some database code cleanups. --- src/mirall/syncjournaldb.cpp | 39 ++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/src/mirall/syncjournaldb.cpp b/src/mirall/syncjournaldb.cpp index 7c9669867..06905bf2f 100644 --- a/src/mirall/syncjournaldb.cpp +++ b/src/mirall/syncjournaldb.cpp @@ -23,7 +23,7 @@ #include "syncjournaldb.h" #include "syncjournalfilerecord.h" -#define QSQLITE "QSQLITE" +#define QSQLITE "QSQLITE3" #define SYNCJOURNALDB_CONNECTION_NAME "SyncJournalDbConnection" namespace Mirall { @@ -69,8 +69,9 @@ bool SyncJournalDb::checkConnect() } // Add the connection - if (!QSqlDatabase::connectionNames().contains(SYNCJOURNALDB_CONNECTION_NAME)) + if (!QSqlDatabase::connectionNames().contains(SYNCJOURNALDB_CONNECTION_NAME)) { _db = QSqlDatabase::addDatabase( QSQLITE, SYNCJOURNALDB_CONNECTION_NAME ); + } // Open the file _db.setDatabaseName(_dbFile); @@ -226,6 +227,9 @@ void SyncJournalDb::close() _deleteFileRecordPhash.reset(0); _deleteFileRecordRecursively.reset(0); _blacklistQuery.reset(0); + + _db.removeDatabase(SYNCJOURNALDB_CONNECTION_NAME); + _db.setDatabaseName(QString()); _db.close(); } @@ -418,8 +422,9 @@ bool SyncJournalDb::postSyncCleanup(const QHash &items ) { QMutexLocker locker(&_mutex); - if( !checkConnect() ) + if( !checkConnect() ) { return false; + } QSqlQuery query(_db); query.prepare("SELECT phash, path FROM metadata order by path"); @@ -458,8 +463,9 @@ int SyncJournalDb::getFileRecordCount() { QMutexLocker locker(&_mutex); - if( !checkConnect() ) + if( !checkConnect() ) { return -1; + } QSqlQuery query(_db); query.prepare("SELECT COUNT(*) FROM metadata"); @@ -509,8 +515,9 @@ void SyncJournalDb::setDownloadInfo(const QString& file, const SyncJournalDb::Do { QMutexLocker locker(&_mutex); - if( !checkConnect() ) + if( !checkConnect() ) { return; + } if (i._valid) { _setDownloadInfoQuery->bindValue(0, file); @@ -572,8 +579,9 @@ void SyncJournalDb::setUploadInfo(const QString& file, const SyncJournalDb::Uplo { QMutexLocker locker(&_mutex); - if( !checkConnect() ) + if( !checkConnect() ) { return; + } if (i._valid) { _setUploadInfoQuery->bindValue(0, file); @@ -635,13 +643,14 @@ SyncJournalBlacklistRecord SyncJournalDb::blacklistEntry( const QString& file ) void SyncJournalDb::wipeBlacklistEntry( const QString& file ) { QMutexLocker locker(&_mutex); + if( checkConnect() ) { + QSqlQuery query; - QSqlQuery query; - - query.prepare("DELETE FROM blacklist WHERE path=:path"); - query.bindValue(":path", file); - if( ! query.exec() ) { - qDebug() << "Deletion of blacklist item failed."; + query.prepare("DELETE FROM blacklist WHERE path=:path"); + query.bindValue(":path", file); + if( ! query.exec() ) { + qDebug() << "Deletion of blacklist item failed."; + } } } @@ -650,11 +659,15 @@ void SyncJournalDb::updateBlacklistEntry( const SyncJournalBlacklistRecord& item QMutexLocker locker(&_mutex); QSqlQuery query; + if( !checkConnect() ) { + return; + } + query.prepare("SELECT retrycount FROM blacklist WHERE path=:path"); query.bindValue(":path", item._file); if( !query.exec() ) { - qDebug() << "SQL exec blacklistitem failed."; + qDebug() << "SQL exec blacklistitem failed:" << query.lastError().text(); return; } From 55e82ee4c16e3e6b01e6391f8b9046cf3adb01ac Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 21 Nov 2013 11:13:58 +0100 Subject: [PATCH 04/42] Made transaction management a bit more transparent. Some fixes. --- src/mirall/csyncthread.cpp | 2 +- src/mirall/owncloudpropagator.cpp | 17 ++--- src/mirall/syncjournaldb.cpp | 109 ++++++++++++++++++++---------- src/mirall/syncjournaldb.h | 8 ++- 4 files changed, 92 insertions(+), 44 deletions(-) diff --git a/src/mirall/csyncthread.cpp b/src/mirall/csyncthread.cpp index b161b82f0..5f08cfe6b 100644 --- a/src/mirall/csyncthread.cpp +++ b/src/mirall/csyncthread.cpp @@ -562,7 +562,7 @@ void CSyncThread::slotFinished() if( ! _journal->postSyncCleanup( _seenFiles ) ) { qDebug() << "Cleaning of synced "; } - _journal->commit(); + _journal->commit("All Finished.", false); emit treeWalkResult(_syncedItems); csync_commit(_csync_ctx); diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp index cdd4819a8..05afb25d4 100644 --- a/src/mirall/owncloudpropagator.cpp +++ b/src/mirall/owncloudpropagator.cpp @@ -176,7 +176,7 @@ void PropagateLocalRemove::start() } } _propagator->_journal->deleteFileRecord(_item._originalFile); - _propagator->_journal->commit(); + _propagator->_journal->commit("Local remove"); done(SyncFileItem::Success); } @@ -205,7 +205,7 @@ void PropagateRemoteRemove::start() return; } _propagator->_journal->deleteFileRecord(_item._originalFile, _item._isDirectory); - _propagator->_journal->commit(); + _propagator->_journal->commit("Remote Remove"); done(SyncFileItem::Success); } @@ -257,7 +257,7 @@ private: pi._transferid = trans->transfer_id; pi._modtime = QDateTime::fromTime_t(trans->modtime); that->_propagator->_journal->setUploadInfo(that->_item._file, pi); - that->_propagator->_journal->commit(); + that->_propagator->_journal->commit("Upload info"); } } @@ -376,7 +376,7 @@ void PropagateUploadFile::start() _propagator->_journal->setFileRecord(SyncJournalFileRecord(_item, _propagator->_localDir + _item._file)); // Remove from the progress database: _propagator->_journal->setUploadInfo(_item._file, SyncJournalDb::UploadInfo()); - _propagator->_journal->commit(); + _propagator->_journal->commit("upload file start"); emit progress(Progress::EndUpload, _item._file, 0, _item._size); done(SyncFileItem::Success); return; @@ -618,7 +618,7 @@ void PropagateDownloadFile::start() pi._tmpfile = tmpFileName; pi._valid = true; _propagator->_journal->setDownloadInfo(_item._file, pi); - _propagator->_journal->commit(); + _propagator->_journal->commit("download file start"); } /* actually do the request */ @@ -752,7 +752,7 @@ void PropagateDownloadFile::start() _propagator->_journal->setFileRecord(SyncJournalFileRecord(_item, fn)); _propagator->_journal->setDownloadInfo(_item._file, SyncJournalDb::DownloadInfo()); - _propagator->_journal->commit(); + _propagator->_journal->commit("download file start2"); emit progress(Progress::EndDownload, _item._file, 0, _item._size); done(isConflict ? SyncFileItem::Conflict : SyncFileItem::Success); } @@ -777,7 +777,7 @@ void PropagateLocalRename::start() record._path = _item._renameTarget; _propagator->_journal->setFileRecord(record); - _propagator->_journal->commit(); + _propagator->_journal->commit("localRename"); emit progress(Progress::EndRename, _item._file, 0, _item._size); @@ -828,7 +828,7 @@ void PropagateRemoteRename::start() record._path = _item._renameTarget; _propagator->_journal->setFileRecord(record); - _propagator->_journal->commit(); + _propagator->_journal->commit("Remote Rename"); done(SyncFileItem::Success); } @@ -974,6 +974,7 @@ void OwncloudPropagator::start(const SyncFileItemVector& _syncedItems) connect(_rootJob.data(), SIGNAL(completed(SyncFileItem)), this, SIGNAL(completed(SyncFileItem))); connect(_rootJob.data(), SIGNAL(progress(Progress::Kind,QString,quint64,quint64)), this, SIGNAL(progress(Progress::Kind,QString,quint64,quint64))); connect(_rootJob.data(), SIGNAL(finished(SyncFileItem::Status)), this, SIGNAL(finished())); + _rootJob->start(); } diff --git a/src/mirall/syncjournaldb.cpp b/src/mirall/syncjournaldb.cpp index 06905bf2f..8251cf820 100644 --- a/src/mirall/syncjournaldb.cpp +++ b/src/mirall/syncjournaldb.cpp @@ -23,13 +23,13 @@ #include "syncjournaldb.h" #include "syncjournalfilerecord.h" -#define QSQLITE "QSQLITE3" +#define QSQLITE "QSQLITE" #define SYNCJOURNALDB_CONNECTION_NAME "SyncJournalDbConnection" namespace Mirall { SyncJournalDb::SyncJournalDb(const QString& path, QObject *parent) : - QObject(parent) + QObject(parent), _transaction(0) { _dbFile = path; @@ -47,6 +47,42 @@ bool SyncJournalDb::exists() return (!_dbFile.isEmpty() && QFile::exists(_dbFile)); } +void SyncJournalDb::startTransaction() +{ + if( _transaction == 0 ) { + if( !_db.transaction() ) { + qDebug() << "ERROR commiting to the database: " << _db.lastError().text(); + return; + } + _transaction = 1; + // qDebug() << "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX Transaction start!"; + } else { + qDebug() << "Database Transaction is running, do not starting another one!"; + } +} + +void SyncJournalDb::commitTransaction() +{ + if( _transaction == 1 ) { + if( ! _db.commit() ) { + qDebug() << "ERROR commiting to the database: " << _db.lastError().text(); + return; + } + _transaction = 0; + // qDebug() << "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX Transaction END!"; + } else { + qDebug() << "No database Transaction to commit"; + } +} + +bool SyncJournalDb::sqlFail( const QString& log, const QSqlQuery& query ) +{ + commitTransaction(); + qWarning() << "Error" << log << query.lastError().text(); + + return false; +} + bool SyncJournalDb::checkConnect() { if( _db.isOpen() ) { @@ -87,18 +123,15 @@ bool SyncJournalDb::checkConnect() QSqlQuery pragma1(_db); pragma1.prepare("PRAGMA synchronous = 1;"); if (!pragma1.exec()) { - qWarning() << "Error setting pragma: " << pragma1.lastError().text(); - return false; + return sqlFail("Set PRAGMA synchronous", pragma1); } pragma1.prepare("PRAGMA case_sensitive_like = ON;"); if (!pragma1.exec()) { - qWarning() << "Error setting pragma: " << pragma1.lastError().text(); - return false; + return sqlFail("Set PRAGMA case_sensitivity", pragma1); } /* Because insert are so slow, e do everything in a transaction, and one need to call commit */ - _db.transaction(); - + startTransaction(); QSqlQuery createQuery(_db); createQuery.prepare("CREATE TABLE IF NOT EXISTS metadata(" @@ -116,8 +149,7 @@ bool SyncJournalDb::checkConnect() ");"); if (!createQuery.exec()) { - qWarning() << "Error creating table metadata : " << createQuery.lastError().text(); - return false; + return sqlFail("Create table metadata", createQuery); } createQuery.prepare("CREATE TABLE IF NOT EXISTS downloadinfo(" @@ -129,8 +161,7 @@ bool SyncJournalDb::checkConnect() ");"); if (!createQuery.exec()) { - qWarning() << "Error creating table downloadinfo : " << createQuery.lastError().text(); - return false; + return sqlFail("Create table downloadinfo", createQuery); } createQuery.prepare("CREATE TABLE IF NOT EXISTS uploadinfo(" @@ -144,8 +175,7 @@ bool SyncJournalDb::checkConnect() ");"); if (!createQuery.exec()) { - qWarning() << "Error creating table downloadinfo : " << createQuery.lastError().text(); - return false; + return sqlFail("Create table uploadinfo", createQuery); } // create the blacklist table. @@ -153,16 +183,17 @@ bool SyncJournalDb::checkConnect() "path VARCHAR(4096)," "lastTryEtag VARCHAR[32]," "lastTryModtime INTEGER[8]," - "retrycount INTEGER default 0," + "retrycount INTEGER," "errorstring VARCHAR[4096]," "PRIMARY KEY(path)" ");"); if (!createQuery.exec()) { - qWarning() << "Error creating table blacklist: " << createQuery.lastError().text(); - return false; + return sqlFail("Create table blacklist", createQuery); } + commit("checkConnect"); + bool rc = updateDatabaseStructure(); if( rc ) { _getFileRecordQuery.reset(new QSqlQuery(_db)); @@ -216,6 +247,8 @@ void SyncJournalDb::close() { QMutexLocker locker(&_mutex); + commitTransaction(); + _getFileRecordQuery.reset(0); _setFileRecordQuery.reset(0); _getDownloadInfoQuery.reset(0); @@ -240,13 +273,19 @@ bool SyncJournalDb::updateDatabaseStructure() bool re = true; // check if the file_id column is there and create it if not + if( !checkConnect() ) { + return false; + } if( columns.indexOf(QLatin1String("fileid")) == -1 ) { + QSqlQuery query(_db); query.prepare("ALTER TABLE metadata ADD COLUMN fileid VARCHAR(128);"); re = query.exec(); query.prepare("CREATE INDEX metadata_file_id ON metadata(fileid);"); re = re && query.exec(); + + commit("update database structure"); } return re; @@ -257,20 +296,21 @@ QStringList SyncJournalDb::tableColumns( const QString& table ) QStringList columns; if( !table.isEmpty() ) { - QString q = QString("PRAGMA table_info(%1);").arg(table); - QSqlQuery query(_db); - query.prepare(q); + if( checkConnect() ) { + QString q = QString("PRAGMA table_info(%1);").arg(table); + QSqlQuery query(_db); + query.prepare(q); - if(!query.exec()) { - QString err = query.lastError().text(); - qDebug() << "Error creating prepared statement: " << query.lastQuery() << ", Error:" << err;; - return columns; - } + if(!query.exec()) { + QString err = query.lastError().text(); + qDebug() << "Error creating prepared statement: " << query.lastQuery() << ", Error:" << err;; + return columns; + } - while( query.next() ) { - columns.append( query.value(1).toString() ); + while( query.next() ) { + columns.append( query.value(1).toString() ); + } } - query.finish(); } qDebug() << "Columns in the current journal: " << columns; @@ -700,18 +740,19 @@ void SyncJournalDb::updateBlacklistEntry( const SyncJournalBlacklistRecord& item } } -void SyncJournalDb::commit() +void SyncJournalDb::commit(const QString& context, bool startTrans ) { - QMutexLocker locker(&_mutex); - if (!_db.commit()) { - qDebug() << "ERROR commiting to the database: " << _db.lastError().text(); + qDebug() << "Transaction Start " << context; + commitTransaction(); + + if( startTrans ) { + startTransaction(); } - _db.transaction(); } SyncJournalDb::~SyncJournalDb() { - _db.commit(); + commitTransaction(); } diff --git a/src/mirall/syncjournaldb.h b/src/mirall/syncjournaldb.h index 778c84f18..e6f0b4b2a 100644 --- a/src/mirall/syncjournaldb.h +++ b/src/mirall/syncjournaldb.h @@ -68,9 +68,13 @@ public: /* Because sqlite transactions is really slow, we encapsulate everything in big transactions * Commit will actually commit the transaction and create a new one. */ - void commit(); + void commit(const QString &context, bool startTrans = true); void close(); + + void startTransaction(); + void commitTransaction(); + signals: public slots: @@ -78,11 +82,13 @@ public slots: private: qint64 getPHash(const QString& ) const; bool updateDatabaseStructure(); + bool sqlFail(const QString& log, const QSqlQuery &query ); bool checkConnect(); QSqlDatabase _db; QString _dbFile; QMutex _mutex; // Public functions are protected with the mutex. + int _transaction; QScopedPointer _getFileRecordQuery; QScopedPointer _setFileRecordQuery; QScopedPointer _getDownloadInfoQuery; From 8d2950f66ce569837726bba9b07f1cb0b6c014be Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 21 Nov 2013 11:37:47 +0100 Subject: [PATCH 05/42] Enable the overall file count in progress again. --- src/mirall/csyncthread.cpp | 14 +++++++++++++- src/mirall/csyncthread.h | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/mirall/csyncthread.cpp b/src/mirall/csyncthread.cpp index 5f08cfe6b..3869fab20 100644 --- a/src/mirall/csyncthread.cpp +++ b/src/mirall/csyncthread.cpp @@ -580,11 +580,23 @@ void CSyncThread::slotProgress(Progress::Kind kind, const QString &file, quint64 { Progress::Info pInfo = _progressInfo; + if( kind == Progress::StartSync ) { + QMutexLocker lock(&_mutex); + _currentFileNo = 0; + } + if( kind == Progress::StartDelete || + kind == Progress::StartDownload || + kind == Progress::StartRename || + kind == Progress::StartUpload ) { + QMutexLocker lock(&_mutex); + _currentFileNo += 1; + } + pInfo.kind = kind; pInfo.current_file = file; pInfo.file_size = total; pInfo.current_file_bytes = curr; - + pInfo.current_file_no = _currentFileNo; pInfo.overall_current_bytes += curr; pInfo.timestamp = QDateTime::currentDateTime(); diff --git a/src/mirall/csyncthread.h b/src/mirall/csyncthread.h index 4cbe1eb6f..8d76b18c2 100644 --- a/src/mirall/csyncthread.h +++ b/src/mirall/csyncthread.h @@ -112,6 +112,7 @@ private: Progress::Info _progressInfo; int _downloadLimit; int _uploadLimit; + int _currentFileNo; QAtomicInt _abortRequested; From c0b3672f32ce62d5ac9f4f65e1c57cf220d9e561 Mon Sep 17 00:00:00 2001 From: "Mr. Jenkins" Date: Thu, 21 Nov 2013 08:09:18 -0500 Subject: [PATCH 06/42] [tx-robot] updated from transifex --- translations/mirall_ca.ts | 1205 +++++++++++++++++----------------- translations/mirall_cs.ts | 694 +++++++++----------- translations/mirall_de.ts | 702 ++++++++++---------- translations/mirall_el.ts | 678 +++++++++---------- translations/mirall_en.ts | 679 +++++++++---------- translations/mirall_es.ts | 706 ++++++++++---------- translations/mirall_es_AR.ts | 722 ++++++++++---------- translations/mirall_et.ts | 716 ++++++++++---------- translations/mirall_eu.ts | 678 +++++++++---------- translations/mirall_fa.ts | 678 +++++++++---------- translations/mirall_fi.ts | 688 +++++++++---------- translations/mirall_fr.ts | 698 +++++++++----------- translations/mirall_gl.ts | 694 +++++++++----------- translations/mirall_hu.ts | 676 +++++++++---------- translations/mirall_it.ts | 694 +++++++++----------- translations/mirall_ja.ts | 696 +++++++++----------- translations/mirall_nl.ts | 694 +++++++++----------- translations/mirall_pl.ts | 692 +++++++++---------- translations/mirall_pt.ts | 704 ++++++++++---------- translations/mirall_pt_BR.ts | 694 +++++++++----------- translations/mirall_ru.ts | 718 ++++++++++---------- translations/mirall_sk.ts | 877 ++++++++++++------------- translations/mirall_sl.ts | 1022 ++++++++++++++-------------- translations/mirall_sv.ts | 702 ++++++++++---------- translations/mirall_th.ts | 674 +++++++++---------- translations/mirall_uk.ts | 676 +++++++++---------- translations/mirall_zh_CN.ts | 678 +++++++++---------- translations/mirall_zh_TW.ts | 696 +++++++++----------- 28 files changed, 9635 insertions(+), 10796 deletions(-) diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts index 5df80d44c..98af62515 100644 --- a/translations/mirall_ca.ts +++ b/translations/mirall_ca.ts @@ -9,7 +9,7 @@ Pick a local folder on your computer to sync - + Escolliu una carpeta local en el vostre equip per sincronitzar-la @@ -32,7 +32,7 @@ Select a destination folder - + Seleccioneu una carpeta de destí @@ -47,7 +47,7 @@ Folders - + Carpetes: @@ -65,31 +65,26 @@ Account Maintenance - + Manteniment del compte Edit Ignored Files - + Edita fitxers ignorats Modify Account - - - - - Sync Status - + Modifica el compte Connected with <server> as <user> - + Connectat amb <server> com a <user> - + Pause Pausa @@ -101,6 +96,11 @@ Add Folder... + Afegeix carpeta... + + + + Accounts to Synchronize @@ -111,123 +111,118 @@ 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> - - Checking %1 connection... - Comprovant la connexió %1... - - - + No %1 connection configured. La connexió %1 no està configurada. - + Sync Running S'està sincronitzant - + + No account configured. + + + + The syncing operation is running.<br/>Do you want to terminate it? S'està sincronitzant.<br/>Voleu parar-la? - - - Connected to <a href="%1">%2</a>. - - - - - Version: %1 (%2) - Versió: %1 (%2) - - - - unknown problem. - Problema desconegut. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>La connexió amb %1 ha fallat: <tt>%2</tt></p> - - - - Start - - - - - Currently - - - - - Completely - - - - - %1 %2 %3 (%4 of %5) - - - - - Completely finished. - - - - - %1 of %2, file %3 of %4 - - - - - %1 of %2 in use. - - - Currently there is no storage usage information available. + %1 of %2 (%3%) in use. + + + Connected to <a href="%1">%2</a>. + Connectat a <a href="%1">%2</a>. + + + + Start + Comença + + + + Currently + Actualment + + + + Completely + Copletament + + + + %1 %2 %3 (%4 of %5) + %1 %2 %3 (%4 de %5) + + + + Completely finished. + Completament acabat. + + + + %1 of %2, file %3 of %4 + %1 de %2, fitxer %3 de %4 + + + + Connected to <a href="%1">%2</a> as <i>%3</i>. + + + + + No connection to %1 at <a href="%1">%2</a>. + + + + + Currently there is no storage usage information available. + Actualment no hi ha informació disponible de l'ús d'emmagatzemament. + Mirall::CSyncThread @@ -249,7 +244,7 @@ CSync failed to write the state db. - + CSync ha falat en escriure l'estat de la db. @@ -299,7 +294,7 @@ <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> @@ -319,7 +314,7 @@ CSync could not authenticate at the proxy. - + CSync no s'ha pogut acreditar amb el proxy. @@ -357,6 +352,11 @@ CSync unspecified error. Error inespecífic de CSync. + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -375,7 +375,7 @@ Aborted by the user - + Aturat per l'usuari @@ -386,231 +386,202 @@ Mirall::ConnectionValidator - - No ownCloud connection configured + + No ownCloud account configured + + + The configured server for this client is too old + El servidor configurat per aquest client és massa antic + + + + Please update to the latest server and restart the client. + Actualitzeu el servidor a l'última versió i reestabliu el client. + - The configured server for this client is too old - - - - - Please update to the latest server and restart the client. - - - - Unable to connect to %1 - + No es pot connectar amb %1 - + The provided credentials are not correct - - - - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - No s'ha trobat cap contrasenya en la cadena de claus. Configureu-la de nou. + Les credencials proporcionades no són correctes Mirall::Folder - + Unable to create csync-context - + No s'ha pogut crear el context-csync - + Local folder %1 does not exist. El fitxer local %1 no existeix. - + %1 should be a directory but is not. %1 hauria de ser una carpeta, però no ho és. - + %1 is not readable. No es pot llegir %1. - + File %1: %2 - + Fitxer %1: %2 - + + File %1 + Fitxer %1 + + + + downloaded - - New file available + + removed - - '%1' has been synced to this machine. + + updated - - New files available - - - - - '%1' and %n other file(s) have been synced to this machine. - - - - - File removed + + renamed - - '%1' has been removed. + + '%1' has been %2. - - Files removed - - - - - '%1' and %n other file(s) have been removed. - - - - - File updated + + Files %1 - - '%1' has been updated. + + '%1' and %2 other files have been %3. - - Files updated - - - - - '%1' and %n other file(s) have been updated. - - - - + Error Error - + The CSync thread terminated. El fil de CSync ha acabat. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". - + Aquesta sincronització eliminarà tots els fitxers a la carpeta local de sincronització '%1'. +Si vós o l'administrador heu reinicialitzat el compte en el servidor, escolliu "Mantenir fitxers". Si voleueliminar les dades, escolliu "Esborra tots els fitxers". - + 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? - + Aquesta sincronització podria eliminar tots els fitxers en la carpeta de sincronització '%1'. +Això podria ser perquè la carpeta ha estat reconfigurada silenciosament, o que tots els fitxers han estat eliminats manualment. +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 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. - + 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. - + %1 (Sync is paused) - + %1 (Sync està pausat) @@ -619,12 +590,12 @@ Are you sure you want to perform this operation? File - + Fitxer Syncing all files in your account with - + Sincronitzant tots els fitxers del compte amb @@ -639,14 +610,16 @@ Are you sure you want to perform this operation? Could not monitor directories due to system limitations. The application will not work reliably. Please check the documentation for possible fixes. - + No s'han pogut monitoritzar carpetes degut a limitacions del sistema. +L'aplicació no funcionarà de forma fiable. Comproveu la +documentació per possibles solucions. Mirall::FolderWizard - - + + Add Folder Afegeix una carpeta @@ -654,42 +627,42 @@ documentation for possible fixes. Mirall::FolderWizardSourcePage - + No local folder selected! - + No heu seleccionat cap carpeta local! - + 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.<br/>Please pick another one! El camí local %1 ja és una carpeta de pujada.<br/>Seleccioneu-ne un altre! - + An already configured folder is contained in the current entry. L'entrada actual conté una carpeta ja configurada. - + An already configured folder contains the currently entered directory. La carpeta que heu entrat conté una carpeta ja configurada. - + The alias can not be empty. Please provide a descriptive alias word. L'àlies no pot ser buit. Faciliteu una paraula descriptiva. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>L'àlies <i>%1</i> ja està en ús. Seleccioneu-ne un altre. - + Select the source folder Seleccioneu la carpeta font @@ -697,44 +670,44 @@ documentation for possible fixes. Mirall::FolderWizardTargetPage - + 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.<br/>Please check manually. Ha fallat en crear la carpeta a %1.<br/>Comproveu-ho manualment. - + Choose this to sync the entire account - + Escolliu-ho per sincronitzar el compte sencer - + This directory is already being synced. - + La carpeta ja s'està sincronitzant. - + 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>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. - + Si seleccioneu la carpeta arrel <b>no</b> odreu configurar una altra carpeta de sincronització. @@ -746,23 +719,23 @@ documentation for possible fixes. - General - General + General Setttings + Launch on System Startup - + Executa en iniciar el sistema Show Desktop Notifications - + Mostra les notificacions d'escriptori Use Monochrome Icons - + Usa icones en monocrom @@ -776,7 +749,7 @@ documentation for possible fixes. Ignored Files Editor - + Editor de fitxers ignorats @@ -789,89 +762,91 @@ documentation for possible fixes. Elimina - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. - - - - - Could not open file - + Els fitxers que compleixin amb un patró no es sincronitzaran. + +Els elements marcats també s'eliminaran si prevenen l'eliminació d'una carpeta. Això és útil per metadades. - Cannot write changes to '%1'. - + Could not open file + No s'ha pogut obrir el fitxer - - - Add Ignore Pattern - + + Cannot write changes to '%1'. + No es poden desar els canvis a '%1'. - Add a new ignore pattern: - + Add Ignore Pattern + Afegeix una plantilla per ignorar - + + + Add a new ignore pattern: + Afegeix una nova plantilla d'ignorats: + + + This entry is provided by the system at '%1' and cannot be modified in this view. - + Això es proporciona completament pel sistema a '%1' i no es pot modificar en aquesta vista. Mirall::LogBrowser - + Log Output Sortida de registre - + &Search: &Cerca: - + &Find &Troba - + Clear Neteja - + Clear the log display. Neteja l'inici de sessió. - + S&ave Des&a - + Save the log file to a file on disk for debugging. Desa el fitxer de registre al disc per depuració - + Error Error - + Save log file Desa el fitxer de registre - + Could not write to log file No s'ha pogut escriure el fitxer de registre @@ -914,7 +889,7 @@ Checked items will also be deleted if they prevent a directory from being remove Specify proxy manually as - + Especifiqueu manualment el proxi com a @@ -924,45 +899,45 @@ Checked items will also be deleted if they prevent a directory from being remove : - + : Proxy server requires authentication - + El servidor Proxy requereix autenticació Download Bandwidth - + Ample de banda de baixada Limit to - + Limita a KBytes/s - + KBytes/s No limit - + Sense límit Upload Bandwidth - + Ample de banda de pujada Limit automatically - + Limita automàticament @@ -982,101 +957,78 @@ Checked items will also be deleted if they prevent a directory from being remove HTTP(S) proxy - + proxy HTTP(S) SOCKS5 proxy - + proxy SOCKS5 Mirall::OwncloudAdvancedSetupPage - - - Connect to %1 - - + Connect to %1 + Connectat a %1 + + + Setup local folder options - + Estableix les opcions de carpeta local - + Connect... - + Connecta... - + Your entire account will be synced to the local folder '%1'. - + El compte sencer es sincronitzarà amb la carpeta local '%1'. - + %1 folder '%2' is synced to local folder '%3' - + %1 carpeta '%2' està sincronitzat amb la carpeta local '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> - + <p><small><strong>Avís:</strong> Teniu múltiples carpetes configurades. Si continueu amb la configuració actual, la configuració de carpetes es descartarà i només es crearà una única carpeta arrel de sincronització!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> - + <p><small><strong>Avís:</strong> La carpeta local no està buida. Escolliu una resolució!</small></p> - + Local Sync Folder - + Fitxer local de sincronització - + Update advanced setup - + Configuració avançada d'actualització Mirall::OwncloudHttpCredsPage - - - Connect to %1 - - + Connect to %1 + Connecta a %1 + + + Enter user credentials - + Escriviu les credencials d'usuari - + Update user credentials - - - - - Mirall::OwncloudPropagator - - - Aborted - - - - - Could not remove directory %1 - - - - - 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. - + Actualitza les credencials d'usuari @@ -1084,155 +1036,152 @@ Checked items will also be deleted if they prevent a directory from being remove Connect to %1 - + Connecta a %1 Setup %1 server - + Configura el sevidor %1 This url is secure. You can use it. - + Aquesta url és segura. Podeu usar-la. This url is NOT secure. You should not use it. - + Aquesta url no és segura. No hauríeu d'usar-la. - + Update %1 server - + Actualitza el servidor %1 Mirall::OwncloudSetupWizard - + Folder rename failed - + Ha fallat en canviar el nom de la carpeta - + 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ó. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - - - - + <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/> - - Failed to connect to %1:<br/>%2 - - - - + 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 - - The remote folder could not be accessed! + + No remote folder specified! - + 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. @@ -1240,7 +1189,7 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizard - + %1 Connection Wizard Assistent de connexió %1 @@ -1248,29 +1197,29 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizardResultPage - + Open %1 - + Obre %1 - + Open Local Folder - + Obre carpeta local - + Everything set up! - + Tot està configurat! - + Your entire account is synced to the local folder <i>%1</i> - + El vostre compte està sincronitzat amb la carpeta local <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> - + %1 carpeta <i>%1</i> està sincronitzat amb la carpeta local <i>%2</i> @@ -1282,18 +1231,18 @@ Checked items will also be deleted if they prevent a directory from being remove - Detailed Sync Protocol - Protocol de sincronització detallat + Detailed Sync Status + 3 - + 3 4 - + 4 @@ -1308,7 +1257,7 @@ Checked items will also be deleted if they prevent a directory from being remove File - + Fitxer @@ -1318,7 +1267,7 @@ Checked items will also be deleted if they prevent a directory from being remove Action - + Acció @@ -1333,13 +1282,14 @@ Checked items will also be deleted if they prevent a directory from being remove Soft Link ignored - + Ordena els enllaços ignorats Softlinks break the semantics of synchronization. Please do not use them in synced directories - + Els enllaços febles trenquen la semàntica de la sincronització. +No els useu en carpetes sincronitzades @@ -1356,39 +1306,43 @@ Please do not use them in synced directories The %1 was ignored because it is listed in the clients ignore list or the %1 name contains characters that are not syncable in a cross platform environment - + %1 ha estat ignorat perquè està a la llista d'ignorats del client +o el nom %1 conté caràcters que no són sincronitzables +en un entorn multiplataforma Item ignored - + Element ignorat %1 on ignore list - + %1 a la llista d'ignorats The %1 was skipped because it is listed on the clients list of names to ignore - + %1 s'ha omès perquè consta a la llista del client +de noms a ignorar Invalid characters - + Caràcters no vàlids The %1 name contains one or more invalid characters which break syncing in a cross platform environment - + El nom %1 conté un o més caràcters no vàlids que trenquen +la sincronització en un entorn multiplataforma Conflict file. - + Fitxer en conflicte @@ -1396,7 +1350,10 @@ syncing in a cross platform environment created a so called conflict. The local change is copied to the conflict file while the file from the server side is available under the original name - + El fitxer ha canviat en el servidor i en el dipòsit local i com a resultat ha +generat un conflicte. El canvi local s'ha copiat en el fitxer conflicte +mentre que el fitxer del servidor està disponible amb el nom +original @@ -1405,18 +1362,18 @@ name - The sync protocol has been copied to the clipboard. - El protocol de sincronització s'ha copiat al porta-retalls. + The sync status has been copied to the clipboard. + Problem: %1 - + Problema: %1 No more storage space available on server. - + No hi ha més espai disponible en el servidor. @@ -1427,28 +1384,52 @@ name Arranjament - + %1 + %1 + + + + Status - - Protocol - - - - + General General - + Network + Xarxa + + + + Account + Compte + + + + Mirall::ShibbolethWebView + + + %1 - Authenticate - - Account + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. @@ -1466,67 +1447,67 @@ name - + SSL Connection Connexió SSL - + Warnings about current SSL Connection: Avisos quant a la connexió SSL actual: - + with Certificate %1 amb certificat %1 - - - + + + &lt;not specified&gt; &lt;no especificat&gt; - - + + Organization: %1 Organització %1 - - + + Unit: %1 Unitat: %1 - - + + Country: %1 País: %1 - + Fingerprint (MD5): <tt>%1</tt> Empremta digital (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Empremta digital (SHA1): <tt>%1</tt> - + Effective Date: %1 Data d'efecte: %1 - + Expiry Date: %1 Data d'expiració: %1 - + Issuer: %1 Emissor: %1 @@ -1536,195 +1517,142 @@ name New Version Available - + Versió nova disponible <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> - - - - - Skip update - + <p>Hi ha una versió nova del client %1.</p><p><b>%2</b> disponible per baixar. La versió instal·lada és %3.<p> - Skip this time - + Skip update + Omet l'actualització + Skip this time + Omet aquesta vegada + + + Get update - + Obtén l'actialització Mirall::ownCloudGui - + %1 Sync Started %1 Sincronització iniciada - + Sync started for %n configured sync folder(s). - + la sincronització ha començat per la carpeta %1 configurada().la sincronització ha començat per les carpetes %1 configurade(s). - + Folder %1: %2 - + Carpeta %1: %2 - + No sync folders configured. No hi ha fitxers de sincronització configurats - - - None. - - - Recent Changes - + None. + Cap. - + + Recent Changes + Canvis recents + + + Open %1 folder Obre la carpeta %1 - + Managed Folders: Fitxers gestionats: - + Open folder '%1' - - - - - Open %1 in browser - - - - - Calculating quota... - - - - - Unknown status - - - - - Settings... - + Obre carpeta '%1' - Details... - + 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 - - - - - Quota n/a - + Surt %1 + 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 - + %1 (%2, %3) - + %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) - + Sincronitzant %1 de %2 (%3 de %4) - + Up to date Actualitzat - - Mirall::ownCloudInfo - - - Proxy Refused Connection - - - - - The configured proxy has refused the connection. Please check the proxy settings. - - - - - Proxy Closed Connection - - - - - The configured proxy has closed the connection. Please check the proxy settings. - - - - - Proxy Not Found - - - - - The configured proxy could not be found. Please check the proxy settings. - - - - - Proxy Authentication Error - - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - - - - - Proxy Connection Timed Out - - - - - The connection to the configured proxy has timed out. - - - OwncloudAdvancedSetupPage @@ -1742,42 +1670,42 @@ name &Local Folder - + Carpeta &local pbSelectLocalFolder - + pbSelectLocalFolder &Keep local data - + &Mantén les dades locals <small>Syncs your existing data to new location.</small> - + <small>Sincronitza les dades existents amb la nova ubicació.</small> <html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html> - + <html><head/><body><p>Si aquesta caixa està marcada, el contingut existent en la carpeta local s'eliminarà per començar una carpeta de sincronització des del servidor.</p><p>No la marqueu si el contingut local s'ha de pujar a la carpeta del servidor.</p></body></html> &Start a clean sync - + %Inicia una sincronització des de zero <small>Erases the contents of the local folder before syncing using the new settings.</small> - + <small>Elimina el contingut de la carpeta local abans de sincronitzar-la usant l'arranjament nou.</small> Status message - + Missatge d'estat @@ -1790,17 +1718,17 @@ name &Username - + Nom d'&usuari &Password - + &Contrasenya Error Label - + Etiqueta d'error @@ -1890,80 +1818,80 @@ name &Local Folder - + Carpeta &local pbSelectLocalFolder - + pbSelectLocalFolder &Keep local data - + &Mantén les dades locals <small>Syncs your existing data to new location.</small> - + <small>Sincronitza les dades existents amb la nova ubicació.</small> <html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html> - + <html><head/><body><p>Si aquesta caixa està marcada, el contingut existent en la carpeta local s'eliminarà per començar una carpeta de sincronització des del servidor.</p><p>No la marqueu si el contingut local s'ha de pujar a la carpeta del servidor.</p></body></html> &Start a clean sync - + %Inicia una sincronització des de zero <small>Erases the contents of the local folder before syncing using the new settings.</small> - + <small>Elimina el contingut de la carpeta local abans de sincronitzar-la usant l'arranjament nou.</small> Server &Address - + &Adreça del servidor https://... - + https://... &Username - + Nom d'&usuari &Password - + &Contrasenya Error Label - + Etiqueta d'error Advanced &Settings - + A&rranjament avançat Status message - + Missatge d'estat Enter the URL of the server that you want to connect to (without http or https). - + Escriviu la URL del servidor al que us voleu connectar (sense http o https). @@ -1981,12 +1909,41 @@ name Your entire account is synced to the local folder - + El vostre compte està totalment sincronitzat amb la carpeta local PushButton + PushButton + + + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. @@ -1995,40 +1952,40 @@ name %L1 TB - + %L1 TB %L1 GB - + %L1 GB %L1 MB - + %L1 MB %L1 kB - + %L1 kB %L1 B - + %L1 B main.cpp - + System Tray not available - + La safata del sistema no està disponible - + %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 requereix una safata del sistema que funcioni. Si esteu executant XFCE seguiu <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">aquestes instruccions</a>. Altrament, instal·leu una aplicació de safata com 'trayer' i intenteu-ho de nou. @@ -2037,7 +1994,7 @@ name 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ó. @@ -2045,12 +2002,12 @@ name <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p> - + <p><small>Construit de la revisió Git <a href="%1">%2</a> a %3, %4 usant OCsync %5 i Qt %6.</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, 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 @@ -2069,70 +2026,86 @@ name - + Context - + Context Inactive - + Inactiiu Start - + Comença Finished - + Acabat For deletion - + Per esborrar - + deleted esborrat - - - - downloading + + + Move - - - - uploading - + + + + downloading + baixant - inactive - - - - - starting - - - + - finished - + uploading + pujant + + + + inactive + inactiu + starting + iniciant + + + + finished + acabat + + + delete elimina + + + move + + + + + moved + + theme @@ -2159,7 +2132,7 @@ name Sync Success, problems with individual files. - + Sincronització amb èxit, problemes amb fitxers individuals. @@ -2174,17 +2147,17 @@ name The server is currently unavailable - + El servidor actualment no esta disponible Preparing to sync - + Preparant per sincronitzar Aborting... - + Cancel·lant... \ No newline at end of file diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts index d3345ab91..cf49188e7 100644 --- a/translations/mirall_cs.ts +++ b/translations/mirall_cs.ts @@ -77,11 +77,6 @@ Modify Account Upravit účet - - - Sync Status - Stav synchronizace - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause Pozastavit @@ -103,6 +98,11 @@ Add Folder... Přidat složku... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ 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> - - Checking %1 connection... - Kontroluji spojení s %1.... - - - + No %1 connection configured. Žádné spojení s %1 nenastaveno. - + Sync Running Synchronizace probíhá - + + No account configured. + + + + 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 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. Připojeno k <a href="%1">%2</a>. - - Version: %1 (%2) - Verze: %1 (%2) - - - - unknown problem. - neznámý problém. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>Spojení s %1 selhalo: <tt>%2</tt></p> - - - + Start Spuštění - + Currently Aktuálně - + Completely Úplně - + %1 %2 %3 (%4 of %5) %1 %2 %3 (%4 z %5) - + Completely finished. Úplně dokončeno. - + %1 of %2, file %3 of %4 %1 z %2, soubor %3 z %4 - - %1 of %2 in use. - %1 z %2 v užívání. + + Connected to <a href="%1">%2</a> as <i>%3</i>. + - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. Momentálně nejsou k dispozici žádné informace o využití úložiště @@ -357,6 +352,11 @@ CSync unspecified error. Nespecifikovaná chyba CSync. + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -386,150 +386,118 @@ Mirall::ConnectionValidator - - No ownCloud connection configured - Nebylo nastaveno žádné připojení k ownCloud + + No ownCloud account configured + - + The configured server for this client is too old Server nastavený pro tohoto klienta je příliš starý - + Please update to the latest server and restart the client. Prosím, aktualizujte na poslední verzi serveru a restartujte klienta. - + Unable to connect to %1 Nelze se připojit k %1 - + The provided credentials are not correct Poskytnuté přihlašovací údaje nejsou správné - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - Záznam hesla nebyl nalezen v klíčence. Prosím nastavte jej znovu. - - Mirall::Folder - + Unable to create csync-context Nepodařilo se vytvořit csync-context - + Local folder %1 does not exist. Místní složka %1 neexistuje. - + %1 should be a directory but is not. %1 by měl být adresář, ale není. - + %1 is not readable. %1 není čitelný. - + File %1: %2 Soubor %1: %2 - + + File %1 Soubor %1 - - New file available - Je k dispozici nový soubor + + downloaded + - - '%1' has been synced to this machine. - '%1' byl sesynchronizován na tento počítač. + + removed + - - New files available - Jsou k dispozici nové soubory - - - - '%1' and %n other file(s) have been synced to this machine. - '%1' a další %n soubor(y) byl sesynchronizován na tento počítač.'%1' a další %n soubor(y) byly sesynchronizovány na tento počítač.'%1' a dalších %n soubor(ů) bylo sesynchronizováno na tento počítač. + + updated + - - File removed - Soubor odebrán + + renamed + - - '%1' has been removed. - '%1' bylo odebráno. + + '%1' has been %2. + - - Files removed - Soubory odebrány - - - - '%1' and %n other file(s) have been removed. - '%1' a další %n soubor(y) byly odebrány.'%1' a další %n soubor(y) byly odebrány.'%1' a dalších %n soubor(ů) bylo odebráno. + + Files %1 + - - File updated - Soubor aktualizován + + '%1' and %2 other files have been %3. + - - '%1' has been updated. - '%1' byl aktualizován. - - - - Files updated - Soubory aktualizovány - - - - '%1' and %n other file(s) have been updated. - '%1' a další %n soubor(y) byly aktualizovány.'%1' a další %n soubor(y) byly aktualizovány.'%1' a dalších %n soubor(ů) bylo aktualizováno. - - - + Error Chyba - + The CSync thread terminated. Vlákno CSync ukončeno. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". Tato synchronizace by smazala všechny soubory v místní složce '%1' Pokud jste vy nebo váš správce zresetovali účet na serveru, zvolte "Ponechat soubory". Pokud chcete místní data odstranit, zvolte "Odstranit všechny soubory". - + 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? @@ -538,17 +506,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 @@ -556,62 +524,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á. - + 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. - + %1 (Sync is paused) %1 (Synchronizace je pozastavena) @@ -650,8 +618,8 @@ dokumentací pro možnost opravy. Mirall::FolderWizard - - + + Add Folder Přidat složku @@ -659,42 +627,42 @@ dokumentací pro možnost opravy. Mirall::FolderWizardSourcePage - + No 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.<br/>Please pick another one! Cesta %1 je již nastavena jako adresář pro odesílání.<br/>Zvolte, prosím, jinou! - + An already configured folder is contained in the current entry. Nastavená složka je již obsažena v aktuálním záznamu. - + An already configured folder contains the currently entered directory. Nastavená složka již obsahuje právě zadaný adresář. - + 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. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>Alias <i>%1</i> je již používán. Zvolte prosím jiný. - + Select the source folder Zvolte zdrojovou složku @@ -702,42 +670,42 @@ dokumentací pro možnost opravy. Mirall::FolderWizardTargetPage - + Add Remote Folder Přidat vzdálený adresář - + Enter the name of the new folder: Zadejte název nového adresáře: - + Folder was successfully created on %1. Složka byla úspěšně vytvořena na %1. - + Failed to create the folder on %1.<br/>Please check manually. Na %1 selhalo vytvoření složky.<br/>Zkontrolujte jej, prosím, ručně. - + Choose this to sync the entire account Zvolte toto k provedení synchronizace celého účtu - + This directory is already being synced. Tento adresář je již synchronizován. - + 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á. - + If you sync the root folder, you can <b>not</b> configure another sync directory. Pokud synchronizujete kořenový adresář, již <b>není</b> možné nastavit synchronizaci dalších adresářů. @@ -751,8 +719,8 @@ dokumentací pro možnost opravy. - General - Hlavní + General Setttings + @@ -794,7 +762,7 @@ dokumentací pro možnost opravy. Odebrat - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. @@ -803,29 +771,29 @@ Checked items will also be deleted if they prevent a directory from being remove Zvolené položky budou smazány také v případě, že brání smazání adresáře. To je užitečné u meta dat. - + Could not open file Nepodařilo se otevřít soubor - + Cannot write changes to '%1'. Nelze zapsat změny do '%1'. - - + + Add Ignore Pattern Přidat masku ignorovaných - - + + Add a new ignore pattern: Přidat novou masku ignorovaných souborů: - + This entry is provided by the system at '%1' and cannot be modified in this view. Tato položka je poskytnuta systémem na '%1' a nemůže být v tomto pohledu změněna. @@ -833,52 +801,52 @@ Zvolené položky budou smazány také v případě, že brání smazání adres Mirall::LogBrowser - + Log Output Zaznamenat výstup - + &Search: &Hledat: - + &Find Na&jít - + Clear Vyčistit - + Clear the log display. Vyčistit výpis logu. - + S&ave &Uložit - + Save the log file to a file on disk for debugging. Uložit soubor záznamu na disk pro ladění. - + Error Chyba - + Save log file Uložit log - + Could not write to log file Nemohu zapisovat do log souboru @@ -1000,47 +968,47 @@ Zvolené položky budou smazány také v případě, že brání smazání adres Mirall::OwncloudAdvancedSetupPage - + Connect to %1 Připojit k %1 - + Setup local folder options Možnosti nastavení místní složky - + Connect... Připojit... - + Your entire account will be synced to the local folder '%1'. Celý váš účet bude synchronizován do místní složky '%1'. - + %1 folder '%2' is synced to local folder '%3' %1 složka '%2' je synchronizována do místní složky '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> <p><small><strong>Varování:</strong> Aktuálně máte nastavenu synchronizaci více složek. Pokud budete pokračovat s tímto nastavení, nastavení složek bude zapomenuto a bude vytvořena synchronizace jedné kořenové složky!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> <p><small><strong>Varování:</strong> Místní složka není prázdná. Zvolte další postup.</small></p> - + Local Sync Folder Místní synchronizovaná složka - + Update advanced setup Změnit pokročilé nastavení @@ -1048,44 +1016,21 @@ Zvolené položky budou smazány také v případě, že brání smazání adres Mirall::OwncloudHttpCredsPage - + Connect to %1 Připojit k %1 - + Enter user credentials Zadejte uživatelské údaje - + Update user credentials Upravte uživatelské údaje - - Mirall::OwncloudPropagator - - - Aborted - Zrušeno - - - - Could not remove directory %1 - Nepodařilo se odstranit adresář %1 - - - - 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. - - - Mirall::OwncloudSetupPage @@ -1109,7 +1054,7 @@ Zvolené položky budou smazány také v případě, že brání smazání adres URL není zabezpečená. Neměli byste ji používat. - + Update %1 server Upravit server %1 @@ -1117,129 +1062,126 @@ Zvolené položky budou smazány také v případě, že brání smazání adres Mirall::OwncloudSetupWizard - + Folder rename failed Přejmenování složky selhalo - + 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. Nedaří se přesunout a zazálohovat složku, protože složka nebo soubor v ní je právě používána jiným programem. Ukončete práci s touto složkou nebo souborem a zkuste to znovu nebo ukončete nastavení. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - Pokouším se připojit k %1 na %2 pro zjištění typu ověření... - - - + <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/> - - Failed to connect to %1:<br/>%2 - Selhalo spojení s %1:<br/>%2 - - - + 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 - - The remote folder could not be accessed! - Nelze přistoupit ke vzdálené složce! + + + Failed to connect to %1 at %2:<br/>%3 + - + + No remote folder specified! + + + + 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. @@ -1247,7 +1189,7 @@ Zvolené položky budou smazány také v případě, že brání smazání adres Mirall::OwncloudWizard - + %1 Connection Wizard %1 Průvodce spojením @@ -1255,27 +1197,27 @@ Zvolené položky budou smazány také v případě, že brání smazání adres Mirall::OwncloudWizardResultPage - + Open %1 Otevřít %1 - + Open Local Folder Otevřít místní složku - + Everything set up! Všechno je nastaveno! - + Your entire account is synced to the local folder <i>%1</i> Celý váš účet je synchronizován do místní složky <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> Složka %1 <i>%1</i> je synchronizována do místní složky <i>%2</i> @@ -1289,8 +1231,8 @@ Zvolené položky budou smazány také v případě, že brání smazání adres - Detailed Sync Protocol - Detailní protokol synchronizace + Detailed Sync Status + @@ -1420,8 +1362,8 @@ dostupný pod původním názvem - The sync protocol has been copied to the clipboard. - Protokol synchronizace byl zkopírován do schránky. + The sync status has been copied to the clipboard. + @@ -1442,31 +1384,55 @@ dostupný pod původním názvem Nastavení - + %1 %1 - - Protocol - Protokol + + Status + - + General Hlavní - + Network Síť - + Account Účet + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1481,67 +1447,67 @@ dostupný pod původním názvem - + SSL Connection SSL připojení - + Warnings about current SSL Connection: Varování v aktuálním SSL spojení: - + with Certificate %1 s certifikátem %1 - - - + + + &lt;not specified&gt; &lt;nespecifikováno&gt; - - + + Organization: %1 Organizace: %1 - - + + Unit: %1 Jednotka: %1 - - + + Country: %1 Země: %1 - + Fingerprint (MD5): <tt>%1</tt> Otisk (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Otisk (SHA1): <tt>%1</tt> - + Effective Date: %1 Datum účinnosti: %1 - + Expiry Date: %1 Datum vypršení platnosti: %1 - + Issuer: %1 Vydavatel: %1 @@ -1559,17 +1525,17 @@ dostupný pod původním názvem <p>Je k dispozici nová verze klienta %1.</p><p><b>%2</b> je k dispozici ke stažení. Aktuálně nainstalovaná verze je %3.<p> - + Skip update Přeskočit aktualizaci - + Skip this time Tentokrát přeskočit - + Get update Získat aktualizaci @@ -1577,169 +1543,116 @@ dostupný pod původním názvem Mirall::ownCloudGui - + %1 Sync Started Synchronizace %1 zahájena - + Sync started for %n configured sync folder(s). Synchronizace spuštěna pro %1 nastavený adresář(e).Synchronizace spuštěna pro %1 nastavené adresář(e).Synchronizace spuštěna pro %1 nastavených adresář(ů). - + 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 - + 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 - + %1 (%2, %3) %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) Synchronizuji %1 z %2 (%3 z %4) - + Up to date Aktuální - - Mirall::ownCloudInfo - - - Proxy Refused Connection - Proxy server odmítl spojení - - - - The configured proxy has refused the connection. Please check the proxy settings. - Nastavený proxy server odmítl spojení. Zkontrolujte prosím nastavení proxy. - - - - Proxy Closed Connection - Proxy server ukončil spojení - - - - The configured proxy has closed the connection. Please check the proxy settings. - Nastavený proxy server ukončil spojení. Zkontrolujte prosím nastavení proxy. - - - - Proxy Not Found - Proxy server nenalezen - - - - The configured proxy could not be found. Please check the proxy settings. - Nastavený proxy server nenalezen. Zkontrolujte prosím nastavení proxy. - - - - Proxy Authentication Error - Chyba při ověření k proxy serveru - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - Nastavený proxy server vyžaduje přihlášení, ale použité přihlašovací údaje nejsou platné. Zkontrolujte prosím nastavení proxy. - - - - Proxy Connection Timed Out - Vypršel časový limit pro spojení s proxy serverem - - - - The connection to the configured proxy has timed out. - Vypršel čas pro navázání spojení s nastaveným proxy serverem. - - OwncloudAdvancedSetupPage @@ -2005,6 +1918,35 @@ dostupný pod původním názvem Tlačítko + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2036,12 +1978,12 @@ dostupný pod původním názvem main.cpp - + System Tray not available Systémová lišta není k dispozici - + %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 vyžaduje fungující systémovou lištu. Pokud používáte XFCE, řiďte se <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">těmito instrukcemi</a>. V ostatních případech prosím nainstalujte do svého systému aplikaci pro systémovou lištu, např. 'trayer', a zkuste to znovu. @@ -2084,7 +2026,7 @@ dostupný pod původním názvem - + Context Kontext @@ -2110,44 +2052,60 @@ dostupný pod původním názvem - + deleted smazáno - - + + + Move + + + + + downloading stahování - - + + uploading odesílání - + inactive neaktivní - + starting spouštění - + finished dokončeno - + delete smazat + + + move + + + + + moved + + theme diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts index 6501af25f..244445ec1 100644 --- a/translations/mirall_de.ts +++ b/translations/mirall_de.ts @@ -65,7 +65,7 @@ Account Maintenance - Nutzerkonto-Wartung + Kontoverwaltung @@ -75,12 +75,7 @@ Modify Account - Nutzerkonto ändern - - - - Sync Status - Synchronisation-Status + Konto bearbeiten @@ -89,7 +84,7 @@ - + Pause Anhalten @@ -103,6 +98,11 @@ Add Folder... Ordner hinzufügen... + + + Accounts to Synchronize + + Info... @@ -114,118 +114,113 @@ Speicherbelegung - + Retrieving usage information... - Nutzungsinformationen abrufen... + 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. + <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 Klient 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> - - Checking %1 connection... - Überprüfe %1-Verbindung... - - - + No %1 connection configured. Keine %1-Verbindung konfiguriert. - + Sync Running Synchronisation läuft - + + No account configured. + + + + The syncing operation is running.<br/>Do you want to terminate it? Die Synchronistation läuft gerade.<br/>Wollen Sie diese beenden? - + + %1 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. Verbunden mit <a href="%1">%2</a>. - - Version: %1 (%2) - Version: %1 (%2) - - - - unknown problem. - unbekanntes Problem. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>Verbindung mit %1 fehlgeschlagen <tt>%2</tt></p> - - - + Start Start - + Currently Gegenwärtig - + Completely Vollständig - + %1 %2 %3 (%4 of %5) %1 %2 %3 (%4 von %5) - + Completely finished. Vollständig abgeschlossen. - + %1 of %2, file %3 of %4 %1 of %2, Datei %3 von %4 - - %1 of %2 in use. - %1 von %2 benutzt. + + Connected to <a href="%1">%2</a> as <i>%3</i>. + - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. Derzeit sind keine Speichernutzungsinformationen verfügbar. @@ -358,6 +353,11 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf CSync unspecified error. CSync unbekannter Fehler. + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -387,150 +387,118 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf Mirall::ConnectionValidator - - No ownCloud connection configured - Keine ownCloud-Verbindung konfiguriert + + No ownCloud account configured + - + The configured server for this client is too old Der konfigurierte Server ist für diesen Klient zu alt - + Please update to the latest server and restart the client. Aktualisieren Sie auf die letzte Server-Version und starten Sie den Klient neu. - + Unable to connect to %1 Verbinden mit %1 nicht möglich - + The provided credentials are not correct Die zur Verfügung gestellten Anmeldeinformationen sind nicht korrekt - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - Kein Passwort-Eintrag im Passwort-Speicher gefunden. Bitte durchlaufen Sie die Konfiguration erneut. - - Mirall::Folder - + Unable to create csync-context Kann keinen CSync-Kontext erstellen - + Local folder %1 does not exist. Lokales Verzeichnis %1 existiert nicht. - + %1 should be a directory but is not. %1 sollte ein Verzeichnis sein, ist es aber nicht. - + %1 is not readable. %1 ist nicht lesbar. - + File %1: %2 Datei %1: %2 - + + File %1 Datei %1 - - New file available - Neue Datei verfügbar + + downloaded + - - '%1' has been synced to this machine. - '%1' wurde mit diesem Gerät synchronisiert. + + removed + - - New files available - Neue Dateien sind verfügbar - - - - '%1' and %n other file(s) have been synced to this machine. - '%1' und %n andere Datei(en) wurde(n) mit diesem Gerät synchronisiert.'%1' und %n andere Datei(en) wurde(n) mit diesem Gerät synchronisiert. + + updated + - - File removed - Datei gelöscht + + renamed + - - '%1' has been removed. - '%1' wurde gelöscht. + + '%1' has been %2. + - - Files removed - Dateien gelöscht - - - - '%1' and %n other file(s) have been removed. - %1' und %n andere Datei(en) wurden entfernt.%1' und %n andere Datei(en) wurden entfernt. + + Files %1 + - - File updated - Datei aktualisiert + + '%1' and %2 other files have been %3. + - - '%1' has been updated. - '%1' wurde aktualisiert. - - - - Files updated - Dateien aktualisiert - - - - '%1' and %n other file(s) have been updated. - %1' und %n andere Datei(en) wurden aktualisiert.%1' und %n andere Datei(en) wurden aktualisiert. - - - + Error Fehler - + The CSync thread terminated. Der CSync-Thread wurde beendet. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". Dieser Synchronisationsvorgang würde alle Dateien in dem lokalen Ordner '%1' entfernen. Wenn Sie oder Ihr Administrator Ihr Konto auf dem Server zurückgesetzt haben, wählen Sie "Dateien behalten". Wenn Sie ihre Daten löschen wollen, wählen Sie "Alle Dateien entfernen". - + 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? @@ -539,17 +507,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 @@ -557,62 +525,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. - + 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 - + %1 (Sync is paused) %1 (Synchronisation ist pausiert) @@ -651,8 +619,8 @@ Dokumentation für mögliche Lösungen. Mirall::FolderWizard - - + + Add Folder Ordner hinzufügen @@ -660,42 +628,42 @@ Dokumentation für mögliche Lösungen. Mirall::FolderWizardSourcePage - + No local folder selected! Es wurde kein lokaler Ordner ausgewä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.<br/>Please pick another one! Der lokale Pfad %1 ist bereits ein Upload-Ordner.<br/>Bitte wählen Sie einen anderen aus! - + An already configured folder is contained in the current entry. Ein bereits konfigurierter Ordner ist im aktuellen Verzeichnis vorhanden. - + An already configured folder contains the currently entered directory. Ein bereits konfigurierter Ordner beinhaltet das angegebene Verzeichnis. - + The alias can not be empty. Please provide a descriptive alias word. Der Alias darf nicht leer sein. Bitte ein anschauliches Alias-Wort eingeben. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>Der Alias <i>%1</i> wird bereits verwendet. Bitte einen anderen Alias wählen. - + Select the source folder Den Quellordner wählen @@ -703,42 +671,42 @@ Dokumentation für mögliche Lösungen. Mirall::FolderWizardTargetPage - + 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.<br/>Please check manually. Erstellen des Ordners fehlgeschlagen unter %1.<br/>Bitte überprüfen Sie dies manuell. - + Choose this to sync the entire account Wählen Sie dies, um das gesamte Konto zu synchronisieren - + This directory is already being synced. Dieses Verzeichnis ist 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. - + If you sync the root folder, you can <b>not</b> configure another sync directory. Wenn Sie das Wurzelverzeichnis synchronisieren, können Sie <b>kein anderes</b> Verzeichnis zur Synchronisierung auswählen. @@ -752,8 +720,8 @@ Dokumentation für mögliche Lösungen. - General - Allgemein + General Setttings + @@ -795,7 +763,7 @@ Dokumentation für mögliche Lösungen. Entfernen - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. @@ -804,29 +772,29 @@ Checked items will also be deleted if they prevent a directory from being remove Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Verzeichnis verhindern. Dies ist nützlich für Metadaten. - + Could not open file Konnte Datei nicht öffnen - + Cannot write changes to '%1'. Konnte Änderungen nicht in '%1' schreiben. - - + + Add Ignore Pattern Ignoriermuster hinzufügen - - + + Add a new ignore pattern: Neues Ignoriermuster hinzufügen: - + This entry is provided by the system at '%1' and cannot be modified in this view. Dieser Eintrag wird vom System auf '%1' bereitgestellt und kann in dieser Ansicht nicht geändert werden. @@ -834,52 +802,52 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve Mirall::LogBrowser - + Log Output Log-Ausgabe - + &Search: &Suche: - + &Find &Finde - + Clear Leeren - + Clear the log display. Protokollanzeige löschen. - + S&ave S&peichern - + Save the log file to a file on disk for debugging. Speichere die Protokolldatei zur Fehleranalyse - + Error Fehler - + Save log file Log-Datei speichern - + Could not write to log file Log-Datei konnte nicht geschrieben werden @@ -1001,47 +969,47 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve Mirall::OwncloudAdvancedSetupPage - + Connect to %1 Verbinden mit %1 - + Setup local folder options Einstellungen der Optionen für lokale Verzeichnisse - + Connect... Verbinde... - + Your entire account will be synced to the local folder '%1'. Das gesamte Konto wird mit dem lokalen Ordner '%1' synchronisiert. - + %1 folder '%2' is synced to local folder '%3' %1 Ordner '%2' wird mit dem lokalen Ordner '%3' synchronisiert - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> <p><small><strong>Warnung:</strong> Sie haben zur Zeit mehrere Ordner konfiguriert. Wenn Sie mit den aktuellen Einstellungen fortfahren, werden diese Einstellungen verworfen und eine vollständige Server-Synchronisation wird erstellt!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> <p><small><strong>Achtung:</strong> Das lokale Verzeichnis ist nicht leer. Wähle eine entsprechende Lösung!</small></p> - + Local Sync Folder Lokaler Ordner für die Synchronisation - + Update advanced setup Erweiterte Einstellungen aktualisieren @@ -1049,44 +1017,21 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve Mirall::OwncloudHttpCredsPage - + Connect to %1 Verbinden mit %1 - + Enter user credentials Geben Sie die Benutzer-Anmeldeinformationen ein - + Update user credentials Aktualisieren Sie die Benutzer-Anmeldeinformationen - - Mirall::OwncloudPropagator - - - Aborted - Abgebrochen - - - - Could not remove directory %1 - Verzeichnis %1 konnte nicht entfernt werden - - - - 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. - - Mirall::OwncloudSetupPage @@ -1110,7 +1055,7 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve Diese URL ist nicht sicher. Sie sollten sie nicht nutzen. - + Update %1 server %1 Server aktualisieren @@ -1118,129 +1063,126 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve Mirall::OwncloudSetupWizard - + Folder rename failed Ordner umbenennen fehlgeschlagen. - + 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. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - Versuche eine Verbindung mit %1 auf %2, um die Authentifizierung zu ermitteln... - - - + <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/> - - Failed to connect to %1:<br/>%2 - Die Verbindung zu %1 konnte nicht hergestellt werden:<br/>%2 - - - + 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 - - The remote folder could not be accessed! - Auf den entfernten Ordner konnte nicht zugegriffen werden! + + + Failed to connect to %1 at %2:<br/>%3 + - + + No remote folder specified! + + + + 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. @@ -1248,7 +1190,7 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve Mirall::OwncloudWizard - + %1 Connection Wizard %1 Verbindungsassistent @@ -1256,27 +1198,27 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve Mirall::OwncloudWizardResultPage - + Open %1 Öffne %1 - + Open Local Folder Öffne lokalen Ordner - + Everything set up! Alles ist eingerichtet! - + Your entire account is synced to the local folder <i>%1</i> Ihr gesamter Account wird mit dem lokalen Ordner <i>%1</i> synchronisiert. - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> %1 Ordner <i>%1</i> ist mit einem lokalen Ordner synchronisiert <i>%2</i> @@ -1290,8 +1232,8 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve - Detailed Sync Protocol - Detailliertes Synchronisationsprotokoll + Detailed Sync Status + @@ -1418,8 +1360,8 @@ name - The sync protocol has been copied to the clipboard. - Das Synchronisierungs-Protokoll wurde in die Zwischenablage kopiert. + The sync status has been copied to the clipboard. + @@ -1440,31 +1382,55 @@ name Einstellungen - + %1 %1 - - Protocol - Protokoll + + Status + - + General Allgemein - + Network Netzwerk - + Account Nutzerkonto + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1479,67 +1445,67 @@ name - + SSL Connection SSL-Verbindung - + Warnings about current SSL Connection: Warnungen zur aktuellen SSL-Verbindung - + with Certificate %1 mit Zertifikat %1 - - - + + + &lt;not specified&gt; &lt;nicht angegeben&gt; - - + + Organization: %1 Organisation: %1 - - + + Unit: %1 Einheit: %1 - - + + Country: %1 Land: %1 - + Fingerprint (MD5): <tt>%1</tt> Fingerabdruck (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Fingerabdruck (SHA1): <tt>%1</tt> - + Effective Date: %1 Aktuelles Datum: %1 - + Expiry Date: %1 Auslaufdatum: %1 - + Issuer: %1 Aussteller: %1 @@ -1557,17 +1523,17 @@ name <p>Eine neue Version des %1-Clients ist verfügbar.</p><p>Version <b>%2</b> steht zum Download bereit. Die zur Zeit installierte Version: %3.<p> - + Skip update Update überspringen - + Skip this time Dieses Mal überspringen - + Get update Update durchführen @@ -1575,169 +1541,116 @@ name Mirall::ownCloudGui - + %1 Sync Started %1 Sync gestartet - + Sync started for %n configured sync folder(s). Synchronisation wurde für %n konfigurierten Sync-Ordner gestartet.Synchronisation wurde für %n konfigurierte Sync-Ordner gestartet. - + 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 - + Quota n/a Quote unbekannt - + %1% of %2 in use %1% von %2 benutzt - + No items synced recently Keine kürzlich synchronisierten Elemente - + %1 (%2, %3) %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) Synchronisiere %1 von %2 (%3 von %4) - + Up to date Aktuell - - Mirall::ownCloudInfo - - - Proxy Refused Connection - Proxy-Verbindung zurückgewiesen - - - - The configured proxy has refused the connection. Please check the proxy settings. - Der ausgewählte Proxy-Server hat die Verbindung verweigert. Bitte überprüfen Sie die Proxy-Einstellungen. - - - - Proxy Closed Connection - Verbindung wurde vom Proxy geschlossen - - - - The configured proxy has closed the connection. Please check the proxy settings. - Der ausgewählte Proxy-Server hat die Verbindung geschlossen. Bitte überprüfen Sie die Proxy-Einstellungen. - - - - Proxy Not Found - Proxy wurde nicht gefunden - - - - The configured proxy could not be found. Please check the proxy settings. - Der ausgewählte Proxy-Server konnte nicht gefunden werden. Bitte überprüfen Sie die Proxy-Einstellungen. - - - - Proxy Authentication Error - Proxy meldet Authentifizierungsproblem - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - Der ausgewählte Proxy-Server erfordert einen Benutzernamen, aber die Proxy-Zugangsdaten sind ungültig. Bitte überprüfen Sie die Proxy-Einstellungen. - - - - Proxy Connection Timed Out - Zeitüberschreitung bei der Verbindung mit Proxy-Server. - - - - The connection to the configured proxy has timed out. - Zeitüberschreitung beim Versuch, den mit dem ausgewählten Proxy-Server zu erreichen. - - OwncloudAdvancedSetupPage @@ -2003,6 +1916,35 @@ name Schaltfläche + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2034,12 +1976,12 @@ name main.cpp - + System Tray not available Die Taskleiste ist nicht verfügbar. - + %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 wird für eine funktionierende Taskleiste benötigt. Falls Sie XFCE einsetzen, dann folgen Sie bitte <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">diesen Anweisungen</a>. Anderenfalls installieren Sie bitte eine Taskleisten-Anwendung wie 'trayer' und versuchen Sie es erneut. @@ -2082,7 +2024,7 @@ name - + Context Kontext @@ -2108,44 +2050,60 @@ name - + deleted gelöscht - - + + + Move + + + + + downloading Herunterladen - - + + uploading Lade hoch - + inactive Inaktiv - + starting Starte - + finished abgeschlossen - + delete löschen + + + move + + + + + moved + + theme diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts index 05949f783..f38254122 100644 --- a/translations/mirall_el.ts +++ b/translations/mirall_el.ts @@ -77,11 +77,6 @@ Modify Account Τροποποίηση Λογαριασμού - - - Sync Status - Κατάσταση Συγχρονισμού - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause Παύση @@ -103,6 +98,11 @@ Add Folder... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ Χρήση Αποθηκευτικού Χώρου - + 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> - - Checking %1 connection... - Έλεγχος σύνδεσης %1... - - - + No %1 connection configured. - + Sync Running Ο Συγχρονισμός Εκτελείται - + + No account configured. + + + + The syncing operation is running.<br/>Do you want to terminate it? Η λειτουργία συγχρονισμού λειτουργεί.<br/> Θέλετε να την τερματίσετε; - + + %1 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. - - Version: %1 (%2) - Έκδοση: %1 (%2) - - - - unknown problem. - άγνωστο πρόβλημα. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>Αποτυχία σύνδεσης με το %1: <tt>%2</tt></p> - - - + Start Έναρξη - + Currently - + Completely - + %1 %2 %3 (%4 of %5) %1 %2 %3 (%4 από %5) - + Completely finished. - + %1 of %2, file %3 of %4 %1 από %2, αρχείο %3 από %4 - - %1 of %2 in use. + + Connected to <a href="%1">%2</a> as <i>%3</i>. - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. @@ -357,6 +352,11 @@ CSync unspecified error. CSync αγνωστο σφαλμα. + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -386,166 +386,134 @@ Mirall::ConnectionValidator - - No ownCloud connection configured + + No ownCloud account configured - + The configured server for this client is too old - + Please update to the latest server and restart the client. - + Unable to connect to %1 - + The provided credentials are not correct - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - Δεν βρεθηκε κωδικος προσβασης. Ρυθμιστε ξανα. - - Mirall::Folder - + Unable to create csync-context - + Local folder %1 does not exist. Δεν υπάρχει ο τοπικός φάκελος %1. - + %1 should be a directory but is not. %1 επρεπε να ειναι χωρος αποθηκευσης αλλα δεν ειναι. - + %1 is not readable. %1 δεν είναι αναγνώσιμο. - + File %1: %2 - + + File %1 - - New file available + + downloaded - - '%1' has been synced to this machine. + + removed - - New files available - - - - - '%1' and %n other file(s) have been synced to this machine. - - - - - File removed + + updated - - '%1' has been removed. + + renamed - - Files removed - - - - - '%1' and %n other file(s) have been removed. - - - - - File updated + + '%1' has been %2. - - '%1' has been updated. + + Files %1 - - Files updated + + '%1' and %2 other files have been %3. - - - '%1' and %n other file(s) have been updated. - - - + Error Σφάλμα - + The CSync thread terminated. Η διεργασία CSync τερματίζεται. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". - + 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 Διατήρηση αρχείων @@ -553,62 +521,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. Ο συγχρονισμός εκτελείται. - + Server is currently not available. Ο διακομιστής δεν είναι διαθέσιμος προς το παρόν. - + Last Sync was successful. Ο τελευταίος συγχρονισμός ήταν επιτυχής. - + Last Sync was successful, but with warnings on individual files. - + Setup Error. Σφάλμα Ρύθμισης. - + User Abort. - + %1 (Sync is paused) @@ -645,8 +613,8 @@ documentation for possible fixes. Mirall::FolderWizard - - + + Add Folder Προσθήκη Φακέλου @@ -654,42 +622,42 @@ documentation for possible fixes. Mirall::FolderWizardSourcePage - + No local folder selected! Δεν επιλέχθηκε τοπικός φάκελος! - + You have no permission to write to the selected folder! Δεν έχετε δικαιώματα εγγραφής στον επιλεγμένο φάκελο! - + The local path %1 is already an upload folder.<br/>Please pick another one! Η τοπική διαδρομή %1 είναι ήδη κατάλογος μεταφόρτωσης.<br/>Παρακαλώ επιλέξτε άλλον! - + An already configured folder is contained in the current entry. Ένας ήδη ρυθμισμένος φάκελος περιέχεται στην τρέχουσα καταχώρηση. - + An already configured folder contains the currently entered directory. Ένας ήδη ρυθμισμένος κατάλογος περιέχει τον τρέχοντα εισαχθέν κατάλογο. - + The alias can not be empty. Please provide a descriptive alias word. Το ψευδώνυμο δεν μπορεί να είναι κενό. Παρακαλώ δώστε μια περιγραφική λέξη ψευδωνύμου. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>Το ψευδώνυμο <i>%1</i> είναι ήδη σε χρήση. Παρακαλώ επιλέξτε άλλο ψευδώνυμο. - + Select the source folder Επέλεξε το φάκελο πηγής @@ -697,42 +665,42 @@ documentation for possible fixes. Mirall::FolderWizardTargetPage - + Add Remote Folder - + Enter the name of the new folder: Εισάγετε το όνομα του νέου φακέλου: - + Folder was successfully created on %1. Επιτυχής δημιουργία καταλόγου στο %1. - + Failed to create the folder on %1.<br/>Please check manually. Αποτυχία δημιουργίας καταλόγου στο %1.<br/>Παρακαλώ ελέγξτε χειροκίνητα. - + Choose this to sync the entire account - + This directory is already being synced. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. Αν συγχρονίσετε το ριζικό φάκελο, <b>ΔΕ</b> θα μπορέσετε να ρυθμίσετε άλλο κατάλογο συγχρονισμού. @@ -746,8 +714,8 @@ documentation for possible fixes. - General - Γενικά + General Setttings + @@ -789,36 +757,36 @@ documentation for possible fixes. Αφαίρεση - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. - + Could not open file - + Cannot write changes to '%1'. - - - - Add Ignore Pattern - - + Add Ignore Pattern + + + + + Add a new ignore pattern: - + This entry is provided by the system at '%1' and cannot be modified in this view. @@ -826,52 +794,52 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::LogBrowser - + Log Output Καταγραφή εξόδου - + &Search: &Αναζήτηση: - + &Find &Εύρεση - + Clear Εκκαθάριση - + Clear the log display. Εκκαθάριση του αρχείου συμβάντων. - + S&ave Α&ποθήκευση - + Save the log file to a file on disk for debugging. Αποθήκευση του αρχείου καταγραφών στον δίσκο, για αποσφαλμάτωση. - + Error Σφάλμα - + Save log file Αποθήκευση αρχείου συμβάντων - + Could not write to log file Δεν ήταν δυνατή η εγγραφή στο αρχείο συμβάντων @@ -993,47 +961,47 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudAdvancedSetupPage - + Connect to %1 - + Setup local folder options - + Connect... - + Your entire account will be synced to the local folder '%1'. - + %1 folder '%2' is synced to local folder '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> - + Local Sync Folder - + Update advanced setup @@ -1041,44 +1009,21 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudHttpCredsPage - + Connect to %1 - + Enter user credentials - + Update user credentials - - Mirall::OwncloudPropagator - - - Aborted - - - - - Could not remove directory %1 - - - - - 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. - - - Mirall::OwncloudSetupPage @@ -1102,7 +1047,7 @@ Checked items will also be deleted if they prevent a directory from being remove Αυτόε ο σύνδεσμος δεν ειναι ασφαλής. Δεν πρέπει να τον χρησιμοποιήσετε. - + Update %1 server @@ -1110,129 +1055,126 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudSetupWizard - + Folder rename failed Αποτυχία μετονομασίας φακέλου - + 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. Αδυναμία αφαίρεσης και δημιουργίας αντιγράφου ασφαλείας φακέλου διότι ο φάκελος ή ένα αρχείο είναι ανοικτό από άλλο πρόγραμμα. Παρακαλώ κλείστε τον φάκελο ή το αρχείο και πατήστε επανάληψη ή ακυρώστε την ρύθμιση. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - - - - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Επιτυχής σύνδεση στο %1: %2 έκδοση %3 (%4)</font><br/><br/> - - Failed to connect to %1:<br/>%2 - Απέτυχε να συνδεθεί με το %1 <1.br/>%2. - - - + 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 - - The remote folder could not be accessed! - Η πρόσβαση στον απομακρυσμένο φάκελο ήταν αδύνατη! + + + 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><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. Παρακαλώ ελέξτε ξανά. @@ -1240,7 +1182,7 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizard - + %1 Connection Wizard %1 Οδηγός Σύνδεσης @@ -1248,27 +1190,27 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizardResultPage - + Open %1 Ανοικτό %1 - + Open Local Folder Ανοίξτε το Τοπικό Φάκελλο - + Everything set up! - + Your entire account is synced to the local folder <i>%1</i> Ολος ο λογαριασμός σας έει συγχρονιστεί με τον τοπικό φάκελλο. - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> @@ -1282,8 +1224,8 @@ Checked items will also be deleted if they prevent a directory from being remove - Detailed Sync Protocol - Λεπτομερειες προτοκολου συγχρονισμου + Detailed Sync Status + @@ -1405,8 +1347,8 @@ name - The sync protocol has been copied to the clipboard. - Το προτοκολο αντιγραφθηκε στο clipboard. + The sync status has been copied to the clipboard. + @@ -1427,31 +1369,55 @@ name Ρυθμίσεις - + %1 - - Protocol + + Status - + General Γενικά - + Network Δίκτυο - + Account Λογαριασμός + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1466,67 +1432,67 @@ name - + SSL Connection Σύνδεση SSL - + Warnings about current SSL Connection: Προειδοποιήσεις σχετικά με την τρέχουσα σύνδεση SSL: - + with Certificate %1 με πιστοποιητικό: %1 - - - + + + &lt;not specified&gt; &lt;δεν κατονομάζονται&gt; - - + + Organization: %1 Οργανισμός: %1 - - + + Unit: %1 Μονάδα: %1 - - + + Country: %1 Χώρα: %1 - + Fingerprint (MD5): <tt>%1</tt> Αποτύπωμα (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Αποτύπωμα (SHA1): <tt>%1</tt> - + Effective Date: %1 Ημερομηνία Έναρξης: 1% - + Expiry Date: %1 Ημερομηνία Λήξης: %1 - + Issuer: %1 Εκδότης: %1 @@ -1544,17 +1510,17 @@ name Μια νέα εκδοχή του Πελάτη %1 είναι διαθέσιμη. </p><p><b>%2</b>είναι διαθέσιμη για άνοιγμα. Η εγκατεστημένη εκδοχή είναι %3,<p>. - + Skip update Προβείτε σε ενημέρωση - + Skip this time - + Get update Λάβετε την ενημέρωση @@ -1562,169 +1528,116 @@ name Mirall::ownCloudGui - + %1 Sync Started %1 Ο συγχρονισμος ξεκινησε - + Sync started for %n configured sync folder(s). - + 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 - + Quota n/a - + %1% of %2 in use - + No items synced recently - + %1 (%2, %3) %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) Συγχρονισμός %1 από %2 (%3 από %4) - + Up to date Ενημερωμένο - - Mirall::ownCloudInfo - - - Proxy Refused Connection - - - - - The configured proxy has refused the connection. Please check the proxy settings. - - - - - Proxy Closed Connection - - - - - The configured proxy has closed the connection. Please check the proxy settings. - - - - - Proxy Not Found - Δεν βρέθηκε διαμεσολαβητής - - - - The configured proxy could not be found. Please check the proxy settings. - Αδυναμία εύρεσης ρυθμισμένου διαμεσολαβητή. Παρακαλώ ελέγξτε τις ρυθμίσεις διαμεσολαβητή. - - - - Proxy Authentication Error - Σφάλμα πιστοποίησης διαμεσολαβητή - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - - - - - Proxy Connection Timed Out - Λήξη χρόνου σύνδεσης με διαμεσολαβητή - - - - The connection to the configured proxy has timed out. - Λήξη χρόνου σύνδεσης με τον ρυθμισμένο διαμεσολαβητή. - - OwncloudAdvancedSetupPage @@ -1990,6 +1903,35 @@ name Πάτημα Κουμπιού + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2021,12 +1963,12 @@ name main.cpp - + System Tray not available - + %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. @@ -2069,7 +2011,7 @@ name - + Context @@ -2095,44 +2037,60 @@ name - + deleted διαγράφηκε - - + + + Move + + + + + downloading - - + + uploading - + inactive - + starting - + finished - + delete διαγραφή + + + move + + + + + moved + + theme diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts index 605a75a77..faf43033d 100644 --- a/translations/mirall_en.ts +++ b/translations/mirall_en.ts @@ -79,11 +79,6 @@ Modify Account - - - Sync Status - - Connected with <server> as <user> @@ -91,7 +86,7 @@ - + Pause @@ -105,6 +100,11 @@ Add Folder... + + + Accounts to Synchronize + + Info... @@ -116,117 +116,112 @@ - + 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> - - Checking %1 connection... - - - - + No %1 connection configured. - + Sync Running - + + No account configured. + + + + The syncing operation is running.<br/>Do you want to terminate it? - + + %1 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. - - Version: %1 (%2) - - - - - unknown problem. - - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - - - - + Start - + Currently - + Completely - + %1 %2 %3 (%4 of %5) - + Completely finished. - + %1 of %2, file %3 of %4 - - %1 of %2 in use. + + Connected to <a href="%1">%2</a> as <i>%3</i>. - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. @@ -359,6 +354,11 @@ CSync unspecified error. + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -388,175 +388,134 @@ Mirall::ConnectionValidator - - No ownCloud connection configured + + No ownCloud account configured - + The configured server for this client is too old - + Please update to the latest server and restart the client. - + Unable to connect to %1 - + The provided credentials are not correct - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - - - Mirall::Folder - + Unable to create csync-context - + Local folder %1 does not exist. - + %1 should be a directory but is not. - + %1 is not readable. - + File %1: %2 - + + File %1 - - New file available + + downloaded - - '%1' has been synced to this machine. + + removed - - New files available - - - - - '%1' and %n other file(s) have been synced to this machine. - - - - - - - - File removed + + updated - - '%1' has been removed. + + renamed - - Files removed - - - - - '%1' and %n other file(s) have been removed. - - - - - - - - File updated + + '%1' has been %2. - - '%1' has been updated. + + Files %1 - - Files updated + + '%1' and %2 other files have been %3. - - - '%1' and %n other file(s) have been updated. - - - - - - + Error - + The CSync thread terminated. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". - + 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 @@ -564,62 +523,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. - + Server is currently not available. - + Last Sync was successful. - + Last Sync was successful, but with warnings on individual files. - + Setup Error. - + User Abort. - + %1 (Sync is paused) @@ -656,8 +615,8 @@ documentation for possible fixes. Mirall::FolderWizard - - + + Add Folder @@ -665,42 +624,42 @@ documentation for possible fixes. Mirall::FolderWizardSourcePage - + No local folder selected! - + You have no permission to write to the selected folder! - + The local path %1 is already an upload folder.<br/>Please pick another one! - + An already configured folder is contained in the current entry. - + An already configured folder contains the currently entered directory. - + The alias can not be empty. Please provide a descriptive alias word. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. - + Select the source folder @@ -708,42 +667,42 @@ documentation for possible fixes. Mirall::FolderWizardTargetPage - + Add Remote Folder - + Enter the name of the new folder: - + Folder was successfully created on %1. - + Failed to create the folder on %1.<br/>Please check manually. - + Choose this to sync the entire account - + This directory is already being synced. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. @@ -757,7 +716,7 @@ documentation for possible fixes. - General + General Setttings @@ -800,36 +759,36 @@ documentation for possible fixes. - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. - + Could not open file - + Cannot write changes to '%1'. - - - - Add Ignore Pattern - - + Add Ignore Pattern + + + + + Add a new ignore pattern: - + This entry is provided by the system at '%1' and cannot be modified in this view. @@ -837,52 +796,52 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::LogBrowser - + Log Output - + &Search: - + &Find - + Clear - + Clear the log display. - + S&ave - + Save the log file to a file on disk for debugging. - + Error - + Save log file - + Could not write to log file @@ -1004,47 +963,47 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudAdvancedSetupPage - + Connect to %1 - + Setup local folder options - + Connect... - + Your entire account will be synced to the local folder '%1'. - + %1 folder '%2' is synced to local folder '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> - + Local Sync Folder - + Update advanced setup @@ -1052,44 +1011,21 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudHttpCredsPage - + Connect to %1 - + Enter user credentials - + Update user credentials - - Mirall::OwncloudPropagator - - - Aborted - - - - - Could not remove directory %1 - - - - - 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. - - - Mirall::OwncloudSetupPage @@ -1113,7 +1049,7 @@ Checked items will also be deleted if they prevent a directory from being remove - + Update %1 server @@ -1121,129 +1057,126 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudSetupWizard - + Folder rename failed - + 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. - + + <font color="green"><b>Local sync folder %1 successfully created!</b></font> - + Trying to connect to %1 at %2... - - Trying to connect to %1 at %2 to determine authentication type... - - - - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> - - Failed to connect to %1:<br/>%2 - - - - + 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 - - The remote folder could not be accessed! + + + 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. @@ -1251,7 +1184,7 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizard - + %1 Connection Wizard @@ -1259,27 +1192,27 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizardResultPage - + Open %1 - + Open Local Folder - + Everything set up! - + Your entire account is synced to the local folder <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> @@ -1293,7 +1226,7 @@ Checked items will also be deleted if they prevent a directory from being remove - Detailed Sync Protocol + Detailed Sync Status @@ -1416,7 +1349,7 @@ name - The sync protocol has been copied to the clipboard. + The sync status has been copied to the clipboard. @@ -1438,31 +1371,55 @@ name - + %1 - - Protocol + + Status - + General - + Network - + Account + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1477,67 +1434,67 @@ name - + SSL Connection - + Warnings about current SSL Connection: - + with Certificate %1 - - - + + + &lt;not specified&gt; - - + + Organization: %1 - - + + Unit: %1 - - + + Country: %1 - + Fingerprint (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> - + Effective Date: %1 - + Expiry Date: %1 - + Issuer: %1 @@ -1555,17 +1512,17 @@ name - + Skip update - + Skip this time - + Get update @@ -1573,12 +1530,12 @@ name Mirall::ownCloudGui - + %1 Sync Started - + Sync started for %n configured sync folder(s). @@ -1586,159 +1543,106 @@ name - + 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 - + Quota n/a - + %1% of %2 in use - + No items synced recently - + %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) - + Up to date - - Mirall::ownCloudInfo - - - Proxy Refused Connection - - - - - The configured proxy has refused the connection. Please check the proxy settings. - - - - - Proxy Closed Connection - - - - - The configured proxy has closed the connection. Please check the proxy settings. - - - - - Proxy Not Found - - - - - The configured proxy could not be found. Please check the proxy settings. - - - - - Proxy Authentication Error - - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - - - - - Proxy Connection Timed Out - - - - - The connection to the configured proxy has timed out. - - - OwncloudAdvancedSetupPage @@ -2004,6 +1908,35 @@ name + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2035,12 +1968,12 @@ name main.cpp - + System Tray not available - + %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. @@ -2083,7 +2016,7 @@ name - + Context @@ -2109,44 +2042,60 @@ name - + deleted - - + + + Move + + + + + downloading - - + + uploading - + inactive - + starting - + finished - + delete + + + move + + + + + moved + + theme diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts index 88ea0e5c3..f857cd6c3 100644 --- a/translations/mirall_es.ts +++ b/translations/mirall_es.ts @@ -77,11 +77,6 @@ Modify Account Modificar cuenta - - - Sync Status - Estado de la sincronización - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause Pausar @@ -103,6 +98,11 @@ Add Folder... Agregar carpeta... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ 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> - - Checking %1 connection... - Comprobando conexión de %1... - - - + No %1 connection configured. No hay ninguna conexión de %1 configurada. - + Sync Running Sincronización en curso - + + No account configured. + + + + The syncing operation is running.<br/>Do you want to terminate it? La sincronización está en curso.<br/>¿Desea interrumpirla? - + + %1 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. Conectado a <a href="%1">%2</a>. - - Version: %1 (%2) - Vérsion: %1 (%2) - - - - unknown problem. - error desconocido. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>No se pudo conectar a %1: <tt>%2</tt></p> - - - + Start Iniciar - + Currently Actualmente - + Completely Completamente - + %1 %2 %3 (%4 of %5) %1 %2 %3 (%4 de %5) - + Completely finished. Finalizado - + %1 of %2, file %3 of %4 %1 de %2, archivo %3 de %4 - - %1 of %2 in use. - %1 de %2 en uso. + + Connected to <a href="%1">%2</a> as <i>%3</i>. + - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. Actualmente no hay información disponible sobre el uso de almacenamiento. @@ -357,6 +352,11 @@ CSync unspecified error. Error no especificado de CSync + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -386,150 +386,118 @@ Mirall::ConnectionValidator - - No ownCloud connection configured - Ninguna conexión ownCloud se ha configurado + + No ownCloud account configured + - + The configured server for this client is too old La configuración del servidor al cliente es obsoleta - + Please update to the latest server and restart the client. Por favor actualice a la ultima verisón del servidor y reinicie el cliente - + Unable to connect to %1 Imposible conectar a %1 - + The provided credentials are not correct Las credenciales proporcionadas no son correctas - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - No se encontro la contraseña en la cadena de claves. Por favor reconfigure. - - Mirall::Folder - + Unable to create csync-context Imposible crear csync-context - + Local folder %1 does not exist. Carpeta local %1 no existe. - + %1 should be a directory but is not. %1 debería ser un directorio, pero no lo es. - + %1 is not readable. %1 es ilegible. - + File %1: %2 Archivo %1: %2 - + + File %1 Archivo %1 - - New file available - Nuevo archivo disponible + + downloaded + - - '%1' has been synced to this machine. - '%1' ha sido sincronizado con este equipo. + + removed + - - New files available - Nuevos archivos disponibles - - - - '%1' and %n other file(s) have been synced to this machine. - '%1' y %n archivos adicionales han sido sincronizados con este equipo.'%1' y %n archivos adicionales han sido sincronizados con este equipo. + + updated + - - File removed - Archivo eliminado + + renamed + - - '%1' has been removed. - '%1' ha sido eliminado. + + '%1' has been %2. + - - Files removed - Archivos eliminados - - - - '%1' and %n other file(s) have been removed. - '%1' y %n archivos adicionales han sido eliminados.'%1' y %n archivos adicionales han sido eliminados. + + Files %1 + - - File updated - Archivo actualizado + + '%1' and %2 other files have been %3. + - - '%1' has been updated. - '%1' ha sido actualizado. - - - - Files updated - Archivos actualizados - - - - '%1' and %n other file(s) have been updated. - '%1' y %n archivos adicionales han sido actualizados.'%1' y %n archivos adicionales han sido actualizados. - - - + Error Error - + The CSync thread terminated. Terminó el hilo Csync. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". Esta sincronización eliminaría todos los archivos en la carpeta local de sincronización '%1'. Si ud. o su administrador han restablecido su cuenta en el servidor, elija "Conservar Archivos". Si desea eliminar toda su información, elija "Eliminar todos los archivos". - + 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? @@ -538,17 +506,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 @@ -556,62 +524,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. Una antigua jornada sincronizada '%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. - + %1 (Sync is paused) %1 (Sincronización en pausa) @@ -650,8 +618,8 @@ documentación en busca de posibles soluciones. Mirall::FolderWizard - - + + Add Folder Añadir carpeta @@ -659,42 +627,42 @@ documentación en busca de posibles soluciones. Mirall::FolderWizardSourcePage - + No local folder selected! carpeta local no 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.<br/>Please pick another one! La ruta local %1 ya existe como carpeta de subida.<br/>Por favor, seleccione otra. - + An already configured folder is contained in the current entry. Ya hay una carpeta configurada dentro de la entrada actual. - + An already configured folder contains the currently entered directory. Ya hay una carpeta configurada que contiene al directorio indicado. - + 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. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>El alias <i>%1</i> ya está en uso. Por favor, elija otro alias. - + Select the source folder Seleccione la carpeta de origen. @@ -702,42 +670,42 @@ documentación en busca de posibles soluciones. Mirall::FolderWizardTargetPage - + Add Remote Folder Agregar carpeta remota - + Enter the name of the new folder: - Digite el nombre de la nueva carpeta + 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.<br/>Please check manually. Falló al crear la carpeta en %1.<br/>Por favor compruébelo manualmente. - + Choose this to sync the entire account Escoja esto para sincronizar la cuenta entera - + This directory 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>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. Si sincroniza la carpeta raíz, <b>no puede <b> configurar otro directorio para sincronizar @@ -751,8 +719,8 @@ documentación en busca de posibles soluciones. - General - General + General Setttings + @@ -794,7 +762,7 @@ documentación en busca de posibles soluciones. Eliminar - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. @@ -803,29 +771,29 @@ Checked items will also be deleted if they prevent a directory from being remove Los elementos marcados también se eliminarán si impiden la eliminación de algún directorio. Esto es útil para los metadatos - + Could not open file No se pudo abrir el archivo - + Cannot write changes to '%1'. No se pueden guardar cambios en '%1'. - - + + Add Ignore Pattern Añadir patrón para ignorar - - + + Add a new ignore pattern: Añadir nuevo patrón para ignorar: - + This entry is provided by the system at '%1' and cannot be modified in this view. Esta entrada es proporcionada por el sistema en '%1' y no puede ser modificada en esta vista. @@ -833,52 +801,52 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg Mirall::LogBrowser - + Log Output Registrar salida - + &Search: &Buscar: - + &Find &Encontrar - + Clear Borrar - + Clear the log display. Limpia la pantalla de registros. - + S&ave Gu&ardar - + Save the log file to a file on disk for debugging. Guardar el archivo de registro a un archivo en disco para depuración. - + Error Error - + Save log file Guardar archivo de registro - + Could not write to log file No se pudo escribir al archivo de registro @@ -1000,92 +968,69 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg Mirall::OwncloudAdvancedSetupPage - + Connect to %1 Conectar a %1 - + Setup local folder options Configurar opciones de carpeta local - + Connect... Conectar... - + Your entire account will be synced to the local folder '%1'. Su cuenta completa será sincronizada a la carpeta local '%1'. - + %1 folder '%2' is synced to local folder '%3' La carpeta %1 '%2' está sincronizada con la carpeta local '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> <p><small><strong>Advertencia:</strong>Tiene actualmente múltiples carpetas configuradas. Si continua con los ajustes actuales, la carpeta de configuración se descartará y se creará una única carpeta principal!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> <p><small><strong>Advertencia:</strong>El directorio local no está vacío. ¡Seleccione otra!</small></p> - + Local Sync Folder Carpeta local de sincronización - + Update advanced setup - Actualiar configuración avanzada + Actualizar configuración avanzada Mirall::OwncloudHttpCredsPage - + Connect to %1 Conectar a %1 - + Enter user credentials Digite credenciales de usuario - + Update user credentials Actualizar credenciales - - Mirall::OwncloudPropagator - - - Aborted - Interrumpido - - - - Could not remove directory %1 - No se pudo eliminar el directorio %1 - - - - 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. - - - Mirall::OwncloudSetupPage @@ -1096,7 +1041,7 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg Setup %1 server - + Configurar servidor %1 @@ -1109,137 +1054,134 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg Esta url no es segura. No debería utilizarla. - + Update %1 server - + Actualizar servidor %1 Mirall::OwncloudSetupWizard - + Folder rename failed Error Renombrando Carpeta - + 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 posible eliminar y salvaguardar la carpeta debido a que la carpeta o archivo en su interior está abierto por otro programa. Por favor cierre la carpeta o archivo y pulse reintentar o cancelar configuración. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - Intentando conectar %1 con %2 para determinar el tipo de autenticación... - - - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Conectado con éxito a %1: versión de %2 %3 (%4)</font><br/><br/> - - Failed to connect to %1:<br/>%2 - Falló conectando con %1:<br/>%2 - - - + 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 local %1... - + ok ok - + failed. falló. - + Could not create local folder %1 No se pudo crear carpeta local %1 - - The remote folder could not be accessed! - ¡No se pudo acceder a la carpeta remota! + + + Failed to connect to %1 at %2:<br/>%3 + - + + No remote folder specified! + + + + Error: %1 Error: %1 - + creating folder on ownCloud: %1 creando carpeta en ownCloud: %1 - + Remote folder %1 created successfully. Carpeta remota %1 creada correctamente. - + The remote folder %1 already exists. Connecting it for syncing. La carpeta remota %1 ya existe. Conectándola para sincronizar. - - + + 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 errores <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. @@ -1247,7 +1189,7 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg Mirall::OwncloudWizard - + %1 Connection Wizard Asistente de Conexión %1 @@ -1255,29 +1197,29 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg Mirall::OwncloudWizardResultPage - + Open %1 Abrir %1 - + Open Local Folder Abrir carpeta local - + Everything set up! ¡Todo listo! - + Your entire account is synced to the local folder <i>%1</i> Tu cuenta completa está sincronizada con la carpeta local <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> - + %1 La carpeta <i>%1</i> ha sido sincronizada con la carpeta local<i>%2</i> @@ -1289,8 +1231,8 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg - Detailed Sync Protocol - Protocolo de Sincronización Detallado + Detailed Sync Status + @@ -1420,8 +1362,8 @@ original - The sync protocol has been copied to the clipboard. - El informe de sincronización fue copiado al portapapeles. + The sync status has been copied to the clipboard. + @@ -1442,31 +1384,55 @@ original Ajustes - + %1 %1 - - Protocol + + Status - + General General - + Network Red - + Account Cuenta + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1481,67 +1447,67 @@ original - + SSL Connection Conexión SSL - + Warnings about current SSL Connection: Avisos de la conexión SSL actual: - + with Certificate %1 con certificado %1 - - - + + + &lt;not specified&gt; &lt;no especificado&gt; - - + + Organization: %1 Organización: %1 - - + + Unit: %1 Unidad: %1 - - + + Country: %1 País: %1 - + Fingerprint (MD5): <tt>%1</tt> Huella (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Huella (SHA1): <tt>%1</tt> - + Effective Date: %1 Fecha de vigencia: %1 - + Expiry Date: %1 Fecha de expiración: %1 - + Issuer: %1 Emisor: %1 @@ -1559,17 +1525,17 @@ original <p>Una nueva versión del cliente %1 está disponible.</p><p><b>%2</b> está disponible para descarga. La versión instalada es la %3.<p> - + Skip update Omitir actualización - + Skip this time Omitir esta vez - + Get update Actualizar @@ -1577,169 +1543,116 @@ original Mirall::ownCloudGui - + %1 Sync Started Sincronización %1 iniciada - + Sync started for %n configured sync folder(s). Iniciada la sincronización de %n carpeta configurada para sincronizar.Iniciada la sincronización para %n carpeta(s) configuradas para sincronizar. - + 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 - Cancelar %1 + Salir de %1 - + 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 - + %1 (%2, %3) %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) Sincronizando %1 de %2 (%3 de %4) - + Up to date Actualizado - - Mirall::ownCloudInfo - - - Proxy Refused Connection - Proxy Rechazó Conexión - - - - The configured proxy has refused the connection. Please check the proxy settings. - El proxy configurado rechazó la conexión. Por favor compruebe la configuración del proxy. - - - - Proxy Closed Connection - Proxy Cerró Conexión - - - - The configured proxy has closed the connection. Please check the proxy settings. - El proxy configurado cerró la conexión. Por favor compruebe la configuración del proxy. - - - - Proxy Not Found - Proxy no encontrado - - - - The configured proxy could not be found. Please check the proxy settings. - El proxy configurado no se puede encontrar. Por favor, compruebe los ajustes del proxy. - - - - Proxy Authentication Error - Error de autenticación en el Proxy - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - El proxy configurado requiere inicio de sesión pero las credenciales no son válidas. Por favor compruebe la configuración del proxy. - - - - Proxy Connection Timed Out - Tiempo de Espera de conexión al proxy agotado. - - - - The connection to the configured proxy has timed out. - La conexión con el proxy configurado ha caducado. - - OwncloudAdvancedSetupPage @@ -1978,7 +1891,7 @@ original Enter the URL of the server that you want to connect to (without http or https). - + Introduzca la dirección URL del servidor al cual se desea conectar (sin http o https) @@ -2005,6 +1918,35 @@ original BotonEmpuje + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2036,12 +1978,12 @@ original main.cpp - + System Tray not available Bandeja del sistema no está disponible - + %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 requiere en una bandeja del sistema de trabajo. Si está ejecutando XFCE, por favor siga <a href="http://docs.xfce.org/xfce/xfce4-panel/systray"> estas instrucciones </ a>. De lo contrario, instale una aplicación de la bandeja del sistema, tales como "trayer 'y vuelva a intentarlo. @@ -2084,7 +2026,7 @@ original - + Context Contexto @@ -2110,44 +2052,60 @@ original - + deleted borrado - - + + + Move + + + + + downloading descargando - - + + uploading subiendo - + inactive inactivo - + starting iniciando - + finished finalizado - + delete eliminar + + + move + + + + + moved + + theme diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts index 279426f83..c63c29e61 100644 --- a/translations/mirall_es_AR.ts +++ b/translations/mirall_es_AR.ts @@ -77,11 +77,6 @@ Modify Account Modificar Cuenta - - - Sync Status - Estado de la sincronización - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause Pausar @@ -103,6 +98,11 @@ Add Folder... Agregar directorio... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ 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> - - Checking %1 connection... - Comprobando conexión de %1... - - - + No %1 connection configured. No hay ninguna conexión de %1 configurada. - + Sync Running Sincronización en curso - + + No account configured. + + + + The syncing operation is running.<br/>Do you want to terminate it? La sincronización está en curso.<br/>¿Querés interrumpirla? - + + %1 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. Conectado a <a href="%1">%2</a>. - - Version: %1 (%2) - Versión: %1 (%2) - - - - unknown problem. - Error desconocido - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>No fue posible conectar a %1: <tt>%2</tt></p> - - - + Start Inicio - + Currently Actualmente - + Completely Completamente - + %1 %2 %3 (%4 of %5) %1 %2 %3 (%4 de %5) - + Completely finished. Completamente terminado. - + %1 of %2, file %3 of %4 %1 de %2, archivo %3 de %4 - - %1 of %2 in use. - %1 de %2 en uso. + + Connected to <a href="%1">%2</a> as <i>%3</i>. + - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. @@ -319,7 +314,7 @@ CSync could not authenticate at the proxy. - + CSync no pudo autenticar el proxy. @@ -357,6 +352,11 @@ CSync unspecified error. Error no especificado de CSync + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -375,7 +375,7 @@ Aborted by the user - + Interrumpido por el usuario @@ -386,167 +386,137 @@ Mirall::ConnectionValidator - - No ownCloud connection configured + + No ownCloud account configured - + The configured server for this client is too old - + La configuración del servidor al cliente es obsoleta - + Please update to the latest server and restart the client. - + Unable to connect to %1 - + Imposible conectar a %1 - + The provided credentials are not correct - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - No se encontró la contraseña en el llavero. Reconfigurá. - - Mirall::Folder - + Unable to create csync-context Imposible crear csync-context - + Local folder %1 does not exist. El directorio local %1 no existe. - + %1 should be a directory but is not. %1 debería ser un directorio, pero no lo es. - + %1 is not readable. No se puede leer %1. - + File %1: %2 Archivo %1: %2 - + + File %1 Archivo %1 - - New file available - Nuevo archivo disponible + + downloaded + - - '%1' has been synced to this machine. - '%1' fue sincronizado con este equipo. + + removed + - - New files available - Nuevos archivos disponibles - - - - '%1' and %n other file(s) have been synced to this machine. - '%1' y %n archivo(s) adicional fue sincronizado con este equipo.'%1' y %n archivo(s) adicionales fueron sincronizados con este equipo. + + updated + - - File removed - Archivo eliminado + + renamed + - - '%1' has been removed. - '%1' fue eliminado. + + '%1' has been %2. + - - Files removed - Archivos eliminados - - - - '%1' and %n other file(s) have been removed. - '%1' y %n otro archivo(s) fue borrado.'%1' y %n otros archivo(s) fueron borrados. + + Files %1 + - - File updated - Archivo actualizado + + '%1' and %2 other files have been %3. + - - '%1' has been updated. - '%1' fue actualizado. - - - - Files updated - Archivos actualizados - - - - '%1' and %n other file(s) have been updated. - '%1' y %n otro archivo(s) fue actualizado.'%1' y %n otros archivo(s) fueron actualizados. - - - + Error Error - + The CSync thread terminated. El proceso CSync finalizó. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". Esta sincronización borraría todos los archivos en la carpeta local de sincronización '%1'. Si vos o el administrador resetearon tu cuenta en el servidor, elegí "Conservar Archivos". Si querés borrar toda tu información, elegí "Borrar todos los archivos". - + 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? - + Esta sincronización borraría todos los archivos en el directorio local de sincronización '%1'. +Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o a que todos los archivos fueron borrados manualmente. +¿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 @@ -554,62 +524,62 @@ Are you sure you want to perform this operation? 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. - + 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. - + Setup Error. Error de configuración. - + User Abort. - + Interrumpir. - + %1 (Sync is paused) %1 (Sincronización en pausa) @@ -646,8 +616,8 @@ documentation for possible fixes. Mirall::FolderWizard - - + + Add Folder gregar directorio @@ -655,42 +625,42 @@ documentation for possible fixes. Mirall::FolderWizardSourcePage - + No local folder selected! ¡No se seleccionó ningún directorio loca! - + 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.<br/>Please pick another one! El directorio %1 ya existe como directorio de subidas.<br/>¡Seleccioná otra! - + An already configured folder is contained in the current entry. Hay un directorio sincronizado en de la selección actual. - + An already configured folder contains the currently entered directory. El directorio está dentro de otro previamente configurado. - + 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. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>El alias <i>%1</i> ya está siendo utilizado. Por favor, elegí otro. - + Select the source folder Seleccioná el directorio origen @@ -698,42 +668,42 @@ documentation for possible fixes. Mirall::FolderWizardTargetPage - + 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.<br/>Please check manually. No se pudo crear el directorio en %1.<br/>Por favor, intentalo manualmente. - + Choose this to sync the entire account Seleccioná acá para sincronizar la cuenta completa - + This directory 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 estás sincronizando <i>%1</i>, el cual es el directorio de <i>%2</i>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. Si sincronizás el directorio raíz, <b>no podés<b> configurar otro directorio para sincronizar @@ -747,8 +717,8 @@ documentation for possible fixes. - General - General + General Setttings + @@ -790,36 +760,38 @@ documentation for possible fixes. Borrar - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. - + Los archivos o directorios que coinciden con el patrón no van a ser sincronizados. + +Los elementos marcados también se borrarán si impiden la eliminación de algún directorio. Esto es útil para metadatos. - + Could not open file No se pudo abrir el archivo - + Cannot write changes to '%1'. No se pueden guardar cambios en '%1'. - - + + Add Ignore Pattern Agregar patrón a ignorar - - + + Add a new ignore pattern: Añadir nuevo patrón a ignorar: - + This entry is provided by the system at '%1' and cannot be modified in this view. Esta entrada es provista por el sistema en '%1' y no puede ser modificada en esta vista. @@ -827,52 +799,52 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::LogBrowser - + Log Output Contenido del log - + &Search: &Buscar: - + &Find &Encontrar - + Clear Borrar - + Clear the log display. Limpiar la pantalla de registros. - + S&ave G&uardar - + Save the log file to a file on disk for debugging. Guardar el log en un archivo en disco para depuración. - + Error Error - + Save log file Guardar archivo de log - + Could not write to log file No fue posible escribir al archivo de log @@ -994,47 +966,47 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudAdvancedSetupPage - + Connect to %1 Conectar a %1 - + Setup local folder options Configurar opciones de directorio local - + Connect... Conectar... - + Your entire account will be synced to the local folder '%1'. Tu cuenta completa va a ser sincronizada en el directorio local '%1'. - + %1 folder '%2' is synced to local folder '%3' - + El directorio %1 '%2' está sincronizado con el directorio local '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> - + <p><small><strong>Advertencia:</strong>Actualmente tenés múltiples directorios configurados. ¡Si seguís con la configuración actual, el directorio de configuración será descartado y se creará un único directorio raíz!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> <p><small><strong>Advertencia:</strong>El directorio local no está vacío. ¡Seleccioná otro!</small></p> - + Local Sync Folder Directorio local de sincronización - + Update advanced setup Actualizar configuración avanzada @@ -1042,44 +1014,21 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudHttpCredsPage - + Connect to %1 Conectar a %1 - + Enter user credentials Ingresá las credenciales de usuario - + Update user credentials Actualizar credenciales - - Mirall::OwncloudPropagator - - - Aborted - - - - - Could not remove directory %1 - - - - - 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. - - - Mirall::OwncloudSetupPage @@ -1103,7 +1052,7 @@ Checked items will also be deleted if they prevent a directory from being remove Esta URL no es segura. No deberías usarla. - + Update %1 server @@ -1111,129 +1060,126 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudSetupWizard - + Folder rename failed Error Al Renombrar Directorio - + 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 posible borrar y hacer una copia de seguridad del directorio porque el directorio o archivo en su interior está abierto por otro programa. Cerrá el directorio o archivo y pulsá Reintentar o Cancelar Configuración. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - Intentando conectar %1 con %2 para determinar el tipo de autenticación... - - - + <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/> - - Failed to connect to %1:<br/>%2 - Error al conectar con %1: <br/>%2 - - - + 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 - - The remote folder could not be accessed! - No fue posible acceder al directorio remoto! + + + Failed to connect to %1 at %2:<br/>%3 + - + + No remote folder specified! + + + + 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. @@ -1241,7 +1187,7 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizard - + %1 Connection Wizard %1 Asistente de Conexión @@ -1249,27 +1195,27 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizardResultPage - + Open %1 Abrir %1 - + Open Local Folder Abrir directorio local - + Everything set up! ¡Todo configurado! - + Your entire account is synced to the local folder <i>%1</i> Tu cuenta completa está sincronizada con el directorio local <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> @@ -1283,8 +1229,8 @@ Checked items will also be deleted if they prevent a directory from being remove - Detailed Sync Protocol - Protocolo de Sincronización Detallado + Detailed Sync Status + @@ -1362,7 +1308,7 @@ in a cross platform environment Item ignored - + Elemento ignorado @@ -1378,7 +1324,7 @@ list of names to ignore Invalid characters - + Caracteres no válidos @@ -1406,8 +1352,8 @@ name - The sync protocol has been copied to the clipboard. - El informe de sincronización fue copiado al portapapeles. + The sync status has been copied to the clipboard. + @@ -1428,31 +1374,55 @@ name Configuración - + %1 %1 - - Protocol + + Status - + General General - + Network Red - + Account Cuenta + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1467,67 +1437,67 @@ name - + SSL Connection Conexión SSL - + Warnings about current SSL Connection: Avisos de tu conexión actual SSL: - + with Certificate %1 con certificado %1 - - - + + + &lt;not specified&gt; &lt;no especificado&gt; - - + + Organization: %1 Empresa: %1 - - + + Unit: %1 Unidad: %1 - - + + Country: %1 País: %1 - + Fingerprint (MD5): <tt>%1</tt> Huella (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Huella (SHA1): <tt>%1</tt> - + Effective Date: %1 Desde: %1 - + Expiry Date: %1 Hasta: %1 - + Issuer: %1 Generado por: %1 @@ -1545,17 +1515,17 @@ name <p>Hay disponible una nueva versión del cliente %1.</p><p><b>%2</b> está disponible para su descarga. La versión instalada es %3.<p> - + Skip update No actualizar - + Skip this time Saltear esta vez - + Get update Obtener actualización @@ -1563,169 +1533,116 @@ name Mirall::ownCloudGui - + %1 Sync Started Sincronización de %1 iniciada - + Sync started for %n configured sync folder(s). - + one: Iniciada la sincronización para %n directorio(s) configurados para sincronizar.other: Iniciada la sincronización de %n directorio(s) configurado para sincronizar. - + 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 - + 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 - + %1 (%2, %3) %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) Sincronizando %1 de %2 (%3 de %4) - + Up to date actualizado - - Mirall::ownCloudInfo - - - Proxy Refused Connection - El proxy Rechazó la Conexión - - - - The configured proxy has refused the connection. Please check the proxy settings. - El proxy configurado rechazó la conexión. Verificá la configuración del proxy. - - - - Proxy Closed Connection - Proxy Cerró la Conexión - - - - The configured proxy has closed the connection. Please check the proxy settings. - El proxy cerró rechazó la conexión. Verificá la configuración del proxy. - - - - Proxy Not Found - No se encontró el proxy - - - - The configured proxy could not be found. Please check the proxy settings. - No se puede encontrar el proxy configurado Por favor, verificá los ajustes del proxy. - - - - Proxy Authentication Error - Error de autenticación en el proxy - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - El proxy configurado requiere inicio de sesión pero las credenciales no son válidas. Por favor, comprobá la configuración del proxy. - - - - Proxy Connection Timed Out - Tiempo de Espera de Conexión al Proxy Agotado. - - - - The connection to the configured proxy has timed out. - La conexión con el proxy configurado caducó. - - OwncloudAdvancedSetupPage @@ -1992,6 +1909,35 @@ name Botón + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2023,12 +1969,12 @@ name main.cpp - + System Tray not available La bandeja del sistema no está disponible - + %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 requiere una bandeja del sistema funcionando. Si estás usando XFCE, por favor leé <a href="http://docs.xfce.org/xfce/xfce4-panel/systray"> estas instrucciones</ a>. De lo contrario, instalá una aplicación de la bandeja del sistema, como 'trayer' e intentalo de nuevo. @@ -2071,7 +2017,7 @@ name - + Context Contexto @@ -2097,44 +2043,60 @@ name - + deleted borrado - - + + + Move + + + + + downloading descargando - - + + uploading subiendo - + inactive inactivo - + starting iniciando - + finished finalizado - + delete borrar + + + move + + + + + moved + + theme diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts index 4fbacfa34..04d39a56b 100644 --- a/translations/mirall_et.ts +++ b/translations/mirall_et.ts @@ -77,11 +77,6 @@ Modify Account Muuda kontot - - - Sync Status - Sünkroniseeringu staatus - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause Paus @@ -103,6 +98,11 @@ Add Folder... Lisa kataloog... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ 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> - - Checking %1 connection... - %1 ühenduse kontrollimine... - - - + No %1 connection configured. Ühtegi %1 ühendust pole seadistatud. - + Sync Running Sünkroniseerimine on käimas - + + No account configured. + + + + 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 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. Ühendatud <a href="%1">%2</a>. - - Version: %1 (%2) - Versioon: %1 (%2) - - - - unknown problem. - tundmatu probleem. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>Ei õnnestunud ühenduda %1: <tt>%2</tt></p> - - - + Start Start - + Currently Hetkel - + Completely Täielikult - + %1 %2 %3 (%4 of %5) %1 %2 %3 (%4 / %5) - + Completely finished. Täielikult lõpetatud. - + %1 of %2, file %3 of %4 %1 / %2, fail %3 / %4 - - %1 of %2 in use. - Kasutusel %1 / %2 + + Connected to <a href="%1">%2</a> as <i>%3</i>. + - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. Hetkel pole mahu kasutuse info saadaval. @@ -357,6 +352,11 @@ CSync unspecified error. CSync tuvastamatu viga. + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -386,150 +386,118 @@ Mirall::ConnectionValidator - - No ownCloud connection configured - Ühtegi ownCloud ühendust pole seadistatud + + No ownCloud account configured + - + The configured server for this client is too old Seadistatud server on selle kliendi jaoks liiga vana - + Please update to the latest server and restart the client. Palun uuenda server viimasele versioonile ning taaskäivita klient. - + Unable to connect to %1 %1-ga ühendumine ebaõnnestus - + The provided credentials are not correct Sisestatud kasutajatunnused pole õiged - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - Võtmeahelast ei leitud parooli sissekannet. Palun seadista uuesti. - - Mirall::Folder - + Unable to create csync-context Ei suuda luua csync-konteksti - + Local folder %1 does not exist. Kohalikku kausta %1 pole olemas. - + %1 should be a directory but is not. %1 peaks olema kataloog, kuid pole seda mitte. - + %1 is not readable. %1 pole loetav. - + File %1: %2 Fail %1: %2 - + + File %1 Fail %1 - - New file available - Uus fail on saadaval + + downloaded + - - '%1' has been synced to this machine. - '%1' sünkroniseeriti siia. + + removed + - - New files available - Uued failid on saadaval - - - - '%1' and %n other file(s) have been synced to this machine. - '%1' ja %n fail(i) sünkroniseeriti siia.'%1' ja %n fail(i) sünkroniseeriti siia. + + updated + - - File removed - Fail eemaldati + + renamed + - - '%1' has been removed. - '%1' on eemaldatud. + + '%1' has been %2. + - - Files removed - Fail eemaldatud - - - - '%1' and %n other file(s) have been removed. - '%1' ja %n fail(i) eemaldati.'%1' ja %n fail(i) eemaldati. + + Files %1 + - - File updated - Fail uuendatud + + '%1' and %2 other files have been %3. + - - '%1' has been updated. - '%1' on uuendatud. - - - - Files updated - Failid uuendatud - - - - '%1' and %n other file(s) have been updated. - '%1' ja %n fail(i) uuendati.'%1' ja %n fail(i) uuendati. - - - + Error Viga - + The CSync thread terminated. CSync lõim katkestati. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". See sünkroniseering kustutab kõik failid kohalikust kataloogist '%1'.⏎ Kui sina või adminstraator on sinu konto serveris algseadistanud, siis vali "Säilita failid". Kui soovid oma andmed kustutada, vali "Kustuta kõik failid". - + 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? @@ -538,17 +506,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 @@ -556,62 +524,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. - + 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. - + %1 (Sync is paused) %1 (Sünkroniseerimine on peatatud) @@ -650,8 +618,8 @@ dokumentatsioonist võimalikke lahendusi. Mirall::FolderWizard - - + + Add Folder Lisa kaust @@ -659,42 +627,42 @@ dokumentatsioonist võimalikke lahendusi. Mirall::FolderWizardSourcePage - + No local folder selected! 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.<br/>Please pick another one! Kohalik kataloog %1 juba on üleslaetav kataloog.<br/>Palun vali mõni teine! - + An already configured folder is contained in the current entry. Antud kataloogis juba sidaldub eelnevalt seadistatud kataloog. - + An already configured folder contains the currently entered directory. Eelnevalt seadisttud kataloog juba sisaldab praegu sisestatud kataloogi. - + The alias can not be empty. Please provide a descriptive alias word. Alias ei saa olla tühi. Palun sisesta kirjeldav sõna. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>Alias <i>%1</i> on juba kasutuses. Palun vali mõni teine alias. - + Select the source folder Vali algne kaust @@ -702,42 +670,42 @@ dokumentatsioonist võimalikke lahendusi. Mirall::FolderWizardTargetPage - + 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.<br/>Please check manually. Kausta loomine ebaõnnestus - %1.<br/>Palun kontrolli käsitsi. - + Choose this to sync the entire account Vali see sünkroniseering tervele kontole - + This directory 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. - + If you sync the root folder, you can <b>not</b> configure another sync directory. Kui sa sünkroniseerid peakausta, siis sa <b>ei saa</b> seadistada mõnda teist sünkroniseerimise kausta. @@ -751,8 +719,8 @@ dokumentatsioonist võimalikke lahendusi. - General - Üldine + General Setttings + @@ -794,7 +762,7 @@ dokumentatsioonist võimalikke lahendusi. Eemalda - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. @@ -803,29 +771,29 @@ Checked items will also be deleted if they prevent a directory from being remove Ühtlasi kustutatakse märgitud üksused, kui need takistavad kataloogi kustutamist. See on kasulik meta-andmetele. - + Could not open file Ei suutunud avada faili - + Cannot write changes to '%1'. Ei saa kirjutada muudatusi '%1'. - - + + Add Ignore Pattern Lisa ignoreerimise muster - - + + Add a new ignore pattern: Lisa uus ignoreerimise muster: - + This entry is provided by the system at '%1' and cannot be modified in this view. Selle kirje on pakkunud süsteem '%1' ning seda ei saa antud vaates muuta. @@ -833,52 +801,52 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::LogBrowser - + Log Output Logi väljund - + &Search: Ot&si: - + &Find Leia: - + Clear Tühjenda - + Clear the log display. Tühjenda näidatav logi. - + S&ave S&alvesta - + Save the log file to a file on disk for debugging. Salvesta logi fail kettale täpsemaks uurimiseks. - + Error Viga - + Save log file Salvesta logifail - + Could not write to log file Logifaili kirjutamine ebaõnnestus @@ -1000,47 +968,47 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudAdvancedSetupPage - + Connect to %1 Ühendu %1 - + Setup local folder options Seadista kohaliku kataloogi valikud - + Connect... Ühenda... - + Your entire account will be synced to the local folder '%1'. Kogu su konto sünkroniseeritakse kohalikku kataloogi '%1'. - + %1 folder '%2' is synced to local folder '%3' %1 kataloog '%2' on sünkroniseeritud kohalikku kataloogi '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> <p><small><strong>Hoiatus:</strong>Sul on seadistatud mitu kataloogi. Kui sa jätkad olemasoleva seadistusega, siis kataloogide seadistus hüljatakse ning selle asemel luuakse üks peakataloogi sünkroniseering!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> <p><small><strong>Hoiatus:</strong> Kohalik kataloog ei ole tühi. Vali lahendus!</small></p> - + Local Sync Folder Kohalik Sync Kataloog - + Update advanced setup Uuenda täpsemat seadistust @@ -1048,44 +1016,21 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudHttpCredsPage - + Connect to %1 Ühendu %1 - + Enter user credentials Sisesta kasutajaandmed - + Update user credentials Uuenda kasutajaandmeid - - Mirall::OwncloudPropagator - - - Aborted - Tühistatud - - - - Could not remove directory %1 - Kausta %1 ei saa eemaldada - - - - 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. - - Mirall::OwncloudSetupPage @@ -1109,7 +1054,7 @@ Checked items will also be deleted if they prevent a directory from being remove See aadress EI OLE turvaline. Sa ei peaks seda kasutama. - + Update %1 server Uuenda %1 serverit @@ -1117,129 +1062,126 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudSetupWizard - + Folder rename failed Kataloogi ümbernimetamine ebaõnnestus - + 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. - + + <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 - - Trying to connect to %1 at %2 to determine authentication type... - Püüan ühenduda %1 kohast %2 määratlemaks autentimise tüüpi... - - - + <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/> - - Failed to connect to %1:<br/>%2 - Ühendumine ebaõnnestus %1:<br/>%2 - - - + 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 - - The remote folder could not be accessed! - Serveri kataloogile ei ole ligipääsetav! + + + Failed to connect to %1 at %2:<br/>%3 + - + + No remote folder specified! + + + + 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. @@ -1247,7 +1189,7 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizard - + %1 Connection Wizard %1 seadistamise juhendaja @@ -1255,27 +1197,27 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizardResultPage - + Open %1 Ava %1 - + Open Local Folder Ava Kohalik Kataloog - + Everything set up! Kõik on seadistatud! - + Your entire account is synced to the local folder <i>%1</i> Kogu Su konto sünkroniseeriti kohalikku kataloogi <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> %1 kaust <i>%1</i> on sünkroniseeritud kohaliku kaustaga <i>%2</i> @@ -1289,8 +1231,8 @@ Checked items will also be deleted if they prevent a directory from being remove - Detailed Sync Protocol - Detailne Sync protokoll + Detailed Sync Status + @@ -1340,7 +1282,7 @@ Checked items will also be deleted if they prevent a directory from being remove Soft Link ignored - Soft linki ingnoreeriti + Soft linki ingoreeriti @@ -1376,7 +1318,7 @@ keskkonna platvormide vahel. %1 on ignore list - %1 on ingoreeritavate nimistus + %1 on ignoreeritavate nimistus @@ -1419,8 +1361,8 @@ konflikt-failiks ning serveris asuv fail on saadaval algse nimega. - The sync protocol has been copied to the clipboard. - Sync protokoll on kopeeritud lõikepuhvrisse. + The sync status has been copied to the clipboard. + @@ -1441,31 +1383,55 @@ konflikt-failiks ning serveris asuv fail on saadaval algse nimega. Seaded - + %1 %1 - - Protocol - Protokol + + Status + - + General Üldine - + Network Võrk - + Account Konto + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1480,67 +1446,67 @@ konflikt-failiks ning serveris asuv fail on saadaval algse nimega. - + SSL Connection SSL ühendus - + Warnings about current SSL Connection: Hoiatused praeguse SSL ühenduse kohta: - + with Certificate %1 sertifikaadiga %1 - - - + + + &lt;not specified&gt; &lt;pole määratud&gt; - - + + Organization: %1 Organisatsioon: %1 - - + + Unit: %1 Ühik: %1 - - + + Country: %1 Riik: %1 - + Fingerprint (MD5): <tt>%1</tt> Sõrmejälg (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Sõrmejälg (SHA1): <tt>%1</tt> - + Effective Date: %1 Efektiivne kuupäev: %1 - + Expiry Date: %1 Aegumise kuupäev: %1 - + Issuer: %1 Esitaja: %1 @@ -1558,17 +1524,17 @@ konflikt-failiks ning serveris asuv fail on saadaval algse nimega. <p>Uus versioon %1 kliendist on saadaval.</p><p><b>%2</b> on saadaval alla laadimiseks. Paigaldatud on versioon %3.<p> - + Skip update Jäta uuendus vahele - + Skip this time Jäta seekord vahele - + Get update Hangi uuendus @@ -1576,169 +1542,116 @@ konflikt-failiks ning serveris asuv fail on saadaval algse nimega. Mirall::ownCloudGui - + %1 Sync Started %1 sünkroniseerimine käivitati - + Sync started for %n configured sync folder(s). Sünkroniseerimine alustati %n seadistatud sünkroniseeritavas kaustas.Sünkroniseerimine alustati %n seadistatud sünkroniseeritavastes kaustades. - + Folder %1: %2 - Kataloog %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 kataloog '%1' + Ava kaust '%1' - + Open %1 in browser - Ava %1 brauseris + Ava %1 veebilehitsejas - + Calculating quota... - Arvutan mahupiiri... + Mahupiiri arvutamine... - + Unknown status Tundmatu staatus - + Settings... Seaded... - + Details... Üksikasjad... - + Help Abiinfo - + Quit %1 Lõpeta %1 - + Quota n/a Mahupiir n/a - + %1% of %2 in use Kasutusel %1% / %2 - + No items synced recently Ühtegi üksust pole hiljuti sünkroniseeritud - + %1 (%2, %3) %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) Sünkroniseerin %1 / %2 (%3 / %4) - + Up to date Ajakohane - - Mirall::ownCloudInfo - - - Proxy Refused Connection - Proksi keeldus ühendusest - - - - The configured proxy has refused the connection. Please check the proxy settings. - Seadistatud proksi tõrjus ühenduse. Palun kontrolli proksi seadistust. - - - - Proxy Closed Connection - Proksi sulges ühenduse - - - - The configured proxy has closed the connection. Please check the proxy settings. - Seadistatud proksi sulges ühenduse. Palun kontrolli proksi seadistust. - - - - Proxy Not Found - Proksit ei leitud - - - - The configured proxy could not be found. Please check the proxy settings. - Ei suutnud leida seadistatud proksit. Palun kontrolli proksi seadistust. - - - - Proxy Authentication Error - Proksi autentimise viga - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - Seadistatud proksi nõuab sisselogimist, kuid kasutajatunnused on valed. Palun kontrolli proksi seadeid. - - - - Proxy Connection Timed Out - Proksi ühendus aegus - - - - The connection to the configured proxy has timed out. - Ühendus seadistatud proksiga aegus. - - OwncloudAdvancedSetupPage @@ -2004,6 +1917,35 @@ konflikt-failiks ning serveris asuv fail on saadaval algse nimega. Nupp + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2035,12 +1977,12 @@ konflikt-failiks ning serveris asuv fail on saadaval algse nimega. main.cpp - + System Tray not available Süsteemisalv pole saadaval - + %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 vajab tööks süsteemisalve. Kui Sa kasutad XFCE-d, palun järgi <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">neid juhiseid</a>. Muudel juhtudel palun paigalda süsteemisalve rakendus nagu näiteks 'trayer' ning proovi uuesti. @@ -2083,7 +2025,7 @@ konflikt-failiks ning serveris asuv fail on saadaval algse nimega. - + Context Kontekst @@ -2109,44 +2051,60 @@ konflikt-failiks ning serveris asuv fail on saadaval algse nimega. - + deleted kustutatud - - + + + Move + + + + + downloading allalaadimine - - + + uploading üleslaadimine - + inactive passiivne - + starting - alustan + alustamine - + finished lõpetatud - + delete kustuta + + + move + + + + + moved + + theme @@ -2163,7 +2121,7 @@ konflikt-failiks ning serveris asuv fail on saadaval algse nimega. Sync is running - Sünkroniseerimineon käimas + Sünkroniseerimine on käimas @@ -2173,12 +2131,12 @@ konflikt-failiks ning serveris asuv fail on saadaval algse nimega. Sync Success, problems with individual files. - Edukas sünkroniseering, probleeme üksikute failidega. + Edukas sünkroniseerimine, probleeme üksikute failidega. Sync Error - Click info button for details. - Sünkroniseerimise viga - detaile näed Info alt. + Sünkroniseerimise viga - Üksikasjade nägemiseks kliki info nupule. @@ -2193,7 +2151,7 @@ konflikt-failiks ning serveris asuv fail on saadaval algse nimega. Preparing to sync - Valmistun sünkroniseerima + Sünkroniseerimiseks valmistumine diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts index 70964c9de..13da28419 100644 --- a/translations/mirall_eu.ts +++ b/translations/mirall_eu.ts @@ -77,11 +77,6 @@ Modify Account - - - Sync Status - - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause Pausarazi @@ -103,6 +98,11 @@ Add Folder... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ - + Retrieving usage information... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. - + 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> - + 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> - - Checking %1 connection... - Egiaztatzen %1 konexioa... - - - + No %1 connection configured. Ez dago %1 konexiorik konfiguratuta. - + Sync Running Sinkronizazioa martxan da - + + No account configured. + + + + The syncing operation is running.<br/>Do you want to terminate it? Sinkronizazio martxan da.<br/>Bukatu nahi al duzu? - + + %1 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. - - Version: %1 (%2) - Bertsioa: %1 (%2) - - - - unknown problem. - arazo ezezaguna. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>%1-era konektatzeak huts egin du: <tt>%2</tt></p> - - - + Start - + Currently - + Completely - + %1 %2 %3 (%4 of %5) - + Completely finished. - + %1 of %2, file %3 of %4 - - %1 of %2 in use. + + Connected to <a href="%1">%2</a> as <i>%3</i>. - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. @@ -357,6 +352,11 @@ CSync unspecified error. CSyncen zehaztugabeko errorea. + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -386,166 +386,134 @@ Mirall::ConnectionValidator - - No ownCloud connection configured + + No ownCloud account configured - + The configured server for this client is too old - + Please update to the latest server and restart the client. - + Unable to connect to %1 - + The provided credentials are not correct - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - Ez da pasahitzik aurkitu. Mesedez birkonfiguratu. - - Mirall::Folder - + Unable to create csync-context - + Local folder %1 does not exist. Bertako %1 karpeta ez da existitzen. - + %1 should be a directory but is not. %1 karpeta bat izan behar zen baina ez da. - + %1 is not readable. %1 ezin da irakurri. - + File %1: %2 - + + File %1 - - New file available + + downloaded - - '%1' has been synced to this machine. + + removed - - New files available - - - - - '%1' and %n other file(s) have been synced to this machine. - - - - - File removed + + updated - - '%1' has been removed. + + renamed - - Files removed - - - - - '%1' and %n other file(s) have been removed. - - - - - File updated + + '%1' has been %2. - - '%1' has been updated. + + Files %1 - - Files updated + + '%1' and %2 other files have been %3. - - - '%1' and %n other file(s) have been updated. - - - + Error Errorea - + The CSync thread terminated. CSync haria bukatu da. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". - + 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 @@ -553,62 +521,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. Definitu gabeko egoera. - + Waits to start syncing. Itxoiten sinkronizazioa hasteko. - + Preparing for sync. - + Sync is running. Sinkronizazioa martxan da. - + Server is currently not available. - + Last Sync was successful. Azkeneko sinkronizazioa ongi burutu zen. - + Last Sync was successful, but with warnings on individual files. - + Setup Error. Konfigurazio errorea. - + User Abort. - + %1 (Sync is paused) @@ -645,8 +613,8 @@ documentation for possible fixes. Mirall::FolderWizard - - + + Add Folder Gehitu Karpeta @@ -654,42 +622,42 @@ documentation for possible fixes. Mirall::FolderWizardSourcePage - + No local folder selected! - + You have no permission to write to the selected folder! - + The local path %1 is already an upload folder.<br/>Please pick another one! Bertako %1 karpeta dagoeneko igoerako karpeta bat da.<br/>Mesdez hautatu beste bat! - + An already configured folder is contained in the current entry. Karpeta honek dagoeneko konfiguratuta dagoen beste karpeta bat du barnean - + An already configured folder contains the currently entered directory. Dagoeneko konfiguratuta dagoen karpeta batek zehaztutako karpeta du barnean. - + The alias can not be empty. Please provide a descriptive alias word. Ezizena ezin da hutsa izan. Mesedez jarri hitz esanguratsu bat. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/><i>%1</i> ezizena dagoeneko erabiltzen ari da. Mesedez hautatu beste bat. - + Select the source folder Hautatu jatorrizko karpeta @@ -697,42 +665,42 @@ documentation for possible fixes. Mirall::FolderWizardTargetPage - + Add Remote Folder - + Enter the name of the new folder: - + Folder was successfully created on %1. %1-en karpeta ongi sortu da. - + Failed to create the folder on %1.<br/>Please check manually. %1-en karpeta sortzeak huts egin du.<br/>Mesedez egiazta ezazu eskuz. - + Choose this to sync the entire account - + This directory is already being synced. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. Erro karpeta sinkronizatzen baduzu, <b>ez</b>ingo duzu beste sinkronizazio direktorio bat konfiguratu. @@ -746,8 +714,8 @@ documentation for possible fixes. - General - Orokorra + General Setttings + @@ -789,36 +757,36 @@ documentation for possible fixes. Ezabatu - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. - + Could not open file - + Cannot write changes to '%1'. - - - - Add Ignore Pattern - - + Add Ignore Pattern + + + + + Add a new ignore pattern: - + This entry is provided by the system at '%1' and cannot be modified in this view. @@ -826,52 +794,52 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::LogBrowser - + Log Output Egunkari Irteera - + &Search: &Bilatu: - + &Find &Aurkitu: - + Clear Garbitu - + Clear the log display. Garbitu egunkari bistaratzea. - + S&ave &Gorde - + Save the log file to a file on disk for debugging. Gorde egunkari fitxategia fitxategi batean arazteko. - + Error Errorea - + Save log file Gorde egunkari fitxategia - + Could not write to log file Ezin da egunkari fitxategia idatzi @@ -993,47 +961,47 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudAdvancedSetupPage - + Connect to %1 - + Setup local folder options - + Connect... - + Your entire account will be synced to the local folder '%1'. - + %1 folder '%2' is synced to local folder '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> - + Local Sync Folder - + Update advanced setup @@ -1041,44 +1009,21 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudHttpCredsPage - + Connect to %1 - + Enter user credentials - + Update user credentials - - Mirall::OwncloudPropagator - - - Aborted - - - - - Could not remove directory %1 - - - - - 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. - - - Mirall::OwncloudSetupPage @@ -1102,7 +1047,7 @@ Checked items will also be deleted if they prevent a directory from being remove Url hau ez da segurua. Ez zenuke berau erabili beharko. - + Update %1 server @@ -1110,129 +1055,126 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudSetupWizard - + Folder rename failed - + 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. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - - - - + <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/> - - Failed to connect to %1:<br/>%2 - Huts %1 -era konektatzean:<br/>%2 - - - + Error: Wrong credentials. - + 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 - - The remote folder could not be accessed! - Ezin da urruneko karpeta atzitu! + + + Failed to connect to %1 at %2:<br/>%3 + - + + No remote folder specified! + + + + Error: %1 Errorea: %1 - + creating folder on ownCloud: %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> - + <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. @@ -1240,7 +1182,7 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizard - + %1 Connection Wizard %1 Konexio Morroia @@ -1248,27 +1190,27 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizardResultPage - + Open %1 - + Open Local Folder Ireki karpeta lokala - + Everything set up! - + Your entire account is synced to the local folder <i>%1</i> Zure kontu osoa <i>%1</i> karpeta lokalarekin sinkronizaturik dago - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> @@ -1282,8 +1224,8 @@ Checked items will also be deleted if they prevent a directory from being remove - Detailed Sync Protocol - Sinkronizazio Protokolo Zehatza + Detailed Sync Status + @@ -1405,8 +1347,8 @@ name - The sync protocol has been copied to the clipboard. - Sinkronizazio protokoloa arbelera kopiatu da. + The sync status has been copied to the clipboard. + @@ -1427,31 +1369,55 @@ name Ezarpenak - + %1 - - Protocol + + Status - + General Orokorra - + Network - + Account + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1466,67 +1432,67 @@ name - + SSL Connection SSL konexioa - + Warnings about current SSL Connection: Abisua uneko SSL konexioari buruz: - + with Certificate %1 %1 ziurtagiriarekin - - - + + + &lt;not specified&gt; &lt;zehaztu gabe&gt; - - + + Organization: %1 Erakundea: %1 - - + + Unit: %1 Unitatea: %1 - - + + Country: %1 Herrialdea: %1 - + Fingerprint (MD5): <tt>%1</tt> Hatz-marka (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Hatz-marka (SHA1): <tt>%1</tt> - + Effective Date: %1 Balio-data: %1 - + Expiry Date: %1 Iraungitze-data: %1 - + Issuer: %1 Jaulkitzailea: %1 @@ -1544,17 +1510,17 @@ name - + Skip update Utzi eguneraketa - + Skip this time Utzi aldi honetan - + Get update Eskuratu eguneraketa @@ -1562,169 +1528,116 @@ name Mirall::ownCloudGui - + %1 Sync Started %1 Sinkronizazioa hasi da - + Sync started for %n configured sync folder(s). - + Folder %1: %2 - + No sync folders configured. Ez dago sinkronizazio karpetarik definituta. - + None. - + Recent Changes - + Open %1 folder Ireki %1 karpeta - + Managed Folders: Kudeatutako karpetak: - + Open folder '%1' - + Open %1 in browser - + Calculating quota... - + Unknown status - + Settings... - + Details... - + Help Laguntza - + Quit %1 - + Quota n/a - + %1% of %2 in use - + No items synced recently - + %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) - + Up to date Eguneratua - - Mirall::ownCloudInfo - - - Proxy Refused Connection - - - - - The configured proxy has refused the connection. Please check the proxy settings. - - - - - Proxy Closed Connection - - - - - The configured proxy has closed the connection. Please check the proxy settings. - - - - - Proxy Not Found - - - - - The configured proxy could not be found. Please check the proxy settings. - - - - - Proxy Authentication Error - - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - - - - - Proxy Connection Timed Out - - - - - The connection to the configured proxy has timed out. - - - OwncloudAdvancedSetupPage @@ -1990,6 +1903,35 @@ name + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2021,12 +1963,12 @@ name main.cpp - + System Tray not available - + %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. @@ -2069,7 +2011,7 @@ name - + Context @@ -2095,44 +2037,60 @@ name - + deleted ezabatuta - - + + + Move + + + + + downloading - - + + uploading - + inactive - + starting - + finished - + delete ezabatu + + + move + + + + + moved + + theme diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts index cb654c6e2..eb3fe8128 100644 --- a/translations/mirall_fa.ts +++ b/translations/mirall_fa.ts @@ -77,11 +77,6 @@ Modify Account - - - Sync Status - - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause توقف کردن @@ -103,6 +98,11 @@ Add Folder... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ - + 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> - - Checking %1 connection... - - - - + No %1 connection configured. - + Sync Running همگام سازی در حال اجراست - + + No account configured. + + + + The syncing operation is running.<br/>Do you want to terminate it? عملیات همگام سازی در حال اجراست.<br/>آیا دوست دارید آن را متوقف کنید؟ - + + %1 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. - - Version: %1 (%2) - - - - - unknown problem. - - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - - - - + Start - + Currently - + Completely - + %1 %2 %3 (%4 of %5) - + Completely finished. - + %1 of %2, file %3 of %4 - - %1 of %2 in use. + + Connected to <a href="%1">%2</a> as <i>%3</i>. - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. @@ -357,6 +352,11 @@ CSync unspecified error. خطای نامشخص CSync + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -386,166 +386,134 @@ Mirall::ConnectionValidator - - No ownCloud connection configured + + No ownCloud account configured - + The configured server for this client is too old - + Please update to the latest server and restart the client. - + Unable to connect to %1 - + The provided credentials are not correct - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - رمزعبور ورودی در keychain یافت نمی شود. لطفا مجددا پیکربندی شود. - - Mirall::Folder - + Unable to create csync-context - + Local folder %1 does not exist. پوشه محلی %1 موجود نیست. - + %1 should be a directory but is not. %1 باید یک پوشه باشد اما نیست. - + %1 is not readable. %1 قابل خواندن نیست. - + File %1: %2 - + + File %1 - - New file available + + downloaded - - '%1' has been synced to this machine. + + removed - - New files available - - - - - '%1' and %n other file(s) have been synced to this machine. - - - - - File removed + + updated - - '%1' has been removed. + + renamed - - Files removed - - - - - '%1' and %n other file(s) have been removed. - - - - - File updated + + '%1' has been %2. - - '%1' has been updated. + + Files %1 - - Files updated + + '%1' and %2 other files have been %3. - - - '%1' and %n other file(s) have been updated. - - - + Error خطا - + The CSync thread terminated. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". - + 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 @@ -553,62 +521,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. همگام سازی در حال اجراست - + Server is currently not available. - + Last Sync was successful. آخرین همگام سازی موفقیت آمیز بود - + Last Sync was successful, but with warnings on individual files. - + Setup Error. خطا در پیکر بندی. - + User Abort. - + %1 (Sync is paused) @@ -645,8 +613,8 @@ documentation for possible fixes. Mirall::FolderWizard - - + + Add Folder ایجاد پوشه @@ -654,42 +622,42 @@ documentation for possible fixes. Mirall::FolderWizardSourcePage - + No local folder selected! هیچ پوشه محلی انتخاب نشده است! - + You have no permission to write to the selected folder! شما اجازه نوشتن در پوشه های انتخاب شده را ندارید! - + The local path %1 is already an upload folder.<br/>Please pick another one! مسیر محلی 1% در حال حاضر یک پوشه آپلود است. <br/> لطفا مورد دیگری انتخاب کنید! - + An already configured folder is contained in the current entry. در حال حاضر یک پوشه پیکربندی شده در ورودی فعلی موجود است. - + An already configured folder contains the currently entered directory. در حال حاضر یک پوشه پیکربندی شده حاوی پوشه وارد شده فعلی است. - + The alias can not be empty. Please provide a descriptive alias word. نام مستعار نمی تواند خالی باشد. لطفا یک کلمه مستعار توصیفی ارائه دهید. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/> نام مستعار<i>%1</i> در حال حاضر در استفاده است. لطفا نام مستعار دیگری انتخاب کنید. - + Select the source folder پوشه ی اصلی را انتخاب کنید @@ -697,42 +665,42 @@ documentation for possible fixes. Mirall::FolderWizardTargetPage - + Add Remote Folder - + Enter the name of the new folder: - + Folder was successfully created on %1. پوشه با موفقیت ایجاد شده است %1. - + Failed to create the folder on %1.<br/>Please check manually. عدم موفقیت در ایجاد پوشه %1.<br/>لطفا به صورت دستی بررسی شود. - + Choose this to sync the entire account - + This directory is already being synced. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. اگر شما پوشه اصلی را همگام سازی کنید، شما <b>نمیتوانید</b> پوشه همگام سازی دیگری پیکربندی کنید. @@ -746,8 +714,8 @@ documentation for possible fixes. - General - عمومی + General Setttings + @@ -789,36 +757,36 @@ documentation for possible fixes. حذف - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. - + Could not open file - + Cannot write changes to '%1'. - - - - Add Ignore Pattern - - + Add Ignore Pattern + + + + + Add a new ignore pattern: - + This entry is provided by the system at '%1' and cannot be modified in this view. @@ -826,52 +794,52 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::LogBrowser - + Log Output - + &Search: &جستجو: - + &Find &پیدا کردن - + Clear معلوم - + Clear the log display. - + S&ave &ذخیره سازی - + Save the log file to a file on disk for debugging. - + Error خطا - + Save log file - + Could not write to log file @@ -993,47 +961,47 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudAdvancedSetupPage - + Connect to %1 - + Setup local folder options - + Connect... - + Your entire account will be synced to the local folder '%1'. - + %1 folder '%2' is synced to local folder '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> - + Local Sync Folder - + Update advanced setup @@ -1041,44 +1009,21 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudHttpCredsPage - + Connect to %1 - + Enter user credentials - + Update user credentials - - Mirall::OwncloudPropagator - - - Aborted - - - - - Could not remove directory %1 - - - - - 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. - - - Mirall::OwncloudSetupPage @@ -1102,7 +1047,7 @@ Checked items will also be deleted if they prevent a directory from being remove این آدرس امن نیست. شما نباید از آن استفاده کنید. - + Update %1 server @@ -1110,129 +1055,126 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudSetupWizard - + Folder rename failed تغییر نام پوشه ناموفق بود - + 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. نمی توان پوشه را حذف کرد و از آن پشتیبان گرفت زیرا پوشه یا یک فایل در آن در برنامه دیگر باز است .لطفا پوشه یا فایل را ببندید و دوباره امتحان کنید یا راه اندازی را لغو کنید. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - - - - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green"> با موفقیت متصل شده است به %1: %2 نسخه %3 (%4)</font><br/><br/> - - Failed to connect to %1:<br/>%2 - ناموفق در اتصال به%1:<br/>%2 - - - + 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 - - The remote folder could not be accessed! - پوشه از راه دور نمی واند در دسترس باشد! + + + 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 نمی تواند مقرر باشد. لطفا دوباره بررسی کنید. @@ -1240,7 +1182,7 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizard - + %1 Connection Wizard @@ -1248,27 +1190,27 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizardResultPage - + Open %1 بازکردن %1 - + Open Local Folder باز کردن پوشه محلی - + Everything set up! - + Your entire account is synced to the local folder <i>%1</i> کل حساب شما با پوشه محلی همگام سازی شده است <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> @@ -1282,8 +1224,8 @@ Checked items will also be deleted if they prevent a directory from being remove - Detailed Sync Protocol - پروتکل تفصیلی همگام سازی + Detailed Sync Status + @@ -1405,8 +1347,8 @@ name - The sync protocol has been copied to the clipboard. - پروتکل سنکرون شده است به کلیپ بورد کپی شده است. + The sync status has been copied to the clipboard. + @@ -1427,31 +1369,55 @@ name تنظیمات - + %1 - - Protocol + + Status - + General عمومی - + Network - + Account حساب کاربری + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1466,67 +1432,67 @@ name - + SSL Connection اتصال SSL - + Warnings about current SSL Connection: هشدار در مورد اتصال SSL فعلی: - + with Certificate %1 با گواهی %1 - - - + + + &lt;not specified&gt; &lt؛ مشخص نشده است &gt؛ - - + + Organization: %1 سازماندهی : %1 - - + + Unit: %1 واحد: %1 - - + + Country: %1 کشور: %1 - + Fingerprint (MD5): <tt>%1</tt> اثر انگشت (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> اثرانگشت (SHA1): <tt>%1</tt> - + Effective Date: %1 تاریخ موثر: %1 - + Expiry Date: %1 تاریخ انقضا: %1 - + Issuer: %1 صادرکننده: %1 @@ -1544,17 +1510,17 @@ name <p>یک نسخه جدید از %1 نرم افزار در دسترس است. </p><p><b>%2</b> برای دریافت در دسترس است. نسخه نصب شده %3.<p> - + Skip update نادیده گرفتن به روز رسانی - + Skip this time نادیده گرفتن این زمان - + Get update به دست آوردن به روز رسانی @@ -1562,169 +1528,116 @@ name Mirall::ownCloudGui - + %1 Sync Started %1 همگام سازی شروع شد. - + Sync started for %n configured sync folder(s). - + 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 - + Quota n/a - + %1% of %2 in use - + No items synced recently - + %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) - + Up to date تا تاریخ - - Mirall::ownCloudInfo - - - Proxy Refused Connection - پروکسی اتصال را رد کرده است. - - - - The configured proxy has refused the connection. Please check the proxy settings. - پروکسی پیکربندی شده اتصال را رد کرده است. لطفا تنظیمات پروکسی را بررسی کنید. - - - - Proxy Closed Connection - پروکسی اتصال را بسته است. - - - - The configured proxy has closed the connection. Please check the proxy settings. - پیکربندی پروکسی اتصال را بسته است. لطفا تنظیمات پروکسی رابررسی کنید. - - - - Proxy Not Found - پروکسی یافت نشد - - - - The configured proxy could not be found. Please check the proxy settings. - پروکسی پیکربندی شده نمی تواند یافت شود. لطفا تنظیمات پروکسی را بررسی کنید. - - - - Proxy Authentication Error - خطا در اعتبارسنجی پروکسی - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - پروکسی پیکربندی شده نیازمند ورود است اما اعتبارهای پروکسی نامعتبر هستند. لطفا تنظیمات پروکسی را بررسی کنید. - - - - Proxy Connection Timed Out - اتصال پروکسی به پایان رسیده است - - - - The connection to the configured proxy has timed out. - اتصال به پیکربندی پروکسی به پایان رسیده است. - - OwncloudAdvancedSetupPage @@ -1990,6 +1903,35 @@ name دکمه + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2021,12 +1963,12 @@ name main.cpp - + System Tray not available - + %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. @@ -2069,7 +2011,7 @@ name - + Context @@ -2095,44 +2037,60 @@ name - + deleted حذف شده - - + + + Move + + + + + downloading - - + + uploading - + inactive - + starting - + finished - + delete پاک کردن + + + move + + + + + moved + + theme diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts index dec97bfb7..3e0f628df 100644 --- a/translations/mirall_fi.ts +++ b/translations/mirall_fi.ts @@ -77,11 +77,6 @@ Modify Account Muokkaa tiliä - - - Sync Status - Synkronoinnin tila - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause Keskeytä @@ -103,6 +98,11 @@ Add Folder... Lisää kansio... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ 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. - + 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> - + 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> - - Checking %1 connection... - Tarkistetaan %1-yhteyttä... - - - + No %1 connection configured. %1-yhteyttä ei ole määritelty. - + Sync Running Synkronointi meneillään - + + No account configured. + + + + The syncing operation is running.<br/>Do you want to terminate it? Synkronointioperaatio on meneillään.<br/>Haluatko keskeyttää sen? - + + %1 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. Muodosta yhteys - <a href="%1">%2</a>. - - Version: %1 (%2) - Versio: %1 (%2) - - - - unknown problem. - tuntematon ongelma. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - - - - + Start - + Currently - + Completely - + %1 %2 %3 (%4 of %5) %1 %2 %3 (%4/%5) - + Completely finished. Kokonaan valmis. - + %1 of %2, file %3 of %4 %1/%2, tiedosto %3/%4 - - %1 of %2 in use. - %1/%2 käytössä. + + Connected to <a href="%1">%2</a> as <i>%3</i>. + - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. @@ -357,6 +352,11 @@ CSync unspecified error. CSync - määrittämätön virhe. + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -386,166 +386,134 @@ Mirall::ConnectionValidator - - No ownCloud connection configured - ownCloud-yhteyttä ei ole määritelty + + No ownCloud account configured + - + The configured server for this client is too old Määritelty palvelin on ohjelmistoversioltaan liian vanha tälle asiakasohjelmistolle - + Please update to the latest server and restart the client. Päivitä uusimpaan palvelinversioon ja käynnistä asiakasohjelmisto uudelleen. - + Unable to connect to %1 - + The provided credentials are not correct - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - - - Mirall::Folder - + Unable to create csync-context - + Local folder %1 does not exist. Paikallista kansiota %1 ei ole olemassa. - + %1 should be a directory but is not. Kohteen %1 pitäisi olla kansio, mutta se ei kuitenkaan ole kansio. - + %1 is not readable. %1 ei ole luettavissa. - + File %1: %2 Tiedosto %1: %2 - + + File %1 Tiedosto %1 - - New file available - Uusi tiedosto saatavilla + + downloaded + - - '%1' has been synced to this machine. - '%1' on synkronoitu tälle koneelle. + + removed + - - New files available - Uusia tiedostoja saatavilla - - - - '%1' and %n other file(s) have been synced to this machine. - + + updated + - - File removed - Tiedosto poistettu + + renamed + - - '%1' has been removed. - '%1' poistettiin. + + '%1' has been %2. + - - Files removed - Tiedostoja poistettu - - - - '%1' and %n other file(s) have been removed. - + + Files %1 + - - File updated - Tiedosto päivitetty + + '%1' and %2 other files have been %3. + - - '%1' has been updated. - '%1' on päivitetty. - - - - Files updated - Tiedostoja päivitetty - - - - '%1' and %n other file(s) have been updated. - - - - + Error Virhe - + The CSync thread terminated. Csyncin säikeen suoritus päättyi. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". - + 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 @@ -553,62 +521,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. 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. - + Setup Error. Asetusvirhe. - + User Abort. - + %1 (Sync is paused) %1 (Synkronointi on keskeytetty) @@ -645,8 +613,8 @@ documentation for possible fixes. Mirall::FolderWizard - - + + Add Folder Lisää kansio @@ -654,42 +622,42 @@ documentation for possible fixes. Mirall::FolderWizardSourcePage - + No local folder selected! Paikallista kansiota ei ole valittu! - + 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.<br/>Please pick another one! Paikallinen polku %1 on jo latauskansio.<br/>Valitse jokin toinen. - + An already configured folder is contained in the current entry. Tässä on jo olemassa asetettu kansio. - + An already configured folder contains the currently entered directory. Tämä kansio sisältyy jo aiemmin asetettuun kansioon. - + The alias can not be empty. Please provide a descriptive alias word. Alias-nimi ei voi olla tyhjä. Anna kuvaava aliassana. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>Alias-nimi <i>%1</i> on jo käytössä. Valitse toinen alias. - + Select the source folder Valitse lähdekansio @@ -697,42 +665,42 @@ documentation for possible fixes. Mirall::FolderWizardTargetPage - + 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.<br/>Please check manually. - + Choose this to sync the entire account Valitse tämä synkronoidaksesi koko tilin - + This directory is already being synced. Kansio on jo synkronoinnin alaisena. - + 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. - + If you sync the root folder, you can <b>not</b> configure another sync directory. @@ -746,8 +714,8 @@ documentation for possible fixes. - General - Yleiset + General Setttings + @@ -789,36 +757,36 @@ documentation for possible fixes. Poista - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. - + Could not open file Tiedoston avaaminen ei onnistunut - + Cannot write changes to '%1'. - - + + Add Ignore Pattern Lisää ohituskaava - - + + Add a new ignore pattern: Lisää uusi ohituskaava: - + This entry is provided by the system at '%1' and cannot be modified in this view. @@ -826,52 +794,52 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::LogBrowser - + Log Output Loki - + &Search: &Haku: - + &Find &Etsi - + Clear Tyhjennä - + Clear the log display. Tyhjennä lokinäyttö. - + S&ave &Tallenna - + Save the log file to a file on disk for debugging. Tallenna loki tiedostoon virheenetsintää varten. - + Error Virhe - + Save log file Tallenna lokitiedosto - + Could not write to log file Lokitiedostoon kirjoitus epäonnistui @@ -993,47 +961,47 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudAdvancedSetupPage - + Connect to %1 Muodosta yhteys - %1 - + Setup local folder options - + Connect... Yhdistä... - + Your entire account will be synced to the local folder '%1'. Koko tilisi synkronoidaan paikalliseen kansioon '%1'. - + %1 folder '%2' is synced to local folder '%3' %1-kansio '%2' on synkronoitu paikalliseen kansioon '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> - + Local Sync Folder Paikallinen synkronointikansio - + Update advanced setup @@ -1041,44 +1009,21 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudHttpCredsPage - + Connect to %1 Muodosta yhteys - %1 - + Enter user credentials Anna käyttäjätunnus - + Update user credentials - - Mirall::OwncloudPropagator - - - Aborted - - - - - Could not remove directory %1 - - - - - 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. - - - Mirall::OwncloudSetupPage @@ -1102,7 +1047,7 @@ Checked items will also be deleted if they prevent a directory from being remove Tämä osoite EI ole turvallinen. Sinun ei tulisi käyttää sitä. - + Update %1 server @@ -1110,129 +1055,126 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudSetupWizard - + Folder rename failed Kansion nimen muuttaminen epäonnistui - + 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. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - - - - + <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/> - - Failed to connect to %1:<br/>%2 - Yhteys kohteeseen %1 epäonnistui:<br/>%2 - - - + Error: Wrong credentials. - + 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 - - The remote folder could not be accessed! - Etäkansion käyttö epäonnistui! + + + Failed to connect to %1 at %2:<br/>%3 + - + + No remote folder specified! + + + + 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> - + <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. @@ -1240,7 +1182,7 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizard - + %1 Connection Wizard %1-yhteysavustaja @@ -1248,27 +1190,27 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizardResultPage - + Open %1 Avaa %1 - + Open Local Folder Avaa paikallinen kansio - + Everything set up! Kaikki valmiina! - + Your entire account is synced to the local folder <i>%1</i> Koko tilisi on synkronoitu paikalliseen kansioon <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> @@ -1282,7 +1224,7 @@ Checked items will also be deleted if they prevent a directory from being remove - Detailed Sync Protocol + Detailed Sync Status @@ -1405,7 +1347,7 @@ name - The sync protocol has been copied to the clipboard. + The sync status has been copied to the clipboard. @@ -1427,31 +1369,55 @@ name Asetukset - + %1 %1 - - Protocol + + Status - + General Yleiset - + Network Verkko - + Account Tili + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1466,67 +1432,67 @@ name - + SSL Connection SSL-yhteys - + Warnings about current SSL Connection: Varoitukset nykyisestä SSL-yhteydestä: - + with Certificate %1 varmenteella %1 - - - + + + &lt;not specified&gt; &lt;ei määritelty&gt; - - + + Organization: %1 Organisaatio: %1 - - + + Unit: %1 Yksikkö: %1 - - + + Country: %1 Maa: %1 - + Fingerprint (MD5): <tt>%1</tt> Sormenjälki (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Sormenjälki (SHA1): <tt>%1</tt> - + Effective Date: %1 Voimassa oleva päivämäärä: %1 - + Expiry Date: %1 Vanhenemispäivä: %1 - + Issuer: %1 Myöntäjä: %1 @@ -1544,17 +1510,17 @@ name <p>Uusi versio %1-asiakassovelluksesta on saatavilla.</p><p><b>%2</b> on valmiina ladattavaksi. Tällä hetkellä asennettu versio on %3.<p> - + Skip update Ohita päivitys - + Skip this time Ohita tämän kerran - + Get update Päivitä @@ -1562,169 +1528,116 @@ name Mirall::ownCloudGui - + %1 Sync Started - + Sync started for %n configured sync folder(s). - + 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... - + Unknown status Tuntematon tila - + Settings... Asetukset... - + Details... Tiedot... - + Help Ohje - + Quit %1 Lopeta %1 - + Quota n/a - + %1% of %2 in use %1%/%2 käytössä - + No items synced recently Kohteita ei ole synkronoitu äskettäin - + %1 (%2, %3) %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) Synkronoidaan %1/%2 (%3/%4) - + Up to date Ajan tasalla - - Mirall::ownCloudInfo - - - Proxy Refused Connection - Välityspalvelin kieltäytyi yhteydestä - - - - The configured proxy has refused the connection. Please check the proxy settings. - - - - - Proxy Closed Connection - Välityspalvelin katkaisi yhteyden - - - - The configured proxy has closed the connection. Please check the proxy settings. - - - - - Proxy Not Found - Välityspalvelinta ei löytynyt - - - - The configured proxy could not be found. Please check the proxy settings. - - - - - Proxy Authentication Error - Välityspalvelimen tunnistautumisvirhe - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - - - - - Proxy Connection Timed Out - Yhteys välityspalvelimeen aikakatkaistiin - - - - The connection to the configured proxy has timed out. - Yhteys määriteltyyn välityspalvelimeen aikakatkaistiin. - - OwncloudAdvancedSetupPage @@ -1990,6 +1903,35 @@ name + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2021,12 +1963,12 @@ name main.cpp - + System Tray not available Ilmoitusaluetta ei ole saatavilla - + %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 vaatii toimivan ilmoitusalueen. Jos käytät XFCE:tä, seuraa <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">näitä ohjeita</a>. Muussa tapauksessa asenna jokin ilmoitusalueen tarjoava sovellus, kuten "trayer" ja yritä uudelleen. @@ -2069,7 +2011,7 @@ name - + Context @@ -2095,44 +2037,60 @@ name - + deleted poistettu - - + + + Move + + + + + downloading ladataan - - + + uploading lähetetään - + inactive - + starting - + finished - + delete poista + + + move + + + + + moved + + theme diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts index fba0cad9e..dd45ab0e1 100644 --- a/translations/mirall_fr.ts +++ b/translations/mirall_fr.ts @@ -77,11 +77,6 @@ Modify Account Modifier un compte - - - Sync Status - Statut de synchronisation - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause Mettre en pause @@ -103,6 +98,11 @@ Add Folder... Ajouter un dossier... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ 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> - - Checking %1 connection... - Vérification de la connexion à %1 - - - + No %1 connection configured. Aucune connexion à %1 configurée - + Sync Running Synchronisation en cours - + + No account configured. + + + + 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 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. Connecté à <a href="%1">%2</a>. - - Version: %1 (%2) - Version : %1 (%2) - - - - unknown problem. - problème inconnu. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>Échec de connexion à %1: <tt>%2</tt></p> - - - + Start Démarrer - + Currently Actuellement - + Completely Complètement - + %1 %2 %3 (%4 of %5) %1 %2 %3 (%4 de %5) - + Completely finished. Complètement terminé. - + %1 of %2, file %3 of %4 %1 de %2, fichier %3 de %4 - - %1 of %2 in use. - %1 de %2 occupés. + + Connected to <a href="%1">%2</a> as <i>%3</i>. + - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. Actuellement aucune information d'utilisation de stockage n'est disponible. @@ -239,7 +234,7 @@ CSync failed to create a lock file. - CSync n'a pu créer le fichier de verrouillage. + CSync n'a pas pu créer le fichier de verrouillage. @@ -264,7 +259,7 @@ CSync could not detect the filesystem type. - CSync ne peut détecter le système de fichier. + CSync n'a pas pu détecter le type de système de fichier. @@ -357,6 +352,11 @@ CSync unspecified error. Erreur CSync inconnue. + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -386,150 +386,118 @@ Mirall::ConnectionValidator - - No ownCloud connection configured - Pas de connexion ownCloud configuré + + No ownCloud account configured + - + The configured server for this client is too old Le serveur configuré pour ce client est trop vieux - + Please update to the latest server and restart the client. Veuillez mettre à jour avec la dernière version du serveur et redémarrer le client. - + Unable to connect to %1 Impossible de se connecter à %1 - + The provided credentials are not correct Les informations d'identification fournies ne sont pas correctes - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - Aucun mot de passe n'a été trouvé dans le porte-clés. Veuillez vérifier la configuration. - - Mirall::Folder - + Unable to create csync-context Impossible de créer le contexte csync - + Local folder %1 does not exist. Le dossier local %1 n'existe pas. - + %1 should be a directory but is not. %1 doit être un répertoire, mais ce n'en ai pas un. - + %1 is not readable. %1 ne peut pas être lu. - + File %1: %2 Fichier %1 : %2 - + + File %1 Fichier %1 - - New file available - Nouveau fichier disponible + + downloaded + - - '%1' has been synced to this machine. - '%1' a été synchronisé sur cette machine. + + removed + - - New files available - Nouveaux fichiers disponibles - - - - '%1' and %n other file(s) have been synced to this machine. - '%1' et %n autres fichier(s) ont été synchronisés avec cette machine.'%1' et %n autres fichier(s) ont été synchronisés avec cette machine. + + updated + - - File removed - Fichier supprimé + + renamed + - - '%1' has been removed. - '%1' a été supprimé. + + '%1' has been %2. + - - Files removed - Fichiers supprimés - - - - '%1' and %n other file(s) have been removed. - '%1' et %n autres fichier(s) ont été supprimés.'%1' et %n autre(s) fichier(s) ont été supprimés. + + Files %1 + - - File updated - Fichier mis à jour + + '%1' and %2 other files have been %3. + - - '%1' has been updated. - '%1' a été mis à jour. - - - - Files updated - Fichiers mis à jour - - - - '%1' and %n other file(s) have been updated. - '%1' et %n autres fichier(s) ont été mis à jour.'%1' et %n autre(s) fichiers(s) ont été mis à jour. - - - + Error Erreur - + The CSync thread terminated. Le processus CSync s'est terminé. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". Cette synchronisation supprimerait tous les fichiers du dossier local de synchronisation '%1'. Si vous-même ou votre administrateur avez réinitialisé votre compte sur le serveur, choisissez "Garder les fichiers". Si vous voulez que vos données soient supprimées, choisissez "Supprimer tous les fichiers". - + 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? @@ -538,17 +506,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 @@ -556,62 +524,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. - + 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. - + %1 (Sync is paused) %1 (Synchronisation en pause) @@ -650,8 +618,8 @@ documentation pour des corrections éventuelles. Mirall::FolderWizard - - + + Add Folder Ajouter le dossier @@ -659,42 +627,42 @@ documentation pour des corrections éventuelles. Mirall::FolderWizardSourcePage - + No local folder selected! Aucun dossier local 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.<br/>Please pick another one! Le chemin local %1 est déjà un dossier d'envoi.<br/>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é. - + An already configured folder contains the currently entered directory. Un dossier déjà configuré contient le répertoire courant. - + 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. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>L'alias <i>%1</i> est déjà utilisé. Veuillez en choisir un autre. - + Select the source folder Sélectionnez le dossier source @@ -702,42 +670,42 @@ documentation pour des corrections éventuelles. Mirall::FolderWizardTargetPage - + 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.<br/>Please check manually. Echec de la création du dossier sur %1 .<br/>Veuillez vérifier manuellement. - + Choose this to sync the entire account Sélectionner ceci pour synchroniser l'ensemble du compte - + This directory is already being synced. Le dossier est déja synchronisé. - + 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>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. Si vous synchronisez le répertoire racine, vous <b>ne pouvez pas</b> configurer la synchronisation d'un autre répertoire. @@ -751,8 +719,8 @@ documentation pour des corrections éventuelles. - General - Généraux + General Setttings + @@ -794,7 +762,7 @@ documentation pour des corrections éventuelles. Supprimer - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. @@ -803,29 +771,29 @@ Checked items will also be deleted if they prevent a directory from being remove Les items cochés seront également supprimés s'ils empêchent la suppression d'un dossier. Cela est utile pour les meta-données. - + Could not open file Impossible d'ouvrir le fichier - + Cannot write changes to '%1'. Impossible d'écrire les modifications sur '%1'. - - + + Add Ignore Pattern Ajouter un modèle à ignorer - - + + Add a new ignore pattern: Ajouter un nouveau modèle à ignorer : - + This entry is provided by the system at '%1' and cannot be modified in this view. Cette entrée est fournie par le système à '%1' et ne peut être modifiée dans cette vue. @@ -833,52 +801,52 @@ Les items cochés seront également supprimés s'ils empêchent la suppress Mirall::LogBrowser - + Log Output Consigner la sortie dans des fichiers de log - + &Search: &Recherche : - + &Find &Chercher - + Clear Effacer - + Clear the log display. Effacer la fenêtre de logs. - + S&ave S&auvegarder - + Save the log file to a file on disk for debugging. Enregistrer le fichier de log sur le disque à des fins de débogage. - + Error Erreur - + Save log file Sauvegarder le fichier de log - + Could not write to log file Impossible d'écrire dans le fichier de log @@ -1000,47 +968,47 @@ Les items cochés seront également supprimés s'ils empêchent la suppress Mirall::OwncloudAdvancedSetupPage - + Connect to %1 Connecter à %1 - + Setup local folder options Configurer les options du dossier local - + Connect... Connexion… - + Your entire account will be synced to the local folder '%1'. Votre compte sera entièrement synchronisé vers le dossier local '%1'. - + %1 folder '%2' is synced to local folder '%3' %1 le dossier '%2' est synchronisé vers le dossier local '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> <p><small><strong>Attention :</strong> Vous avez de multiples dossiers configurés. Si vous continuez avec les paramètres courants, les configurations du dossier seront perdues et seule la racine des dossiers synchronisés sera créée !</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> <p><small><strong>Attention :</strong> Le dossier local n'est pas vide. Résolvez d'abord ce point !</small></p> - + Local Sync Folder Dossier de synchronisation local - + Update advanced setup Mise à jour de la configuration avancée @@ -1048,44 +1016,21 @@ Les items cochés seront également supprimés s'ils empêchent la suppress Mirall::OwncloudHttpCredsPage - + Connect to %1 Connecter à %1 - + Enter user credentials Saisissez les identifiants de connexion de l'utilisateur - + Update user credentials Mettre à jour les identifiants de connexion de l'utilisateur - - Mirall::OwncloudPropagator - - - Aborted - Abandonné - - - - Could not remove directory %1 - Impossible de supprimer le dossier %1 - - - - 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. - - Mirall::OwncloudSetupPage @@ -1109,7 +1054,7 @@ Les items cochés seront également supprimés s'ils empêchent la suppress Cette URL n'est PAS sécurisée. Vous ne devriez pas l'utiliser. - + Update %1 server Mettre à jour le serveur %1 @@ -1117,129 +1062,126 @@ Les items cochés seront également supprimés s'ils empêchent la suppress Mirall::OwncloudSetupWizard - + Folder rename failed Echec du renommage du dossier - + 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. Ne peut supprimer et sauvegarder le dossier parce que le dossier ou le fichier concerné est ouvert dans un autre programme. Veuillez fermer le dossier ou le fichier et taper ré-essayer ou annuler l'installation. - + + <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 ... - - Trying to connect to %1 at %2 to determine authentication type... - Tentative de connexion à %1 à %2 pour déterminer le type d'authentification... - - - + <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/> - - Failed to connect to %1:<br/>%2 - Échec de la connexion à %1 :<br/>%2 - - - + 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 - - The remote folder could not be accessed! - Impossible d'accéder au répertoire distant ! + + + Failed to connect to %1 at %2:<br/>%3 + - + + No remote folder specified! + + + + 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. @@ -1247,7 +1189,7 @@ Les items cochés seront également supprimés s'ils empêchent la suppress Mirall::OwncloudWizard - + %1 Connection Wizard %1 Assistant de Connexion @@ -1255,27 +1197,27 @@ Les items cochés seront également supprimés s'ils empêchent la suppress Mirall::OwncloudWizardResultPage - + Open %1 Ouvrir %1 - + Open Local Folder Ouvrir le répertoire local - + Everything set up! Tout est configuré ! - + Your entire account is synced to the local folder <i>%1</i> Votre compte est synchronisé intégralement avec le répertoire local <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> %1 le dossier <i>%1</i> est synchronisé au dossier local <i>%2</i> @@ -1289,8 +1231,8 @@ Les items cochés seront également supprimés s'ils empêchent la suppress - Detailed Sync Protocol - Protocole de synchronisation détaillé + Detailed Sync Status + @@ -1419,8 +1361,8 @@ conflits et le fichier côté serveur est disponible sous son nom original. - The sync protocol has been copied to the clipboard. - Le protocole synchronisation choisi a été copié dans le presse-papiers. + The sync status has been copied to the clipboard. + @@ -1441,31 +1383,55 @@ conflits et le fichier côté serveur est disponible sous son nom original.Paramètres - + %1 %1 - - Protocol - Protocole + + Status + - + General Généraux - + Network Réseau - + Account Compte + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1480,67 +1446,67 @@ conflits et le fichier côté serveur est disponible sous son nom original. - + SSL Connection Connexion SSL - + Warnings about current SSL Connection: Avertissements sur la connexion SSL actuelle : - + with Certificate %1 avec certificat %1 - - - + + + &lt;not specified&gt; &lt;non spécifié&gt; - - + + Organization: %1 Organisation : %1 - - + + Unit: %1 Unité : %1 - - + + Country: %1 Pays : %1 - + Fingerprint (MD5): <tt>%1</tt> Empreinte (MD5) : <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Empreinte (SHA1) : <tt>%1</tt> - + Effective Date: %1 Émis le : %1 - + Expiry Date: %1 Expire le : %1 - + Issuer: %1 Émetteur : %1 @@ -1558,17 +1524,17 @@ conflits et le fichier côté serveur est disponible sous son nom original.<p>Une nouvelle version du client de synchronisation %1 est disponible.</p><p><b>%2</b> est disponible au téléchargement. La version installée est %3.<p> - + Skip update Ignorer la mise à jour - + Skip this time Ignorer pour cette fois - + Get update Obtenir la mise à jour @@ -1576,169 +1542,116 @@ conflits et le fichier côté serveur est disponible sous son nom original. Mirall::ownCloudGui - + %1 Sync Started %1 Synchronisation démarrée - + Sync started for %n configured sync folder(s). Synchronisation démarrée pour le dossier configuré.Synchronisation démarrée pour les %n dossier(s) configuré(s). - + 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 - + 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 - + %1 (%2, %3) %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) Synchronisation %1 de %2 (%3 de %4) - + Up to date À jour - - Mirall::ownCloudInfo - - - Proxy Refused Connection - Connexion au proxy refusée - - - - The configured proxy has refused the connection. Please check the proxy settings. - Le proxy configuré a refusé la connexion. Vérifiez les paramètres du proxy. - - - - Proxy Closed Connection - Connexion au proxy fermée - - - - The configured proxy has closed the connection. Please check the proxy settings. - Le proxy configuré a fermé la connexion. Vérifiez les paramètres du proxy. - - - - Proxy Not Found - Proxy non trouvé - - - - The configured proxy could not be found. Please check the proxy settings. - Le proxy configuré ne peut être trouvé. Vérifiez les paramètres du proxy. - - - - Proxy Authentication Error - Erreur d'authentification au proxy - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - Le proxy configuré nécessite une authentification mais les informations saisies sont invalides. Vérifiez les paramètres du proxy. - - - - Proxy Connection Timed Out - Délai de connexion au proxy dépassé - - - - The connection to the configured proxy has timed out. - Délai de connexion au proxy configuré dépassé. - - OwncloudAdvancedSetupPage @@ -2004,6 +1917,35 @@ conflits et le fichier côté serveur est disponible sous son nom original.PushButton + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2035,12 +1977,12 @@ conflits et le fichier côté serveur est disponible sous son nom original. main.cpp - + System Tray not available Zone de notification non disponible - + %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 nécessite la présence d'une barre des tâches (system tray). Si vous utilisez XFCE, veuillez suivre <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">ces instructions</a>. Sinon, installez une application mettant en place une barre des tâches, telle que 'trayer' et essayer à nouveau. @@ -2083,7 +2025,7 @@ conflits et le fichier côté serveur est disponible sous son nom original. - + Context Contexte @@ -2109,44 +2051,60 @@ conflits et le fichier côté serveur est disponible sous son nom original. - + deleted supprimé - - + + + Move + + + + + downloading téléchargement - - + + uploading téléversement - + inactive inactif - + starting démarrage - + finished terminé - + delete supprimer + + + move + + + + + moved + + theme diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts index e2b387704..2029864fd 100644 --- a/translations/mirall_gl.ts +++ b/translations/mirall_gl.ts @@ -77,11 +77,6 @@ Modify Account Modificar a conta - - - Sync Status - Estado da sincronización - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause Pausa @@ -103,6 +98,11 @@ Add Folder... Engadir un cartafol... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ 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> - - Checking %1 connection... - Comprobando a conexión %1... - - - + No %1 connection configured. Non se configurou a conexión %1. - + Sync Running Sincronización en proceso - + + No account configured. + + + + The syncing operation is running.<br/>Do you want to terminate it? Estase realizando a sincronización.<br/>Quere interrompela e rematala? - + + %1 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. Conectado a <a href="%1">%2</a>. - - Version: %1 (%2) - Versión: %1 (%2) - - - - unknown problem. - problema descoñecido. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>Non foi posíbel conectar con %1:<tt>%2</tt></p> - - - + Start Iniciar - + Currently Actual - + Completely Completado - + %1 %2 %3 (%4 of %5) %1 %2 %3 (%4 de %5) - + Completely finished. Totalmente terminada. - + %1 of %2, file %3 of %4 %1 de %2, ficheiro %3 de %4 - - %1 of %2 in use. - Usado %1 de %2. + + Connected to <a href="%1">%2</a> as <i>%3</i>. + - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. Actualmente non hai dispoñíbel ningunha información sobre o uso do almacenamento. @@ -357,6 +352,11 @@ CSync unspecified error. Produciuse un erro non especificado de CSync + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -386,150 +386,118 @@ Mirall::ConnectionValidator - - No ownCloud connection configured - Non hai configurada ningunha conexión ao + + No ownCloud account configured + - + The configured server for this client is too old O servidor configurado para este cliente é moi antigo - + Please update to the latest server and restart the client. Actualice ao último servidor e reinicie o cliente. - + Unable to connect to %1 Non é posíbel conectar con %1 - + The provided credentials are not correct As credenciais fornecidas non son correctas - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - Non se atopa a entrada de contrasinais no chaveiro. Volva a facer a configuración. - - Mirall::Folder - + Unable to create csync-context Non é posíbel crear o contexto csync - + Local folder %1 does not exist. O cartafol local %1 non existe. - + %1 should be a directory but is not. %1 debería ser un directorio e non o é. - + %1 is not readable. %1 non é lexíbel. - + File %1: %2 Ficheiro %1: %2 - + + File %1 Ficheiro %1 - - New file available - Novo ficheiro dispoñíbel + + downloaded + - - '%1' has been synced to this machine. - «%1» foi sincronizado con esta máquina. + + removed + - - New files available - Novos ficheiros dispoñíbeis - - - - '%1' and %n other file(s) have been synced to this machine. - «%1» e outro %n ficheiro foron sincronizados con esta máquina.«%1» e outros %n ficheiros foron sincronizados con esta máquina. + + updated + - - File removed - Ficheiro retirado + + renamed + - - '%1' has been removed. - «%1» foi retirado. + + '%1' has been %2. + - - Files removed - Ficheiros retirados - - - - '%1' and %n other file(s) have been removed. - «%1» e outro %n ficheiro foron retirados.«%1» e outros %n ficheiros foron retirados. + + Files %1 + - - File updated - Ficheiro actualizado + + '%1' and %2 other files have been %3. + - - '%1' has been updated. - «%1» foi actualizado. - - - - Files updated - Ficheiros actualizados - - - - '%1' and %n other file(s) have been updated. - «%1» e outro %n ficheiro foron actualizados.«%1» e outros %n ficheiros foron actualizados. - - - + Error Erro - + The CSync thread terminated. Rematou o fío en CSync. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". Esta sincronización retirará todos os ficheiros do cartafol local de sincronización «%1». Se vostede, ou o administrador, restabeleceu a súa conta no servidor, escolla «Manter os ficheiros». Se quere que os seus datos sexan eliminados, escolla «Retirar todos os ficheiros». - + 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? @@ -538,17 +506,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 @@ -556,62 +524,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 diario de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningún aplicativo. - + 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. - + %1 (Sync is paused) %1 (sincronización en pausa) @@ -650,8 +618,8 @@ fiábel. Revise a documentación para posíbeis arranxos. Mirall::FolderWizard - - + + Add Folder Engadir un cartafol @@ -659,42 +627,42 @@ fiábel. Revise a documentación para posíbeis arranxos. Mirall::FolderWizardSourcePage - + No local folder selected! Non seleccionou ningún cartafol local! - + 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.<br/>Please pick another one! A ruta local %1 xa é un cartafol de subida.<br/>Escolle outro! - + An already configured folder is contained in the current entry. Xa hai un cartafol configurado que xa está dentro da entrada actual. - + An already configured folder contains the currently entered directory. Xa hai un cartafol configurado que contén o directorio que foi indicado. - + 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. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>O alcume <i>%1</> xa se está usando. Escolla outro alcume. - + Select the source folder Escolla o cartafol de orixe @@ -702,42 +670,42 @@ fiábel. Revise a documentación para posíbeis arranxos. Mirall::FolderWizardTargetPage - + 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.<br/>Please check manually. Produciuse un fallo ao crear o cartafol en %1.<br/>Compróbeo manualmente. - + Choose this to sync the entire account Escolla isto para sincronizar toda a conta - + This directory is already being synced. Este directorio 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>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. Se sincroniza o cartafol,<b>non</b> poderá configurar a sincronización de ningún outro directorio. @@ -751,8 +719,8 @@ fiábel. Revise a documentación para posíbeis arranxos. - General - Xeral + General Setttings + @@ -794,7 +762,7 @@ fiábel. Revise a documentación para posíbeis arranxos. Retirar - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. @@ -803,29 +771,29 @@ Checked items will also be deleted if they prevent a directory from being remove Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Isto é útil para os metadatos. - + Could not open file Non foi posíbel abrir o ficheiro - + Cannot write changes to '%1'. Non é posíbel escribir os cambios en «%1». - - + + Add Ignore Pattern Engadir o patrón a ignorar - - + + Add a new ignore pattern: Engadir un novo patrón a ignorar: - + This entry is provided by the system at '%1' and cannot be modified in this view. Esta entrada é fornecida polo sistema en «%1» e non pode ser modificado nesta vista. @@ -833,52 +801,52 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is Mirall::LogBrowser - + Log Output Rexistro da saída - + &Search: &Buscar: - + &Find &Atopar - + Clear Limpar - + Clear the log display. Limpar a saída de rexistro. - + S&ave &Gardar - + Save the log file to a file on disk for debugging. Gardar o ficheiro de rexistro a un ficheiro no disco para depuración. - + Error Erro - + Save log file Gardar o ficheiro de rexistro - + Could not write to log file Non foi posíbel escribir no ficheiro de rexistro @@ -1000,47 +968,47 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is Mirall::OwncloudAdvancedSetupPage - + Connect to %1 Conectado a %1 - + Setup local folder options Estabelecer as opcións do cartafol local - + Connect... Conectar... - + Your entire account will be synced to the local folder '%1'. Toda a súa conta vai seren sincronizada co cartafol local «%1». - + %1 folder '%2' is synced to local folder '%3' O cartafol %1 «%2» está sincronizado co cartafol local «%3» - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> <p><small><strong>Aviso:</strong> Actualmente ten varios cartafoles configurados. Se continúa cos axustes actuais, desbotaranse as configuracións dos cartafoles e crearase un único cartafol raíz de sincronización!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> <p><small><strong>Aviso:</strong> O directorio local non está baleiro. Escolla unha resolución!</small></p> - + Local Sync Folder Sincronización do cartafol local - + Update advanced setup Actualizar a configuración avanzada @@ -1048,44 +1016,21 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is Mirall::OwncloudHttpCredsPage - + Connect to %1 Conectar con %1 - + Enter user credentials Escriba as credenciais do usuario - + Update user credentials Actualice as credenciais de usuario - - Mirall::OwncloudPropagator - - - Aborted - Interrompido - - - - Could not remove directory %1 - Non foi posíbel retirar o directorio %1 - - - - 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. - - Mirall::OwncloudSetupPage @@ -1109,7 +1054,7 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is Este URL NON é seguro. Non debe utilizalo. - + Update %1 server Actualizar o servidor %1 @@ -1117,129 +1062,126 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is Mirall::OwncloudSetupWizard - + Folder rename failed Non foi posíbel renomear o cartafol - + 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 ou facer copias de seguranza do cartafol ou dun ficheiro que estea aberto noutro programa. Peche o cartafol ou o ficheiro e prema en tentar de novo ou cancele o proceso. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - Tentando conectar con %1 en %2 para determinar o tipo de autenticación... - - - + <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/> - - Failed to connect to %1:<br/>%2 - Non foi posíbel conectar con %1:<br/>%2 - - - + 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 - - The remote folder could not be accessed! - O cartafol remoto non é accesíbel! + + + Failed to connect to %1 at %2:<br/>%3 + - + + No remote folder specified! + + + + 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. @@ -1247,7 +1189,7 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is Mirall::OwncloudWizard - + %1 Connection Wizard Asistente de conexión %1 @@ -1255,27 +1197,27 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is Mirall::OwncloudWizardResultPage - + Open %1 Abrir %1 - + Open Local Folder Abrir o cartafol local - + Everything set up! Todo axustado! - + Your entire account is synced to the local folder <i>%1</i> Toda a súa conta está sincronizada co cartafol local <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> O cartafol %1 <i>%1</i> está sincronizado co cartafol local <i>%2</i> @@ -1289,8 +1231,8 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is - Detailed Sync Protocol - Protocolo de sincronización detallado + Detailed Sync Status + @@ -1420,8 +1362,8 @@ o nome orixinal - The sync protocol has been copied to the clipboard. - O protocolo de sincronización foi copiado no portapapeis. + The sync status has been copied to the clipboard. + @@ -1442,31 +1384,55 @@ o nome orixinal Axustes - + %1 %1 - - Protocol - Protocolo + + Status + - + General Xeral - + Network Rede - + Account Conta + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1481,67 +1447,67 @@ o nome orixinal - + SSL Connection Conexión SSL - + Warnings about current SSL Connection: Avisos sobre da conexión SSL actual: - + with Certificate %1 co certificado %1 - - - + + + &lt;not specified&gt; &lt;sen especificar&gt; - - + + Organization: %1 Organización: %1 - - + + Unit: %1 Unidade: %1 - - + + Country: %1 País: %1 - + Fingerprint (MD5): <tt>%1</tt> Pegada dixital (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Pegada dixital (SHA1): <tt>%1</tt> - + Effective Date: %1 Data de aplicación: %1 - + Expiry Date: %1 Data de caducidade: %1 - + Issuer: %1 Emisor: %1 @@ -1559,17 +1525,17 @@ o nome orixinal <p>Hai dispoñíbel unha nova versión do cliente %1.</p><p>Pode descargar a versión <b>%2</b>. A versión instalada é a %3.<p> - + Skip update Omitir a actualización - + Skip this time Omitir polo de agora - + Get update Obter a actualización @@ -1577,169 +1543,116 @@ o nome orixinal Mirall::ownCloudGui - + %1 Sync Started Comezou a sincronización %1 - + Sync started for %n configured sync folder(s). Comezou a sincronización para %n cartafol coa sincronización configurada.Comezou a sincronización para %n cartafoles con sincronización configurada. - + 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 - + Quota n/a Cota n/d - + %1% of %2 in use Usado %1% de %2 - + No items synced recently Non hai elementos sincronizados recentemente - + %1 (%2, %3) %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) Sincronizando %1 de %2 (%3 de %4) - + Up to date Actualizado - - Mirall::ownCloudInfo - - - Proxy Refused Connection - O proxy rexeitou a conexión - - - - The configured proxy has refused the connection. Please check the proxy settings. - O proxy configurado rexeitou a conexión. Comprobe os axustes do proxy. - - - - Proxy Closed Connection - O proxy pechou a conexión - - - - The configured proxy has closed the connection. Please check the proxy settings. - O proxy configurado pechou a conexión. Comprobe os axustes do proxy. - - - - Proxy Not Found - Non se atopa o proxy - - - - The configured proxy could not be found. Please check the proxy settings. - Non se atopa o proxy configurado. Comprobe os axustes do proxy. - - - - Proxy Authentication Error - Produciuse un erro de autenticación do proxy - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - O proxy configurado require autenticación, mais as credenciais son incorrectas. Comprobe os axustes do proxy. - - - - Proxy Connection Timed Out - Esgotouse o tempo de conexión co proxy - - - - The connection to the configured proxy has timed out. - Esgotouse o tempo de conexión co proxy configurado. - - OwncloudAdvancedSetupPage @@ -2005,6 +1918,35 @@ o nome orixinal PremaOBotón + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2036,12 +1978,12 @@ o nome orixinal main.cpp - + System Tray not available Área de notificación non dispoñíbel - + %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. @@ -2084,7 +2026,7 @@ o nome orixinal - + Context Contexto @@ -2110,44 +2052,60 @@ o nome orixinal - + deleted eliminado - - + + + Move + + + + + downloading descargando - - + + uploading enviando - + inactive inactivo - + starting iniciando - + finished rematado - + delete eliminar + + + move + + + + + moved + + theme diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts index 47bcbdc40..4ddf982b4 100644 --- a/translations/mirall_hu.ts +++ b/translations/mirall_hu.ts @@ -77,11 +77,6 @@ Modify Account Fiók módosítása - - - Sync Status - Szinkronizálási állapot - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause Szünet @@ -103,6 +98,11 @@ Add Folder... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ 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> - - Checking %1 connection... - - - - + No %1 connection configured. - + Sync Running Szinkronizálás fut - + + No account configured. + + + + The syncing operation is running.<br/>Do you want to terminate it? - + + %1 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. - - Version: %1 (%2) - - - - - unknown problem. - ismeretlen probléma. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - - - - + Start - + Currently - + Completely - + %1 %2 %3 (%4 of %5) - + Completely finished. Teljesen befejezve. - + %1 of %2, file %3 of %4 - - %1 of %2 in use. + + Connected to <a href="%1">%2</a> as <i>%3</i>. - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. @@ -357,6 +352,11 @@ CSync unspecified error. CSync ismeretlen hiba. + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -386,166 +386,134 @@ Mirall::ConnectionValidator - - No ownCloud connection configured + + No ownCloud account configured - + The configured server for this client is too old - + Please update to the latest server and restart the client. - + Unable to connect to %1 - + The provided credentials are not correct - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - Nem található jelszó a jelszótárolóban. Állítsa be újra. - - Mirall::Folder - + Unable to create csync-context - + Local folder %1 does not exist. %1 helyi mappa nem létezik. - + %1 should be a directory but is not. %1 könyvtár kell legyen, de nem az. - + %1 is not readable. %1 nem olvasható. - + File %1: %2 - + + File %1 - - New file available + + downloaded - - '%1' has been synced to this machine. + + removed - - New files available - - - - - '%1' and %n other file(s) have been synced to this machine. - - - - - File removed + + updated - - '%1' has been removed. + + renamed - - Files removed - - - - - '%1' and %n other file(s) have been removed. - - - - - File updated + + '%1' has been %2. - - '%1' has been updated. + + Files %1 - - Files updated + + '%1' and %2 other files have been %3. - - - '%1' and %n other file(s) have been updated. - - - + Error Hiba - + The CSync thread terminated. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". - + 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 @@ -553,62 +521,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. - + 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. - + %1 (Sync is paused) @@ -645,8 +613,8 @@ documentation for possible fixes. Mirall::FolderWizard - - + + Add Folder Mappa hozzáadása @@ -654,42 +622,42 @@ documentation for possible fixes. Mirall::FolderWizardSourcePage - + No local folder selected! Nincs helyi mappa kiválasztva! - + You have no permission to write to the selected folder! - + The local path %1 is already an upload folder.<br/>Please pick another one! A %1 útvonal egy már létező feltöltési mappa.<br/>Válasszon másikat! - + An already configured folder is contained in the current entry. Egy már beállított mappa szerepel a jelen bejegyzésben. - + An already configured folder contains the currently entered directory. Egy már beállított mappa megegyezik a most beírttal. - + The alias can not be empty. Please provide a descriptive alias word. Az álnév nem lehet üres. Adjon meg egy leíró álnevet. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>A(z) <i>%1</i> álnév használva van. Adjon meg egy másikat. - + Select the source folder Forrás könyvtár kiválasztása @@ -697,42 +665,42 @@ documentation for possible fixes. Mirall::FolderWizardTargetPage - + 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.<br/>Please check manually. Nem sikerült létrehozni a mappát: %1.<br/>Kérem ellenőrizze kézileg. - + Choose this to sync the entire account - + This directory is already being synced. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. @@ -746,8 +714,8 @@ documentation for possible fixes. - General - Általános + General Setttings + @@ -789,36 +757,36 @@ documentation for possible fixes. Eltávolítás - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. - + Could not open file Nem sikerült a fájl megnyitása - + Cannot write changes to '%1'. - - - - Add Ignore Pattern - - + Add Ignore Pattern + + + + + Add a new ignore pattern: - + This entry is provided by the system at '%1' and cannot be modified in this view. @@ -826,52 +794,52 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::LogBrowser - + Log Output Kimenet naplózása - + &Search: &Keresés: - + &Find &Keres - + Clear Törlés - + Clear the log display. Törölje a naplózás kimenetét. - + S&ave M&entés - + Save the log file to a file on disk for debugging. A naplófájl mentése a helyi gépre. - + Error Hiba - + Save log file Naplófájl mentése - + Could not write to log file A naplófájl írása sikertelen @@ -993,47 +961,47 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudAdvancedSetupPage - + Connect to %1 Kapcsolódás ehhez: %1 - + Setup local folder options - + Connect... - + Your entire account will be synced to the local folder '%1'. - + %1 folder '%2' is synced to local folder '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> - + Local Sync Folder - + Update advanced setup @@ -1041,44 +1009,21 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudHttpCredsPage - + Connect to %1 Kapcsolódás ehhez: %1 - + Enter user credentials - + Update user credentials - - Mirall::OwncloudPropagator - - - Aborted - - - - - Could not remove directory %1 - - - - - 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. - - - Mirall::OwncloudSetupPage @@ -1102,7 +1047,7 @@ Checked items will also be deleted if they prevent a directory from being remove Ez az url NEM biztonságos. Ha lehet ne használja. - + Update %1 server @@ -1110,129 +1055,126 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudSetupWizard - + Folder rename failed A mappa átnevezése nem sikerült - + 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. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - - - - + <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/> - - Failed to connect to %1:<br/>%2 - Kapcsolódási hiba %1:<br/>%2 - - - + Error: Wrong credentials. - + 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 - - The remote folder could not be accessed! + + + 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. @@ -1240,7 +1182,7 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizard - + %1 Connection Wizard %1 kapcsolódási varázsló @@ -1248,27 +1190,27 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizardResultPage - + Open %1 %1 megnyitása - + Open Local Folder Helyi mappa megnyitása - + Everything set up! - + Your entire account is synced to the local folder <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> @@ -1282,8 +1224,8 @@ Checked items will also be deleted if they prevent a directory from being remove - Detailed Sync Protocol - Szinkronizációs protokoll bővebben + Detailed Sync Status + @@ -1405,8 +1347,8 @@ name - The sync protocol has been copied to the clipboard. - A sync protokoll bemásolva a vágólapra. + The sync status has been copied to the clipboard. + @@ -1427,31 +1369,55 @@ name Beállítások - + %1 - - Protocol + + Status - + General Általános - + Network Hálózat - + Account Fiók + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1466,67 +1432,67 @@ name - + SSL Connection SSL-kapcsolat - + Warnings about current SSL Connection: SSL kapcsolat figyelmeztetés: - + with Certificate %1 %1 tanúsítvánnyal - - - + + + &lt;not specified&gt; &lt;nincs megadva&gt; - - + + Organization: %1 Szervezet: %1 - - + + Unit: %1 Egység: %1 - - + + Country: %1 Ország: %1 - + Fingerprint (MD5): <tt>%1</tt> Ellenőrzőkód (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Ellenőrzőkód (SHA1): <tt>%1</tt> - + Effective Date: %1 Tényleges dátum: %1 - + Expiry Date: %1 Lejárati dátum: %1 - + Issuer: %1 Kibocsátó: %1 @@ -1544,17 +1510,17 @@ name - + Skip update Frissítés kihagyása - + Skip this time Kihagyás ezalkalommal - + Get update Frissítés beszerzése @@ -1562,169 +1528,116 @@ name Mirall::ownCloudGui - + %1 Sync Started %1 szinkronizálás elindult - + Sync started for %n configured sync folder(s). - + Folder %1: %2 Mappa %1: %2 - + No sync folders configured. Nincsenek megadva szinkronizálandó mappák. - + None. - + 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 - + Quota n/a Kvóta n/a - + %1% of %2 in use - + No items synced recently - + %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) - + Up to date Frissítve - - Mirall::ownCloudInfo - - - Proxy Refused Connection - A proxy - - - - The configured proxy has refused the connection. Please check the proxy settings. - - - - - Proxy Closed Connection - - - - - The configured proxy has closed the connection. Please check the proxy settings. - - - - - Proxy Not Found - A proxy nem található - - - - The configured proxy could not be found. Please check the proxy settings. - - - - - Proxy Authentication Error - Proxy authentikációs hiba - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - - - - - Proxy Connection Timed Out - - - - - The connection to the configured proxy has timed out. - - - OwncloudAdvancedSetupPage @@ -1990,6 +1903,35 @@ name + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2021,12 +1963,12 @@ name main.cpp - + System Tray not available - + %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. @@ -2069,7 +2011,7 @@ name - + Context @@ -2095,44 +2037,60 @@ name - + deleted törölve - - + + + Move + + + + + downloading - - + + uploading - + inactive - + starting - + finished - + delete töröl + + + move + + + + + moved + + theme diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts index da8c81d00..6dedd4d22 100644 --- a/translations/mirall_it.ts +++ b/translations/mirall_it.ts @@ -77,11 +77,6 @@ Modify Account Modifica account - - - Sync Status - Stato di sincronizzazione - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause Pausa @@ -103,6 +98,11 @@ Add Folder... Aggiungi cartella... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ 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> - - Checking %1 connection... - Controllo della connessione di %1... - - - + No %1 connection configured. Nessuna connessione di %1 configurata. - + Sync Running La sincronizzazione è in corso - + + No account configured. + + + + The syncing operation is running.<br/>Do you want to terminate it? L'operazione di sincronizzazione è in corso.<br/>Vuoi terminarla? - + + %1 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. Connesso a <a href="%1">%2</a>. - - Version: %1 (%2) - Versione: %1 (%2) - - - - unknown problem. - problema sconosciuto. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>Connessione a %1 non riuscita: <tt>%2</tt></p> - - - + Start Avvia - + Currently Attualmente - + Completely Completamente - + %1 %2 %3 (%4 of %5) %1 %2 %3 (%4 di %5) - + Completely finished. Terminata completamente. - + %1 of %2, file %3 of %4 %1 di %2, file %3 di %4 - - %1 of %2 in use. - %1 di %2 utilizzati. + + Connected to <a href="%1">%2</a> as <i>%3</i>. + - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. Non ci sono informazioni disponibili sull'utilizzo dello spazio di archiviazione. @@ -357,6 +352,11 @@ CSync unspecified error. Errore non specificato di CSync. + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -386,150 +386,118 @@ Mirall::ConnectionValidator - - No ownCloud connection configured - Nessuna connessione a ownCloud configurata + + No ownCloud account configured + - + The configured server for this client is too old Il server configurato per questo client è troppo datato - + Please update to the latest server and restart the client. Aggiorna all'ultima versione del server e riavvia il client. - + Unable to connect to %1 Impossibile connettersi a %1 - + The provided credentials are not correct Le credenziali fornite non sono corrette - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - Nessuna password trovata nel portachiavi. Riconfigura. - - Mirall::Folder - + Unable to create csync-context Impossibile creare il contesto csync - + Local folder %1 does not exist. La cartella locale %1 non esiste. - + %1 should be a directory but is not. %1 dovrebbe essere una cartella. - + %1 is not readable. %1 non è leggibile. - + File %1: %2 File %1: %2 - + + File %1 File %1 - - New file available - Nuovo file disponibile + + downloaded + - - '%1' has been synced to this machine. - '%1' è stato sincronizzato con questa macchina. + + removed + - - New files available - Nuovi file disponibili - - - - '%1' and %n other file(s) have been synced to this machine. - '%1' e %n altro file sono stati sincronizzati con questa macchina.'%1' e %n altri file sono stati sincronizzati con questa macchina. + + updated + - - File removed - File rimosso + + renamed + - - '%1' has been removed. - '%1' è stato rimosso. + + '%1' has been %2. + - - Files removed - File rimossi - - - - '%1' and %n other file(s) have been removed. - '%1' e %n altro file sono stati rimossi.'%1' e %n altri file sono stati rimossi. + + Files %1 + - - File updated - File aggiornato + + '%1' and %2 other files have been %3. + - - '%1' has been updated. - '%1' è stato aggiornato. - - - - Files updated - File aggiornati - - - - '%1' and %n other file(s) have been updated. - '%1' e %n altro file sono stati aggiornati.'%1' e %n altri file sono stati aggiornati. - - - + Error Errore - + The CSync thread terminated. Il thread di CSync è stato terminato. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". Questa sincronizzazione rimuoverà tutti i file nella cartella di sincronizzazione locale '%1'. Se tu o il tuo amministratore avete ripristinato il tuo account sul server, scegli "Mantieni i file". Se desideri che i dati siano rimossi, scegli "Rimuovi tutti i file". - + 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? @@ -538,17 +506,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 @@ -556,62 +524,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 diario 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. - + %1 (Sync is paused) %1 (La sincronizzazione è sospesa) @@ -650,8 +618,8 @@ documentazione per trovare possibili soluzioni. Mirall::FolderWizard - - + + Add Folder Aggiungi cartella @@ -659,42 +627,42 @@ documentazione per trovare possibili soluzioni. Mirall::FolderWizardSourcePage - + No local folder selected! Nessuna cartella locale selezionata! - + 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.<br/>Please pick another one! Il percorso locale %1 è già una cartella di caricamento. <br/>Selezionane un altro! - + An already configured folder is contained in the current entry. Una cartella già configurata è contenuta nella voce corrente. - + An already configured folder contains the currently entered directory. Una cartella già configurata contiene la cartella appena inserita. - + The alias can not be empty. Please provide a descriptive alias word. L'alias non può essere vuoto. Fornisci un alias significativo. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>L'alias <i>%1</i> è già in uso. Indica un altro alias. - + Select the source folder Seleziona la cartella di origine @@ -702,42 +670,42 @@ documentazione per trovare possibili soluzioni. Mirall::FolderWizardTargetPage - + 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.<br/>Please check manually. Creazione della cartella su %1 non riuscita.<br/>Controlla manualmente. - + Choose this to sync the entire account Selezionala per sincronizzazione l'intero account - + This directory 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>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. Se sincronizzi la cartella radice, puoi <b>non</b> configurare un'altra cartella di sincronizzazione. @@ -751,8 +719,8 @@ documentazione per trovare possibili soluzioni. - General - Generale + General Setttings + @@ -794,7 +762,7 @@ documentazione per trovare possibili soluzioni. Rimuovi - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. @@ -803,29 +771,29 @@ Checked items will also be deleted if they prevent a directory from being remove Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di una cartella. Utile per i metadati. - + Could not open file Impossibile aprire il file - + Cannot write changes to '%1'. Impossibile scrivere le modifiche in '%1'. - - + + Add Ignore Pattern Aggiungi modello Ignora - - + + Add a new ignore pattern: Aggiungi un nuovo modello di esclusione: - + This entry is provided by the system at '%1' and cannot be modified in this view. Questa voce è fornita dal sistema in '%1' e non può essere modificata in questa vista. @@ -833,52 +801,52 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un Mirall::LogBrowser - + Log Output Risultato log - + &Search: &Cerca: - + &Find Tro&va - + Clear Svuota - + Clear the log display. Svuota la visualizzazione del log. - + S&ave S&alva - + Save the log file to a file on disk for debugging. Salva un file di log sul disco per il debug. - + Error Errore - + Save log file Salva file di log - + Could not write to log file Impossibile scrivere il file di log @@ -1000,47 +968,47 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un Mirall::OwncloudAdvancedSetupPage - + Connect to %1 Connetti a %1 - + Setup local folder options Configura le opzioni della cartella locale - + Connect... Connetti... - + Your entire account will be synced to the local folder '%1'. L'intero account sarà sincronizzato con la cartella locale '%1'. - + %1 folder '%2' is synced to local folder '%3' La cartella '%2' di %1 è sincronizzata con la cartella locale '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> <p><small><strong>Avviso:</strong> attualmente hai configurato più cartelle. Se procedi con le impostazioni attuali, le configurazioni delle cartelle saranno scartate, mentre sarà creata un'unica cartella radice di sincronizzazione.</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> <p><small><strong>Avviso:</strong> la cartella locale non è vuota. Scegli una soluzione.</small></p> - + Local Sync Folder Cartella locale di sincronizzazione - + Update advanced setup Aggiorna la configurazione avanzata @@ -1048,44 +1016,21 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un Mirall::OwncloudHttpCredsPage - + Connect to %1 Connetti a %1 - + Enter user credentials Digita le credenziali dell'utente - + Update user credentials Aggiorna le credenziali dell'utente - - Mirall::OwncloudPropagator - - - Aborted - Interrotto - - - - Could not remove directory %1 - Impossibile rimuovere la cartella %1 - - - - This folder must not be renamed. It is renamed back to its original name. - Questa cartella non può essere rinominato. 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. - - Mirall::OwncloudSetupPage @@ -1109,7 +1054,7 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un Questo URL non è sicuro. Non dovresti utilizzarlo. - + Update %1 server Aggiorna il server %1 @@ -1117,129 +1062,126 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un Mirall::OwncloudSetupWizard - + Folder rename failed Rinomina cartella non riuscita - + 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 è aperto in un altro programma. Chiudi la cartella o il file e premi Riprova o annulla la configurazione. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - Tentativo di connessione a %1 su %2 per determinare il tipo di autenticazione in corso... - - - + <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/> - - Failed to connect to %1:<br/>%2 - Connessione a %1 non riuscita:<br/>%2 - - - + 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 - - The remote folder could not be accessed! - La cartella remota non è accessibile! + + + Failed to connect to %1 at %2:<br/>%3 + - + + No remote folder specified! + + + + 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. @@ -1247,7 +1189,7 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un Mirall::OwncloudWizard - + %1 Connection Wizard Procedura guidata di connessione di %1 @@ -1255,27 +1197,27 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un Mirall::OwncloudWizardResultPage - + Open %1 Apri %1 - + Open Local Folder Apri cartella locale - + Everything set up! Configurazione completata! - + Your entire account is synced to the local folder <i>%1</i> L'intero account è sincronizzato con la cartella locale <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> La cartella <i>%1</i> è sincronizzata con la cartella locale <i>%2</i> @@ -1289,8 +1231,8 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un - Detailed Sync Protocol - Protocollo di sincronizzazione dettagliato + Detailed Sync Status + @@ -1419,8 +1361,8 @@ conflitto, mentre il file sul server è disponibile con il nome originale - The sync protocol has been copied to the clipboard. - Il protocollo di sincronizzazione è stato copiato negli appunti. + The sync status has been copied to the clipboard. + @@ -1441,31 +1383,55 @@ conflitto, mentre il file sul server è disponibile con il nome originaleImpostazioni - + %1 %1 - - Protocol - Protocollo + + Status + - + General Generale - + Network Rete - + Account Account + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1480,67 +1446,67 @@ conflitto, mentre il file sul server è disponibile con il nome originale - + SSL Connection Connessione SSL - + Warnings about current SSL Connection: Errori sulla connessione SSL corrente: - + with Certificate %1 con certificato %1 - - - + + + &lt;not specified&gt; &lt;non specificato&gt; - - + + Organization: %1 Organizzazione: %1 - - + + Unit: %1 Reparto: %1 - - + + Country: %1 Nazione: %1 - + Fingerprint (MD5): <tt>%1</tt> Impronta digitale (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Impronta digitale (SHA1): <tt>%1</tt> - + Effective Date: %1 Data effettiva: %1 - + Expiry Date: %1 Data di scadenza: %1 - + Issuer: %1 Emittente: %1 @@ -1558,17 +1524,17 @@ conflitto, mentre il file sul server è disponibile con il nome originale<p>Una nuova versione del client %1 è disponibile.</p><p><b>%2</b> è disponibile per lo scaricamento. La versione installata è %3.<p> - + Skip update Salta l'aggiornamento - + Skip this time Salta questa volta - + Get update Ottieni l'aggiornamento @@ -1576,169 +1542,116 @@ conflitto, mentre il file sul server è disponibile con il nome originale Mirall::ownCloudGui - + %1 Sync Started %1 Sincronizzazione iniziata - + Sync started for %n configured sync folder(s). Sincronizzazione avviata per %n cartella configurata.Sincronizzazione avviata per %n cartelle configurate. - + 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 - + Quota n/a Quota n/d - + %1% of %2 in use %1% di %2 utilizzati - + No items synced recently Nessun elemento sincronizzato di recente - + %1 (%2, %3) %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) Sincronizzazione di %1 di %2 (%3 di %4) - + Up to date Aggiornato - - Mirall::ownCloudInfo - - - Proxy Refused Connection - Il proxy ha rifiutato la connessione - - - - The configured proxy has refused the connection. Please check the proxy settings. - Il proxy configurato ha rifiutato la connessione. controlla le impostazioni del proxy. - - - - Proxy Closed Connection - Il proxy ha terminato la connessione - - - - The configured proxy has closed the connection. Please check the proxy settings. - Il proxy configurato ha terminato la connessione. Controlla le impostazioni del proxy. - - - - Proxy Not Found - Proxy non trovato - - - - The configured proxy could not be found. Please check the proxy settings. - Il proxy configurato non è stato trovato. Controlla le impostazioni del proxy. - - - - Proxy Authentication Error - Errore di autenticazione al proxy - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - Il proxy configurato richiede l'accesso, ma le credenziali non sono valide. Controlla le impostazioni del proxy. - - - - Proxy Connection Timed Out - La connessione al proxy è scaduta - - - - The connection to the configured proxy has timed out. - La connessione al proxy configurato è scaduta. - - OwncloudAdvancedSetupPage @@ -2004,6 +1917,35 @@ conflitto, mentre il file sul server è disponibile con il nome originalePremiPulsante + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2035,12 +1977,12 @@ conflitto, mentre il file sul server è disponibile con il nome originale main.cpp - + System Tray not available Il vassoio di sistema non è disponibile - + %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 richiede un vassoio di sistema. Se stai usando XFCE, segui <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">queste istruzioni</a>. Altrimenti, installa un'applicazione vassoio di sistema come 'trayer' e riprova. @@ -2083,7 +2025,7 @@ conflitto, mentre il file sul server è disponibile con il nome originale - + Context Contesto @@ -2109,44 +2051,60 @@ conflitto, mentre il file sul server è disponibile con il nome originale - + deleted eliminati - - + + + Move + + + + + downloading scaricamento in corso - - + + uploading caricamento in corso - + inactive inattivo - + starting avvio in corso - + finished completato - + delete elimina + + + move + + + + + moved + + theme diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts index 55ba14bbb..9a78a40b7 100644 --- a/translations/mirall_ja.ts +++ b/translations/mirall_ja.ts @@ -77,11 +77,6 @@ Modify Account アカウント修正 - - - Sync Status - 同期状態 - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause 一時停止 @@ -103,6 +98,11 @@ Add Folder... フォルダを追加… + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ ストレージ利用状況 - + 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>この機能は保守目的のためだけにデザインされています。ファイルは削除されませんが、完了するまでにデータ通信が明らかに増大し、数分、あるいはフォルダのサイズによっては数時間かかります。このオプションは管理者に指示された場合にのみ使用して下さい。 - - Checking %1 connection... - %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 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. <a href="%1">%2</a> へ接続しました。 - - Version: %1 (%2) - バージョン: %1 (%2) - - - - unknown problem. - 未知の問題。 - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>%1 への接続に失敗: <tt>%2</tt></p> - - - + Start 開始 - + Currently 現在 - + Completely 完全に - + %1 %2 %3 (%4 of %5) %1 %2 %3 (%4 of %5) - + Completely finished. 完全に終了しました。 - + %1 of %2, file %3 of %4 %1 of %2, ファイル数 %3 of %4 - - %1 of %2 in use. - %2 のうち %1 を使用中 + + Connected to <a href="%1">%2</a> as <i>%3</i>. + - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. 現在、利用できるストレージ使用情報はありません。 @@ -357,6 +352,11 @@ CSync unspecified error. CSyncの未指定のエラーです。 + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -386,150 +386,118 @@ Mirall::ConnectionValidator - - No ownCloud connection configured - ownCloud接続が設定されていません。 + + No ownCloud account configured + - + The configured server for this client is too old このクライアントのサーバー設定は古すぎます。 - + Please update to the latest server and restart the client. サーバーを最新に更新して、クライアントを再起動してください。 - + Unable to connect to %1 %1 に接続できません - + The provided credentials are not correct 与えられた認証情報が正しくありません。 - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - キーチェインにパスワードエントリが見つかりませんでした。再構築してください。 - - Mirall::Folder - + Unable to create csync-context csync-context を作成出来ません - + Local folder %1 does not exist. ローカルフォルダ %1 は存在しません。 - + %1 should be a directory but is not. %1 はディレクトリのはずですが、そうではないようです。 - + %1 is not readable. %1 は読み込み可能ではありません。 - + File %1: %2 ファイル %1: %2 - + + File %1 ファイル %1 - - New file available - 新しいファイルがあります + + downloaded + - - '%1' has been synced to this machine. - '%1' はこのマシンに同期しています。 + + removed + - - New files available - 新しいファイルがあります - - - - '%1' and %n other file(s) have been synced to this machine. - '%1' とその他 %n 個のファイルがこのマシンに同期しています。 + + updated + - - File removed - ファイルは削除済みです + + renamed + - - '%1' has been removed. - '%1' は削除済みです。 + + '%1' has been %2. + - - Files removed - ファイルは削除済みです - - - - '%1' and %n other file(s) have been removed. - '%1' とその他 %n 個のファイルは削除済みです。 + + Files %1 + - - File updated - ファイルはアップロード済みです + + '%1' and %2 other files have been %3. + - - '%1' has been updated. - '%1' は更新されています - - - - Files updated - ファイルは更新されています - - - - '%1' and %n other file(s) have been updated. - '%1' とその他 %n 個のファイルは更新済みです。 - - - + Error エラー - + The CSync thread terminated. CSyncのスレッドが終了しました。 - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". この同期により、ローカルの同期フォルダ '%1'にある全ファイルが削除されます。 あなた、またはあなたの管理者がサーバー上のあなたのアカウントをリセットした場合、「ファイルを残す」を選んでください。データを削除したい場合は、「すべてのファイルを削除」を選んでください。 - + 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? @@ -538,17 +506,17 @@ Are you sure you want to perform this operation? 本当にこの操作を実行しますか？ - + Remove All Files? すべてのファイルを削除しますか？ - + Remove all files すべてのファイルを削除 - + Keep files ファイルを残す @@ -556,62 +524,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. 同期を実行中です。 - + Server is currently not available. サーバは現在利用できません。 - + Last Sync was successful. 最後の同期は成功しました。 - + Last Sync was successful, but with warnings on individual files. 最新の同期は成功しました。しかし、いくつかのファイルで問題がありました。 - + Setup Error. 設定エラー。 - + User Abort. - + ユーザによる中止。 - + %1 (Sync is paused) %1 (同期を一時停止) @@ -650,8 +618,8 @@ documentation for possible fixes. Mirall::FolderWizard - - + + Add Folder フォルダを追加 @@ -659,42 +627,42 @@ documentation for possible fixes. Mirall::FolderWizardSourcePage - + No local folder selected! ローカルフォルダ未選択 - + You have no permission to write to the selected folder! 選択されたフォルダに書き込み権限がありません - + The local path %1 is already an upload folder.<br/>Please pick another one! ローカルパス %1 はすでにアップロードフォルダになっています。<br/>他を選択してください！ - + An already configured folder is contained in the current entry. すでに設定済みのフォルダは現在のエントリー内に含まれています。 - + An already configured folder contains the currently entered directory. すでに設定済みのフォルダは、現在入力されたディレクトリを含んでいます。 - + The alias can not be empty. Please provide a descriptive alias word. エイリアスは空白にすることはできません。適切な単語をエイリアスとして提供してください。 - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>エイリアス <i>%1</i> はすでに使用中です。他のエイリアスを選択してください。 - + Select the source folder ソースフォルダを選択 @@ -702,43 +670,43 @@ documentation for possible fixes. Mirall::FolderWizardTargetPage - + Add Remote Folder リモートフォルダを追加 - + Enter the name of the new folder: 新しいフォルダの名前を入力: - + Folder was successfully created on %1. %1 にフォルダーが作成されました。 - + Failed to create the folder on %1.<br/>Please check manually. %1 へのフォルダ作成に失敗しました。<br/>手動で確認して下さい。 - + Choose this to sync the entire account アカウント全体を同期するには、こちらを選択 - + This directory 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>の親フォルダーで既に同期しています。 - + If you sync the root folder, you can <b>not</b> configure another sync directory. rootフォルダを同期したい場合は、その他のディレクトリを同期ディレクトリとして設定することは<b>できません</b>。 @@ -752,8 +720,8 @@ documentation for possible fixes. - General - 一般 + General Setttings + @@ -795,7 +763,7 @@ documentation for possible fixes. 削除 - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. @@ -804,29 +772,29 @@ Checked items will also be deleted if they prevent a directory from being remove パターンが、ディレクトリを取り除くを防ぐ場合、チェックされたアイテムも削除されます。これはメタデータ用に有効です。 - + Could not open file ファイルが開けませんでした - + Cannot write changes to '%1'. '%1'を更新できません。 - - + + Add Ignore Pattern 対象外ファイルパターンを追加 - - + + Add a new ignore pattern: 新しい対象外ファイルパターンを追加: - + This entry is provided by the system at '%1' and cannot be modified in this view. このエントリーは、システム '%1' から提供されています。この画面では変更できません。 @@ -834,52 +802,52 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::LogBrowser - + Log Output ログ出力 - + &Search: 検索(&S): - + &Find 検索(&F) - + Clear クリア - + Clear the log display. ログの表示をクリアする。 - + S&ave 保存(&A) - + Save the log file to a file on disk for debugging. デバッグ目的でディスクにログファイルを保存する - + Error エラー - + Save log file ログファイルを保存 - + Could not write to log file ログファイルに書き込めませんでした @@ -1001,47 +969,47 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudAdvancedSetupPage - + Connect to %1 %1 に接続 - + Setup local folder options ローカルフォルダのオプションを設定 - + Connect... 接続... - + Your entire account will be synced to the local folder '%1'. すべてのアカウントはローカルフォルダ '%1' と同期されます。 - + %1 folder '%2' is synced to local folder '%3' %1 フォルダ '%2' はローカルフォルダ '%3' と同期しています - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> <p><small><strong>警告:</strong> 現在、複数のフォルダを設定しています。現在の設定で続けた場合、フォルダの設定は無視され、単一のルートフォルダの同期が生成されます！</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> <p><small><strong>警告:</strong> ローカルディレクトリは空ではありません。拡張設定で解決方法を選択してください！</small></p> - + Local Sync Folder ローカル同期フォルダ - + Update advanced setup 高度なセットアップを更新 @@ -1049,44 +1017,21 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudHttpCredsPage - + Connect to %1 %1 に接続中 - + Enter user credentials ユーザー資格情報を入力 - + Update user credentials ユーザー資格情報を更新 - - Mirall::OwncloudPropagator - - - Aborted - 中止しました - - - - Could not remove directory %1 - ディレクトリ %1 を削除できません - - - - 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. - - - Mirall::OwncloudSetupPage @@ -1110,7 +1055,7 @@ Checked items will also be deleted if they prevent a directory from being remove このURLは安全ではありません。利用しないでください。 - + Update %1 server %1 サーバを更新 @@ -1118,129 +1063,126 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudSetupWizard - + Folder rename failed フォルダー名変更に失敗しました。 - + 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. このフォルダ内のフォルダまたはファイルが他のプログラムで開かれているため、このフォルダーを削除し、バックアップすることが出来ません。フォルダまたはファイルを閉じて再試行するか、このセットアップをキャンセルしてください。 - + + <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 へ接続を試みています... - - Trying to connect to %1 at %2 to determine authentication type... - %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/> - - Failed to connect to %1:<br/>%2 - %1 への接続に失敗:<br/>%2 - - - + 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 を作成できませんでした - - The remote folder could not be accessed! - リモートフォルダにアクセスできませんでした！ + + + 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 への接続を確立できませんでした。もう一度確認して下さい。 @@ -1248,7 +1190,7 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizard - + %1 Connection Wizard %1 接続ウィザード @@ -1256,27 +1198,27 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizardResultPage - + Open %1 %1 を開く - + Open Local Folder ローカルフォルダを開く - + Everything set up! 全てセットアップされました! - + Your entire account is synced to the local folder <i>%1</i> すべてのアカウントはローカルフォルダ <i>%1</i> と同期されます - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> %1 フォルダ<i>%1</i> はローカルフォルダ <i>%2</i> と同期しています @@ -1290,8 +1232,8 @@ Checked items will also be deleted if they prevent a directory from being remove - Detailed Sync Protocol - 同期状況詳細 + Detailed Sync Status + @@ -1415,8 +1357,8 @@ name - The sync protocol has been copied to the clipboard. - 同期状況をクリップボードにコピーしました + The sync status has been copied to the clipboard. + @@ -1437,31 +1379,55 @@ name 設定 - + %1 %1 - - Protocol - プロトコル + + Status + - + General 一般 - + Network ネットワーク - + Account アカウント + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1476,67 +1442,67 @@ name - + SSL Connection SSL接続 - + Warnings about current SSL Connection: 現在のSSL接続に対する警告: - + with Certificate %1 証明書 %1 - - - + + + &lt;not specified&gt; &lt;指定されていませんd&gt; - - + + Organization: %1 組織名: %1 - - + + Unit: %1 部門名: %1 - - + + Country: %1 国: %1 - + Fingerprint (MD5): <tt>%1</tt> Fingerprint (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Fingerprint (SHA1): <tt>%1</tt> - + Effective Date: %1 発効日: %1 - + Expiry Date: %1 有効期限: %1 - + Issuer: %1 発行者: %1 @@ -1554,17 +1520,17 @@ name <p>%1 クライアントの新しいバージョンが利用可能です。</p><p><b>%2</b> がダウンロード可能です。インストールされているバージョンは %3 です。<p> - + Skip update 更新をスキップ - + Skip this time 今回はスキップ - + Get update 更新を取得 @@ -1572,169 +1538,116 @@ name Mirall::ownCloudGui - + %1 Sync Started %1 同期開始 - + Sync started for %n configured sync folder(s). %n 個の設定済み同期フォルダの同期を開始しました。 - + 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 を終了 - + Quota n/a クオータ n/a - + %1% of %2 in use %2 のうち %1% を使用中 - + No items synced recently 最近同期されたアイテムはありません。 - + %1 (%2, %3) %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) %2 の %1 (%4 分の %3) を同期中 - + Up to date 最近です - - Mirall::ownCloudInfo - - - Proxy Refused Connection - プロキシーが接続を拒否 - - - - The configured proxy has refused the connection. Please check the proxy settings. - 設定されたプロキシーが接続を拒否しました。プロキシー設定を確認してください。 - - - - Proxy Closed Connection - プロキシーが接続を終了 - - - - The configured proxy has closed the connection. Please check the proxy settings. - 設定されたプロキシーが接続を終了しました。プロキシー設定を確認してください。 - - - - Proxy Not Found - プロキシーが見つかりません - - - - The configured proxy could not be found. Please check the proxy settings. - 設定されたプロキシーが見つかりません。プロキシー設定を確認してください。 - - - - Proxy Authentication Error - プロキシー認証エラー - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - 設定されたプロキシーが認証を要求していますが、資格情報が間違っています。プロキシーの設定を確認してください。 - - - - Proxy Connection Timed Out - プロキシー接続タイムアウト - - - - The connection to the configured proxy has timed out. - 設定したプロキシーが時間超過により切断されました。 - - OwncloudAdvancedSetupPage @@ -2000,6 +1913,35 @@ name プッシュボタン + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2031,12 +1973,12 @@ name main.cpp - + System Tray not available システムトレイ利用不可 - + %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は動作しているシステムトレイで必要とします。XFCEを動作させている場合、<a href="http://docs.xfce.org/xfce/xfce4-panel/systray">これらのインストラクション</a>を追ってください。でなければ、「トレイヤー」のようなシステムトレイアプリケーションをインストールして、再度お試しください。 @@ -2079,7 +2021,7 @@ name - + Context コンテキスト @@ -2105,44 +2047,60 @@ name - + deleted 削除 - - + + + Move + + + + + downloading ダウンロード中 - - + + uploading アップロード中 - + inactive 無効 - + starting 開始 - + finished 終了 - + delete 削除 + + + move + + + + + moved + + theme diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts index fce410853..2acc536c7 100644 --- a/translations/mirall_nl.ts +++ b/translations/mirall_nl.ts @@ -77,11 +77,6 @@ Modify Account Aanpassen account - - - Sync Status - Synchronisatiestatus - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause Pause @@ -103,6 +98,11 @@ Add Folder... Map toevoegen... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ 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 folders, waaronder netwerkfolders en gedeelde folders, 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 folder <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> - - Checking %1 connection... - Controleren van %1 connectie... - - - + No %1 connection configured. Geen %1 connectie geconfigureerd. - + Sync Running Bezig met synchroniseren - + + No account configured. + + + + The syncing operation is running.<br/>Do you want to terminate it? Bezig met synchroniseren.<br/>Wil je stoppen met synchroniseren? - + + %1 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. Verbonden met <a href="%1">%2</a>. - - Version: %1 (%2) - Versie: %1 (%2) - - - - unknown problem. - onbekend probleem. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>Verbinding met %1 mislukt: <tt>%2</tt></p> - - - + Start Start - + Currently Momenteel - + Completely Volledig - + %1 %2 %3 (%4 of %5) %1 %2 %3 (%4 van %5) - + Completely finished. Helemaal klaar - + %1 of %2, file %3 of %4 %1 van %2, bestand %3 van %4 - - %1 of %2 in use. - %1 van %2 gebruikt. + + Connected to <a href="%1">%2</a> as <i>%3</i>. + - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. Er is nu geen informatie over het gebruik van de opslagruimte beschikbaar. @@ -357,6 +352,11 @@ CSync unspecified error. CSync ongedefinieerde fout. + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -386,150 +386,118 @@ Mirall::ConnectionValidator - - No ownCloud connection configured - Geen ownCloud-verbinding ingesteld + + No ownCloud account configured + - + The configured server for this client is too old De voor dit programma ingestelde server is te oud - + Please update to the latest server and restart the client. Werk update de server naar de nieuwste versie en herstart het programma. - + Unable to connect to %1 Niet in staat om verbinding te maken met %1 - + The provided credentials are not correct De verstrekte inloggegevens zijn niet juist - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - Geen wachtwoord gevonden in de sleutelring. Graag opnieuw configureren. - - Mirall::Folder - + Unable to create csync-context Onmogelijk om een csync-context te maken - + Local folder %1 does not exist. Lokale map %1 bestaat niet. - + %1 should be a directory but is not. %1 zou een map moeten zijn, maar is dit niet. - + %1 is not readable. %1 is niet leesbaar. - + File %1: %2 Bestand %1: %2 - + + File %1 Bestand %1 - - New file available - Nieuw bestand beschikbaar + + downloaded + - - '%1' has been synced to this machine. - '%1' is gesynchroniseerd naar deze computer. + + removed + - - New files available - Nieuwe bestanden beschikbaar - - - - '%1' and %n other file(s) have been synced to this machine. - '%1' en %n andere bestanden zijn gesynchroniseerd met deze machine..'%1' en %n andere bestanden zijn gesynchroniseerd met deze machine.. + + updated + - - File removed - Bestand verwijderd + + renamed + - - '%1' has been removed. - '%1' is verwijderd. + + '%1' has been %2. + - - Files removed - Bestanden verwijderd - - - - '%1' and %n other file(s) have been removed. - '%1' en %n andere bestanden zijn verwijderd.'%1' en %n andere bestanden zijn verwijderd. + + Files %1 + - - File updated - Bestand bijgewerkt + + '%1' and %2 other files have been %3. + - - '%1' has been updated. - '%1' is bijgewerkt. - - - - Files updated - Bestanden bijgewerkt - - - - '%1' and %n other file(s) have been updated. - '%1' en %n andere bestanden zijn bijgewerkt.'%1' en %n andere bestanden zijn bijgewerkt. - - - + Error Fout - + The CSync thread terminated. De CSync thread is beëindigd. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". Deze synchronisatie verwijdert alle bestanden in lokale synchronisatiemap '%1'. Als u of uw beheerder uw account op de server heeft gereset, kies dan "Bewaar bestanden". Als u uw bestanden wilt verwijderen, kies dan "Verwijder alle bestanden". - + 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? @@ -538,17 +506,17 @@ Dit kan komen doordat de folder ongemerkt gereconfigureerd is of doordat alle be 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 @@ -556,62 +524,62 @@ Weet u zeker dat u deze bewerking wilt uitvoeren? Mirall::FolderMan - + Could not reset folder state Kan je beginstaat van de map niet resetten - + 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. - + 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. - + %1 (Sync is paused) %1 (Synchronisatie onderbroken) @@ -650,8 +618,8 @@ werken. Controleer de de documentatie voor mogelijke oplossingen. Mirall::FolderWizard - - + + Add Folder Voeg Map Toe @@ -659,42 +627,42 @@ werken. Controleer de de documentatie voor mogelijke oplossingen. Mirall::FolderWizardSourcePage - + No local folder selected! Geen 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.<br/>Please pick another one! Het lokale pad %1 is al een upload map.<br/>Kies een andere map! - + An already configured folder is contained in the current entry. Er bestaat een al geconfigureerde map in de huidige opdracht. - + An already configured folder contains the currently entered directory. Een reeds geconfigureerde map bevat de zojuist opgegeven map. - + The alias can not be empty. Please provide a descriptive alias word. De alias kan niet leeg zijn. Voer een beschrijvende alias in. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>De alias <i>%1</i> is al in gebruik. Kies een andere alias. - + Select the source folder Selecteer de bron map @@ -702,42 +670,42 @@ werken. Controleer de de documentatie voor mogelijke oplossingen. Mirall::FolderWizardTargetPage - + 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.<br/>Please check manually. Aanmaken van de map op %1 mislukt.<br/>Controleer handmatig. - + Choose this to sync the entire account Kies dit om uw volledige account te synchroniseren - + This directory is already being synced. Deze map wordt 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>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. Als u de hoofdmap synchroniseert, kan u <b>niet</b> een andere synch map configureren. @@ -751,8 +719,8 @@ werken. Controleer de de documentatie voor mogelijke oplossingen. - General - Algemeen + General Setttings + @@ -794,7 +762,7 @@ werken. Controleer de de documentatie voor mogelijke oplossingen. Verwijder - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. @@ -803,29 +771,29 @@ Checked items will also be deleted if they prevent a directory from being remove Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat een folder verwijderd wordt. Dit is nuttig voor metadata. - + Could not open file Kon het bestand niet openen - + Cannot write changes to '%1'. Er kunnen geen wijzigingen worden geschreven naar %1 - - + + Add Ignore Pattern Toevoegen negeerpatroon - - + + Add a new ignore pattern: Voeg nieuw negeerpatroon toe: - + This entry is provided by the system at '%1' and cannot be modified in this view. Deze entry is door het systeem geleverd op '%1' en kan niet worden aangepast in deze sessie. @@ -833,52 +801,52 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee Mirall::LogBrowser - + Log Output Log Output - + &Search: Zoek: - + &Find &Vind - + Clear Opschonen - + Clear the log display. Schoon het log display op. - + S&ave Opslaan - + Save the log file to a file on disk for debugging. Sla het logbestand op om te debuggen. - + Error Fout - + Save log file Opslaan logbestand - + Could not write to log file Kon niet schrijven naar logbestand @@ -1000,47 +968,47 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee Mirall::OwncloudAdvancedSetupPage - + Connect to %1 Verbindt met %1 - + Setup local folder options Bepaal de instellingen voor de lokale map - + Connect... Verbinden... - + Your entire account will be synced to the local folder '%1'. Uw volledige account zal worden gesynchroniseerd met de lokale folder '%1'. - + %1 folder '%2' is synced to local folder '%3' %1 map '%2' is gesynchroniseerd naar de lokale map '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> <p><small><strong>Waarschuwing:</strong> U heeft momenteel meerdere mappen geconfigureerd. Als u doorgaat met de huidige instellingen, zullen de map-configuraties ongedaan worden gemaakt en zal een enkele rootmap worden gemaakt!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> <p><small><strong>Waarschuwing:</strong> De lokale map is niet leeg. Maak een keuze!</small></p> - + Local Sync Folder Lokale synchronisatiemap - + Update advanced setup Update geavanceerde setup @@ -1048,44 +1016,21 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee Mirall::OwncloudHttpCredsPage - + Connect to %1 Verbindt met %1 - + Enter user credentials Vul uw inloggegevens in - + Update user credentials Werk de inloggegevens bij - - Mirall::OwncloudPropagator - - - Aborted - Afgebroken - - - - Could not remove directory %1 - Kon map %1 niet verwijderen - - - - 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. - - Mirall::OwncloudSetupPage @@ -1109,7 +1054,7 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee Deze url is NIET veilig. Niet gebruiken! - + Update %1 server Bijwerken %1 server @@ -1117,129 +1062,126 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee Mirall::OwncloudSetupWizard - + Folder rename failed Hernoemen map mislukt - + 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 backup map niet verwijderen, de map of een bestand in deze map in gebruik is door een ander programma. Sluit aub de map of het bestand en klik op opnieuw proberen of annuleer de installatie. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - Probeer te verbinden met %1 op %2 om het type authenticatie te bepalen... - - - + <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/> - - Failed to connect to %1:<br/>%2 - Niet gelukt om te verbinden met %1:<br/>%2 - - - + 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 - - The remote folder could not be accessed! - De externe map kon niet worden benaderd! + + + Failed to connect to %1 at %2:<br/>%3 + - + + No remote folder specified! + + + + 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. @@ -1247,7 +1189,7 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee Mirall::OwncloudWizard - + %1 Connection Wizard %1 Verbindingswizard @@ -1255,27 +1197,27 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee Mirall::OwncloudWizardResultPage - + Open %1 Open %1 - + Open Local Folder Open lokale map - + Everything set up! Alles is geïnstalleerd! - + Your entire account is synced to the local folder <i>%1</i> Uw complete account is gesynchroniseerd met de lokale map <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> %1 map <i>%1</i> is gesynchroniseerd met lokale map <i>%2</i> @@ -1289,8 +1231,8 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee - Detailed Sync Protocol - Gedetailleerde synchronisatiehistorie + Detailed Sync Status + @@ -1421,8 +1363,8 @@ op de server staat beschikbaar blijft met de originele naam. - The sync protocol has been copied to the clipboard. - De synchronisatiegeschiedenis is naar het klembord gekopieerd. + The sync status has been copied to the clipboard. + @@ -1443,31 +1385,55 @@ op de server staat beschikbaar blijft met de originele naam. Instellingen - + %1 %1 - - Protocol - Protocol + + Status + - + General Algemeen - + Network Netwerk - + Account Account + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1482,67 +1448,67 @@ op de server staat beschikbaar blijft met de originele naam. - + SSL Connection SSL-verbinding - + Warnings about current SSL Connection: Waarschuwing over huidige SSL Connectie: - + with Certificate %1 met certificaat %1 - - - + + + &lt;not specified&gt; &lt;niet gespecificeerd&gt; - - + + Organization: %1 Organisatie: %1 - - + + Unit: %1 Unit: %1 - - + + Country: %1 Land: %1 - + Fingerprint (MD5): <tt>%1</tt> Fingerprint (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Fingerprint (SHA1): <tt>%1</tt> - + Effective Date: %1 Ingangsdatum: %1 - + Expiry Date: %1 Vervaldatum: %1 - + Issuer: %1 Uitgever: %1 @@ -1560,17 +1526,17 @@ op de server staat beschikbaar blijft met de originele naam. <p>Er is een nieuwe versie van de %1-client.</p><p><b>%2</b> kan gedownload worden. De geïnstalleerde versie is %3.<p> - + Skip update Overslaan update - + Skip this time Deze keer overslaan - + Get update Ophalen update @@ -1578,169 +1544,116 @@ op de server staat beschikbaar blijft met de originele naam. Mirall::ownCloudGui - + %1 Sync Started %1 Synchronisatie gestart - + Sync started for %n configured sync folder(s). Synchronisatie begonnen voor %n geconfigureerde synchronisatie map(pen).Synchronisatie begonnen voor %n geconfigureerde synchronisatie map(pen). - + 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 - + Quota n/a Quota niet beschikbaar - + %1% of %2 in use %1% van %2 gebruikt - + No items synced recently Recent niets gesynchroniseerd - + %1 (%2, %3) %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) Synchroniseert %1 van %2 (%3 van %4) - + Up to date Bijgewerkt - - Mirall::ownCloudInfo - - - Proxy Refused Connection - Proxy weigerde de verbinding - - - - The configured proxy has refused the connection. Please check the proxy settings. - De geconfigureerde proxy weigerde de verbinding. Controleer de proxy instellingen. - - - - Proxy Closed Connection - Proxy verbinding gesloten - - - - The configured proxy has closed the connection. Please check the proxy settings. - De geconfigureerde proxy beëindigde de verbinding. Controleer de proxy instellingen. - - - - Proxy Not Found - Proxy niet gevonden - - - - The configured proxy could not be found. Please check the proxy settings. - De geconfigureerde proxy is niet gevonden. Controleer de proxy instellingen. - - - - Proxy Authentication Error - Proxy authenticatie fout - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - De geconfigureerde proxy vereist aanmelding, maar de inloggegevens zijn ongeldig. Controleer de proxy instellingen. - - - - Proxy Connection Timed Out - Proxy verbinding time-out - - - - The connection to the configured proxy has timed out. - De verbinding met de geconfigureerde proxy is verlopen. - - OwncloudAdvancedSetupPage @@ -2006,6 +1919,35 @@ op de server staat beschikbaar blijft met de originele naam. DrukKnop + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2037,12 +1979,12 @@ op de server staat beschikbaar blijft met de originele naam. main.cpp - + System Tray not available Systeem icoon niet beschikbaar - + %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 heeft een werkend systeem icoon nodig. Als je XFCE draait volg <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">deze instructies</a>. Anders, installeer een systeem icoon applicatie zoals 'trayer' and probeer het opnieuw. @@ -2085,7 +2027,7 @@ op de server staat beschikbaar blijft met de originele naam. - + Context Context @@ -2111,44 +2053,60 @@ op de server staat beschikbaar blijft met de originele naam. - + deleted verwijderd - - + + + Move + + + + + downloading downloaden - - + + uploading uploaden - + inactive inactief - + starting beginnend - + finished klaar - + delete verwijderen + + + move + + + + + moved + + theme diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts index d619d0670..63f60b626 100644 --- a/translations/mirall_pl.ts +++ b/translations/mirall_pl.ts @@ -77,11 +77,6 @@ Modify Account Zmień Konto - - - Sync Status - Status synchronizacji - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause Wstrzymaj @@ -103,6 +98,11 @@ Add Folder... Dodaj katalog... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ 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. - + 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> - + 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> - - Checking %1 connection... - Sprawdzam %1 połączenie... - - - + No %1 connection configured. Połączenie %1 nie skonfigurowane. - + Sync Running Synchronizacja uruchomiona - + + No account configured. + + + + The syncing operation is running.<br/>Do you want to terminate it? Operacja synchronizacji jest uruchomiona.<br>Czy chcesz ją zakończyć? - + + %1 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. Podłączony do <a href="%1">%2</a>. - - Version: %1 (%2) - Wersja: %1 (%2) - - - - unknown problem. - nieznany problem. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>Błąd połączenia do %1: <tt>%2</tt></p> - - - + Start Start - + Currently Obecnie - + Completely Całkowicie - + %1 %2 %3 (%4 of %5) %1 %2 %3 (%4 z %5) - + Completely finished. Całkowicie zakończony. - + %1 of %2, file %3 of %4 %1 z %2, plik %3 z %4 - - %1 of %2 in use. - %1 z %2 w użyciu. + + Connected to <a href="%1">%2</a> as <i>%3</i>. + - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. @@ -357,6 +352,11 @@ CSync unspecified error. Nieokreślony błąd CSync. + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -386,166 +386,134 @@ Mirall::ConnectionValidator - - No ownCloud connection configured - Nie skonfigurowano połączenia z ownCloud + + No ownCloud account configured + - + The configured server for this client is too old Konfigurowany serwer dla tego klienta jest za stary - + Please update to the latest server and restart the client. - + Unable to connect to %1 Nie mogę połączyć się do %1 - + The provided credentials are not correct - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - Brak hasło w bazie kluczy. Należy ponownie skonfigurować. - - Mirall::Folder - + Unable to create csync-context Nie można utworzyć kontekstu csync - + Local folder %1 does not exist. Folder lokalny %1 nie istnieje. - + %1 should be a directory but is not. %1 powinien być katalogiem, ale nie jest. - + %1 is not readable. %1 jest nie do odczytu. - + File %1: %2 Plik %1: %2 - + + File %1 Plik %1 - - New file available - Nowy plik dostępny + + downloaded + - - '%1' has been synced to this machine. - '%1' zsynchronizowanych z tą maszyną. + + removed + - - New files available - Nowe pliki dostępne - - - - '%1' and %n other file(s) have been synced to this machine. - '%1' oraz %n innych plik(ów) zostało zsynchronizowanych na tej maszynie.'%1' oraz %n innych plik(ów) zostało zsynchronizowanych na tej maszynie.'%1' oraz %n innych plik(ów) zostało zsynchronizowanych na tej maszynie. + + updated + - - File removed - Usunięto plik + + renamed + - - '%1' has been removed. - Usunięto "%1". + + '%1' has been %2. + - - Files removed - Pliki usunięto - - - - '%1' and %n other file(s) have been removed. - %1' i %n inne pliki zostały usunięte z tej maszyny.%1' i %n inne pliki zostały usunięte z tej maszyny.%1' i %n inne pliki zostały usunięte z tej maszyny. + + Files %1 + - - File updated - Plik zaktualizowano + + '%1' and %2 other files have been %3. + - - '%1' has been updated. - '%1' został uaktualniony. - - - - Files updated - Pliki zaktualizowano - - - - '%1' and %n other file(s) have been updated. - %1' i %n inne pliki zostały uaktualnione na tej maszynie.%1' i %n inne pliki zostały uaktualnione na tej maszynie.%1' i %n inne pliki zostały uaktualnione na tej maszynie. - - - + Error Błąd - + The CSync thread terminated. Wątek CSync zakończony. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". - + 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? Usunąć wszystkie pliki? - + Remove all files Usuń wszystkie pliki - + Keep files Pozostaw pliki @@ -553,62 +521,62 @@ Are you sure you want to perform this operation? 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. - + 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ł. - + %1 (Sync is paused) %1 (Synchronizacja jest zatrzymana) @@ -645,8 +613,8 @@ documentation for possible fixes. Mirall::FolderWizard - - + + Add Folder Dodaj folder @@ -654,42 +622,42 @@ documentation for possible fixes. Mirall::FolderWizardSourcePage - + No local folder selected! Nie wybrano 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.<br/>Please pick another one! Ścieżka lokalna %1 już istnieje w zdalnym folderze.<br>Proszę wybrać inną! - + An already configured folder is contained in the current entry. Folder jest już skonfigurowany w bieżącym wpisie. - + An already configured folder contains the currently entered directory. Folder już skonfigurowany zawiera katalogi aktualnie wprowadzone. - + The alias can not be empty. Please provide a descriptive alias word. Alias nie może być pusty. Proszę wprowadzić alias. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>Alias <i>%1</i> jest już używany. Wprowadź inny alias. - + Select the source folder Wybierz katalog źródłowy @@ -697,42 +665,42 @@ documentation for possible fixes. Mirall::FolderWizardTargetPage - + 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.<br/>Please check manually. Nie udało się utworzyć folderu na %1.<br/>Sprawdź ręcznie. - + Choose this to sync the entire account - + This directory 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>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. @@ -746,8 +714,8 @@ documentation for possible fixes. - General - Ogólne + General Setttings + @@ -789,36 +757,36 @@ documentation for possible fixes. Usuń - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. - + Could not open file Nie można otworzyć plików - + Cannot write changes to '%1'. Nie mogę zapisać zmian do '%1'. - - + + Add Ignore Pattern Dodaj ignorowany - - + + Add a new ignore pattern: Dodaj nowy ignorowany: - + This entry is provided by the system at '%1' and cannot be modified in this view. @@ -826,52 +794,52 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::LogBrowser - + Log Output Treść dziennika - + &Search: &Szukaj: - + &Find &Znajdź - + Clear Wyczyść - + Clear the log display. Wyczyść wyświetlane dzienniki. - + S&ave Z&apisz - + Save the log file to a file on disk for debugging. Zapisz plik dziennika do pliku na dysku w celu debugowania. - + Error Błąd - + Save log file Zapisz plik dziennika - + Could not write to log file Nie można zapisać w pliku dziennika @@ -993,47 +961,47 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudAdvancedSetupPage - + Connect to %1 Połącz do %1 - + Setup local folder options Ustawienia opcji lokalnych katalogów - + Connect... Połącz... - + Your entire account will be synced to the local folder '%1'. Twoje całe konto zostanie zsynchronizowane z twoim lokalnym katalogiem '%1'. - + %1 folder '%2' is synced to local folder '%3' %1 katalog '%2' jest zsynchronizowany do katalogu lokalnego '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> - + Local Sync Folder Folder lokalnej synchronizacji - + Update advanced setup Zaktualizuj zaawansowane ustawienia @@ -1041,44 +1009,21 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudHttpCredsPage - + Connect to %1 Podłącz do %1 - + Enter user credentials Wprowadź poświadczenia użytkownika - + Update user credentials Zaktualizuj poświadczenia uzytkownika - - Mirall::OwncloudPropagator - - - Aborted - Anulowane - - - - Could not remove directory %1 - Nie mogę usunąć katalogu %1 - - - - 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. - - - Mirall::OwncloudSetupPage @@ -1102,7 +1047,7 @@ Checked items will also be deleted if they prevent a directory from being remove Ten link NIE JEST bezpieczny. Nie powinno się go używać. - + Update %1 server @@ -1110,129 +1055,126 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudSetupWizard - + Folder rename failed Zmiana nazwy folderu nie powiodła się - + 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. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - Próbuje połączyć się z %1 na %2, aby określić typ uwierzytelniania... - - - + <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/> - - Failed to connect to %1:<br/>%2 - Nie udało się nawiązać połączenia z %1:<br/>%2 - - - + 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 - - The remote folder could not be accessed! - Nie udało się uzyskać dostępu do zdalnego folderu! + + + Failed to connect to %1 at %2:<br/>%3 + - + + No remote folder specified! + + + + 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. @@ -1240,7 +1182,7 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizard - + %1 Connection Wizard %1 Kreator połączeń @@ -1248,27 +1190,27 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizardResultPage - + Open %1 Otwórz %1 - + Open Local Folder Otwórz lokalny folder - + Everything set up! Wszystko skonfigurowane! - + Your entire account is synced to the local folder <i>%1</i> Twoje całe konto zostało zsynchronizowane z twoim lokalnym folderem <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> @@ -1282,8 +1224,8 @@ Checked items will also be deleted if they prevent a directory from being remove - Detailed Sync Protocol - Szczegółowy protokół synchronizacji + Detailed Sync Status + @@ -1405,8 +1347,8 @@ name - The sync protocol has been copied to the clipboard. - Protokół synchronizacji został skopiowany do schowka. + The sync status has been copied to the clipboard. + @@ -1427,31 +1369,55 @@ name Ustawienia - + %1 %1 - - Protocol + + Status - + General Ogólne - + Network Sieć - + Account Konto + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1466,67 +1432,67 @@ name - + SSL Connection Połączenie SSL - + Warnings about current SSL Connection: Ostrzeżenia dotyczące bieżącego połączenia SSL: - + with Certificate %1 z certyfikatem %1 - - - + + + &lt;not specified&gt; &lt;nie określono&gt; - - + + Organization: %1 Organizacja: %1 - - + + Unit: %1 Jednostka: %1 - - + + Country: %1 Kraj: %1 - + Fingerprint (MD5): <tt>%1</tt> Odcisk (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Odcisk (SHA1): <tt>%1</tt> - + Effective Date: %1 Data wejścia w życie: %1 - + Expiry Date: %1 Data wygaśnięcia: %1 - + Issuer: %1 Wystawca: %1 @@ -1544,17 +1510,17 @@ name <p>Nowa wersja klienta %1 jest dostępna.</p><p><b>%2</b>jest dostępna do pobrania. Zainstalowana wersja to %3.<p> - + Skip update Pomiń aktualizację - + Skip this time Pomiń tym razem - + Get update Uaktualnij @@ -1562,169 +1528,116 @@ name Mirall::ownCloudGui - + %1 Sync Started %1 Synchronizacja rozpoczęta - + Sync started for %n configured sync folder(s). Synchronizacja rozpoczęta dla %n folderu(ów).Synchronizacja rozpoczęta dla %n folderu(ów).Synchronizacja rozpoczęta dla %n folderu(ów). - + 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 - + Quota n/a Quota n/a - + %1% of %2 in use %1% z %2 w użyciu - + No items synced recently Brak ostatnich synchronizacji - + %1 (%2, %3) %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) Synchronizacja %1 z %2 (%3 z %4) - + Up to date Aktualne - - Mirall::ownCloudInfo - - - Proxy Refused Connection - Proxy odmowa połączenia - - - - The configured proxy has refused the connection. Please check the proxy settings. - - - - - Proxy Closed Connection - Proxy zamknął połączenie - - - - The configured proxy has closed the connection. Please check the proxy settings. - - - - - Proxy Not Found - Nie znaleziono Proxy - - - - The configured proxy could not be found. Please check the proxy settings. - - - - - Proxy Authentication Error - Błąd uwierzytelniania proxy - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - - - - - Proxy Connection Timed Out - Połączenie Proxy trwało za długo - - - - The connection to the configured proxy has timed out. - - - OwncloudAdvancedSetupPage @@ -1991,6 +1904,35 @@ name Kliknij + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2022,12 +1964,12 @@ Kliknij main.cpp - + System Tray not available Systemowy pasek nie dostępny - + %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. @@ -2070,7 +2012,7 @@ Kliknij - + Context Kontekst @@ -2096,44 +2038,60 @@ Kliknij - + deleted usunięto - - + + + Move + + + + + downloading pobieram - - + + uploading przesyłanie - + inactive nieaktywne - + starting Uruchamiam - + finished zakończony - + delete usuń + + + move + + + + + moved + + theme diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts index 062072d3a..d539bbc4b 100644 --- a/translations/mirall_pt.ts +++ b/translations/mirall_pt.ts @@ -70,17 +70,12 @@ Edit Ignored Files - + Editar ficheiros ignorados Modify Account - - - - - Sync Status - + Modificar conta @@ -89,7 +84,7 @@ - + Pause Pausa @@ -103,6 +98,11 @@ Add Folder... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ - + Retrieving usage information... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. - + 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> - + 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> - - Checking %1 connection... - A testar a ligação a %1 ... - - - + No %1 connection configured. %1 sem ligação configurada. - + Sync Running A sincronização está a decorrer - + + No account configured. + + + + 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 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. - - Version: %1 (%2) - Versão: %1 (%2) - - - - unknown problem. - problema desconhecido. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>Falha a ligar a %1 : <tt>%2</tt></p> - - - + Start - + Iniciar - + Currently - + Actualmente - + Completely - + Completamente - + %1 %2 %3 (%4 of %5) - + %1 %2 %3 (%4 de %5) - + Completely finished. - + %1 of %2, file %3 of %4 + %1 de %2, ficheiro %3 de %4 + + + + Connected to <a href="%1">%2</a> as <i>%3</i>. - - %1 of %2 in use. + + No connection to %1 at <a href="%1">%2</a>. - + Currently there is no storage usage information available. @@ -358,6 +353,11 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n CSync unspecified error. CSync: erro não especificado + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -387,229 +387,197 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n Mirall::ConnectionValidator - - No ownCloud connection configured + + No ownCloud account configured - + The configured server for this client is too old - + Please update to the latest server and restart the client. - + Unable to connect to %1 - + The provided credentials are not correct - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - Não foi encontrada nenhuma password no porta-chaves. Por favor, reconfigure - - Mirall::Folder - + Unable to create csync-context - + Local folder %1 does not exist. A pasta local %1 não existe. - + %1 should be a directory but is not. %1 devia de ser um directório mas não é - + %1 is not readable. Não é possível ler %1 - + File %1: %2 - + + File %1 - - New file available + + downloaded - - '%1' has been synced to this machine. + + removed - - New files available - - - - - '%1' and %n other file(s) have been synced to this machine. - - - - - File removed + + updated - - '%1' has been removed. + + renamed - - Files removed - - - - - '%1' and %n other file(s) have been removed. - - - - - File updated + + '%1' has been %2. - - '%1' has been updated. + + Files %1 - - Files updated + + '%1' and %2 other files have been %3. - - - '%1' and %n other file(s) have been updated. - - - + Error Erro - + The CSync thread terminated. A operação CSync terminou. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". - + 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? - + Remover todos os ficheiros? - + Remove all files - + Keep files - + Manter os ficheiros 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. Estado indefinido. - + Waits to start syncing. A aguardar o inicio da sincronização. - + Preparing for sync. - + Sync is running. A sincronização está a correr. - + Server is currently not available. - + Last Sync was successful. A última sincronização foi efectuada com sucesso. - + Last Sync was successful, but with warnings on individual files. - + Setup Error. Erro na instalação. - + User Abort. - + %1 (Sync is paused) @@ -646,8 +614,8 @@ documentation for possible fixes. Mirall::FolderWizard - - + + Add Folder Acrescentar pasta @@ -655,42 +623,42 @@ documentation for possible fixes. Mirall::FolderWizardSourcePage - + No local folder selected! - + You have no permission to write to the selected folder! - + The local path %1 is already an upload folder.<br/>Please pick another one! O caminho local da pasta %1 já é uma pasta de envio ou de upload. <br/>Por favor escolha outra pasta! - + An already configured folder is contained in the current entry. Uma pasta anteriormente configurada está contida na introdução actual. - + An already configured folder contains the currently entered directory. Uma pasta anteriormente configurada contem a pasta actualmente introduzida - + 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 - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br>O pseudónimo <i>%1</i> já se encontra em uso. Por favor escolha outro pesudónimo. - + Select the source folder Selecione a pasta de origem @@ -698,42 +666,42 @@ documentation for possible fixes. Mirall::FolderWizardTargetPage - + Add Remote Folder - + Adicionar pasta remota - + Enter the name of the new folder: - + Folder was successfully created on %1. Pasta criada com sucesso em %1. - + Failed to create the folder on %1.<br/>Please check manually. A criação da pasta em %1 falhou. </br>Verifique manualmente. - + Choose this to sync the entire account - + This directory is already being synced. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. @@ -747,8 +715,8 @@ documentation for possible fixes. - General - Geral + General Setttings + @@ -790,36 +758,36 @@ documentation for possible fixes. Apagar - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. - + Could not open file - + Cannot write changes to '%1'. - - - - Add Ignore Pattern - - + Add Ignore Pattern + + + + + Add a new ignore pattern: - + This entry is provided by the system at '%1' and cannot be modified in this view. @@ -827,52 +795,52 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::LogBrowser - + Log Output Escrita do Registo - log output - + &Search: &Procurar: - + &Find &Encontrar - + Clear Limpar. - + Clear the log display. Limpar o registo. - + S&ave &Guardar - + Save the log file to a file on disk for debugging. Guarde o ficheiro de registo no disco para debug. - + Error Erro - + Save log file Guardar ficheiro de log - + Could not write to log file Não foi possível escrever no ficheiro de log @@ -994,47 +962,47 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudAdvancedSetupPage - + Connect to %1 - + Setup local folder options - + Connect... - + Your entire account will be synced to the local folder '%1'. - + %1 folder '%2' is synced to local folder '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> - + Local Sync Folder - + Update advanced setup @@ -1042,44 +1010,21 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudHttpCredsPage - + Connect to %1 - + Enter user credentials - + Update user credentials - - Mirall::OwncloudPropagator - - - Aborted - - - - - Could not remove directory %1 - - - - - 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. - - - Mirall::OwncloudSetupPage @@ -1103,7 +1048,7 @@ Checked items will also be deleted if they prevent a directory from being remove Este endereço não é seguro. É recomendado que não o use. - + Update %1 server @@ -1111,129 +1056,126 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudSetupWizard - + Folder rename failed - + 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. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - - - - + <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/> - - Failed to connect to %1:<br/>%2 - Erro na ligação a %1:<br/>%2 - - - + Error: Wrong credentials. - + 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 - - The remote folder could not be accessed! - Não foi possível aceder á pasta remota! + + + Failed to connect to %1 at %2:<br/>%3 + - + + No remote folder specified! + + + + 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. @@ -1241,7 +1183,7 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizard - + %1 Connection Wizard Assistente de ligação %1 @@ -1249,27 +1191,27 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizardResultPage - + Open %1 Abrir %1 - + Open Local Folder Abrir a pasta local - + Everything set up! - + Your entire account is synced to the local folder <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> @@ -1283,8 +1225,8 @@ Checked items will also be deleted if they prevent a directory from being remove - Detailed Sync Protocol - Detalhes do protocolo de sincronização + Detailed Sync Status + @@ -1406,8 +1348,8 @@ name - The sync protocol has been copied to the clipboard. - O protocolo de sincronização foi copiado para a área de transferência + The sync status has been copied to the clipboard. + @@ -1428,28 +1370,52 @@ name Configurações - + %1 - - Protocol + + Status - + General Geral - + Network + Rede + + + + Account + Conta + + + + Mirall::ShibbolethWebView + + + %1 - Authenticate - - Account + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. @@ -1467,67 +1433,67 @@ name - + SSL Connection Ligação SSL - + Warnings about current SSL Connection: Avisos sobre a Ligação SSL actual: - + with Certificate %1 com o certificado %1 - - - + + + &lt;not specified&gt; &lt;não especificado&gt; - - + + Organization: %1 Organização: %1 - - + + Unit: %1 Unidade: %1 - - + + Country: %1 País: %1 - + Fingerprint (MD5): <tt>%1</tt> Chave(MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Chave(SHA1): <tt>%1</tt> - + Effective Date: %1 Data efectiva: %1 - + Expiry Date: %1 Data de expiração: %1 - + Issuer: %1 Emissor: %1 @@ -1545,17 +1511,17 @@ name - + Skip update Saltar a actualização - + Skip this time - + Get update @@ -1563,169 +1529,116 @@ name Mirall::ownCloudGui - + %1 Sync Started %1 A sincronização inicou. - + Sync started for %n configured sync folder(s). - + Folder %1: %2 - + No sync folders configured. Nenhuma pasta de sincronização configurada. - + None. - + Recent Changes - + Open %1 folder Abrir a pasta %1 - + Managed Folders: Pastas Geridas: - + Open folder '%1' - + Open %1 in browser - + Calculating quota... - + Unknown status - + Settings... - + Details... - + Help Ajuda - + Quit %1 - + Quota n/a - + %1% of %2 in use - + No items synced recently - + %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) - + Up to date Actualizado - - Mirall::ownCloudInfo - - - Proxy Refused Connection - - - - - The configured proxy has refused the connection. Please check the proxy settings. - - - - - Proxy Closed Connection - - - - - The configured proxy has closed the connection. Please check the proxy settings. - - - - - Proxy Not Found - Proxy Não Encontrado - - - - The configured proxy could not be found. Please check the proxy settings. - - - - - Proxy Authentication Error - - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - - - - - Proxy Connection Timed Out - - - - - The connection to the configured proxy has timed out. - - - OwncloudAdvancedSetupPage @@ -1778,7 +1691,7 @@ name Status message - + Mensagem de estado @@ -1959,7 +1872,7 @@ name Status message - + Mensagem de estado @@ -1991,6 +1904,35 @@ name + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2022,12 +1964,12 @@ name main.cpp - + System Tray not available - + %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. @@ -2070,7 +2012,7 @@ name - + Context @@ -2082,7 +2024,7 @@ name Start - + Iniciar @@ -2096,44 +2038,60 @@ name - + deleted apagado - - + + + Move + + + + + downloading - - + + uploading - + inactive - + starting - + finished - + delete apagar + + + move + + + + + moved + + theme diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts index 7afc820ac..fce50eabc 100644 --- a/translations/mirall_pt_BR.ts +++ b/translations/mirall_pt_BR.ts @@ -77,11 +77,6 @@ Modify Account Modificar Conta - - - Sync Status - Sinconizar Status - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause Pause @@ -103,6 +98,11 @@ Add Folder... Adicionar Pasta... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ 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 o tráfego de dados significativo e levar vários minutos ou horas, dependendo do tamanho da pasta. Somente use esta opção se adivertido por seu administrador.</p> - - Checking %1 connection... - Checando conexão a %1... - - - + No %1 connection configured. Sem %1 conexão configurada. - + Sync Running Sincronização acontecendo - + + No account configured. + + + + The syncing operation is running.<br/>Do you want to terminate it? A operação de sincronização está acontecendo.<br/>deseja finaliza-la? - + + %1 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. Conectado à <a href="%1">%2</a>. - - Version: %1 (%2) - Versão: %1 (%2) - - - - unknown problem. - problema desconhecido. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>Falha ao conectar à %1: <tt>%2</tt></p> - - - + Start Iniciar - + Currently Atualmente - + Completely Completamente - + %1 %2 %3 (%4 of %5) %1 %2 %3 (%4 de %5) - + Completely finished. Completamente finalizado. - + %1 of %2, file %3 of %4 %1 of %2, file %3 de %4 - - %1 of %2 in use. - %1 de %2 em uso. + + Connected to <a href="%1">%2</a> as <i>%3</i>. + - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. Atualmente, não há informações de uso de armazenamento disponível. @@ -357,6 +352,11 @@ CSync unspecified error. Erro não especificado no CSync. + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -386,150 +386,118 @@ Mirall::ConnectionValidator - - No ownCloud connection configured - Nenhuma ligação ownCloud configurada + + No ownCloud account configured + - + The configured server for this client is too old O servidor configurado para este cliente é muito antigo - + Please update to the latest server and restart the client. Por favor, atualize para o último servidor e reinicie o cliente. - + Unable to connect to %1 Impossível se conectar a %1 - + The provided credentials are not correct As credenciais fornecidas não estão corretas - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - Senha não contrada no chaveiro. Por favor reconfigure. - - Mirall::Folder - + Unable to create csync-context Não é possível criar csync-contexto - + Local folder %1 does not exist. A pasta local %1 não existe. - + %1 should be a directory but is not. %1 deveria ser uma pasta, mas não é. - + %1 is not readable. %1 não pode ser lido. - + File %1: %2 Arquivo %1: %2 - + + File %1 Arquivo %1 - - New file available - Novo arquivo disponível + + downloaded + - - '%1' has been synced to this machine. - '%1' foi sincronizado com esta máquina + + removed + - - New files available - Novos arquivos disponíveis - - - - '%1' and %n other file(s) have been synced to this machine. - '%1' e %n outros arquivo(s) foram sincronizados com essa máquina.'%1' e %n outros arquivo(s) foram sincronizados com essa máquina. + + updated + - - File removed - Arquivo removido + + renamed + - - '%1' has been removed. - '%1' foi removido. + + '%1' has been %2. + - - Files removed - Arquivos removidos - - - - '%1' and %n other file(s) have been removed. - '%1' e %n outros arquivo(s) foram removidos.'%1' e %n outros arquivo(s) foram removidos. + + Files %1 + - - File updated - Arquivo atualizado + + '%1' and %2 other files have been %3. + - - '%1' has been updated. - '%1' foi atualizado. - - - - Files updated - Arquivos atualizados - - - - '%1' and %n other file(s) have been updated. - '%1' e %n outros arquivo(s) foram atualizados.'%1' e %n outros arquivo(s) foram atualizados. - - - + Error Erro - + The CSync thread terminated. A thread CSync foi terminada. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". Esta sincronização irá remover todos os arquivos na pasta de sincronização local '%1'. Se você ou o administrador tiver que redefinir a sua conta no servidor, escolha "Manter arquivos". Se você deseja que seus dados sejam removidos, escolha "Remover todos os arquivos". - + 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? @@ -538,17 +506,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? Remover Todos os Arquivos? - + Remove all files Remover Rodos os Arquivos - + Keep files Manter arquivos @@ -556,62 +524,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. - + 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 - + %1 (Sync is paused) %1 (Pausa na Sincronização) @@ -650,8 +618,8 @@ documentação por possíveis correções. Mirall::FolderWizard - - + + Add Folder Adicionar Pasta @@ -659,42 +627,42 @@ documentação por possíveis correções. Mirall::FolderWizardSourcePage - + No local folder selected! Nenhuma pasta local selecionada! - + 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.<br/>Please pick another one! O caminho local %1 já é uma pasta de upload.<br/>escolha outra, por favor! - + An already configured folder is contained in the current entry. Uma pasta já configurada já está contida na entrada atual. - + An already configured folder contains the currently entered directory. Uma pasta já configurada já contém o diretório selecionado. - + The alias can not be empty. Please provide a descriptive alias word. O apelido não pode estar vazio. Coloque um apelido que seja descritivo, por favor. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>O apelido <i>%1</i> já está em uso. Escolha outro apelido, por favor. - + Select the source folder Selecione a pasta de origem @@ -702,42 +670,42 @@ documentação por possíveis correções. Mirall::FolderWizardTargetPage - + 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.<br/>Please check manually. Falha ao criar pasta em %1.<br/>Por favor verifique manualmente. - + Choose this to sync the entire account Escolha esta opção para sincronizar a conta inteira - + This directory is already being synced. Este diretório já está sendo sincronizado. - + 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 pai de <i>%2</i>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. Se você sincronizar a pasta raiz, você <b> não </b>pode configurar outro diretório de sincronização. @@ -751,8 +719,8 @@ documentação por possíveis correções. - General - Geral + General Setttings + @@ -794,7 +762,7 @@ documentação por possíveis correções. Remover - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. @@ -802,29 +770,29 @@ Checked items will also be deleted if they prevent a directory from being remove Itens marcados também serão excluídos se estiverem impedindo a remoção de um diretório. Isso é útil para metadados. - + Could not open file Não foi possível abrir o arquivo - + Cannot write changes to '%1'. Não é possível gravar as alterações em '%1'. - - + + Add Ignore Pattern Adicionar Ignorar Padrão - - + + Add a new ignore pattern: Adicionar um novo padrão ignorar: - + This entry is provided by the system at '%1' and cannot be modified in this view. Esta entrada é fornecida pelo sistema em '%1' e não pode ser modificado aqui. @@ -832,52 +800,52 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u Mirall::LogBrowser - + Log Output Saída de Log - + &Search: Bu&scar - + &Find Localizar (&F) - + Clear Limpar - + Clear the log display. Limpar exibição de log. - + S&ave S&alvar - + Save the log file to a file on disk for debugging. Salvar arquivo de log para um arquivo no disco para depuração. - + Error Erro - + Save log file Salvar arquivo de log - + Could not write to log file Incapaz de gravar arquivo de log @@ -999,47 +967,47 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u Mirall::OwncloudAdvancedSetupPage - + Connect to %1 Conectado a %1 - + Setup local folder options Configurar opções de pastas locais - + Connect... Conectar... - + Your entire account will be synced to the local folder '%1'. Toda a sua conta será sincronizado com a pasta local '%1'. - + %1 folder '%2' is synced to local folder '%3' %1 Pasta '% 2' está sincronizada com pasta local '% 3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> <p><small><strong> Atenção: </strong> Você está atualmente com várias pastas configuradas. Se você continuar com as configurações atuais, as configurações de pasta serão descartadas e uma única sincronizaçãoda pasta raiz será criada! </small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> <p><small><strong>Atenção:</strong> O diretório local não está vazio. Escolha a resolução!</small></p> - + Local Sync Folder Sincronizar Pasta Local - + Update advanced setup Atualizar configuração avançada @@ -1047,44 +1015,21 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u Mirall::OwncloudHttpCredsPage - + Connect to %1 Conectar a %1 - + Enter user credentials Entre com suas credenciais - + Update user credentials Atualizar credenciais do usuário - - Mirall::OwncloudPropagator - - - Aborted - Abortado - - - - Could not remove directory %1 - O diretório %1 não pode ser removido - - - - This folder must not be renamed. It is renamed back to its original name. - Esta pasta não pode ser renomeada. Ele 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. - - Mirall::OwncloudSetupPage @@ -1108,7 +1053,7 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u Este URL não é seguro. Você não deve usá-lo. - + Update %1 server Atualizar servidor %1 @@ -1116,129 +1061,126 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u Mirall::OwncloudSetupWizard - + Folder rename failed Falha no nome da pasta - + 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 o backup da pasta porque a pasta ou um arquivo que está na pasta, está aberto em outro program. Por favor feche a pasta ou o arquivo e clique novamente ou cancelar a configuração. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - Tentar conectar a %1 em %2 para determinar tipo de autenticação... - - - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Conectado com sucesso a %1: versão %2 %3 (%4)</font><br/><br/> - - Failed to connect to %1:<br/>%2 - Falha na conexão para %1:<br/>%2 - - - + 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 - - The remote folder could not be accessed! - A pasta remota não pôde ser acessada! + + + Failed to connect to %1 at %2:<br/>%3 + - + + No remote folder specified! + + + + 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 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">Prováveis 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>. 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. @@ -1246,7 +1188,7 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u Mirall::OwncloudWizard - + %1 Connection Wizard %1 Assistente de conexões @@ -1254,27 +1196,27 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u Mirall::OwncloudWizardResultPage - + Open %1 Abrir %1 - + Open Local Folder Abrir Pasta Local - + Everything set up! Tudo configurado! - + Your entire account is synced to the local folder <i>%1</i> Toda a sua conta está sincronizada com a pasta local <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> %1 pasta <i>%1</i> está sincronizada com a pasta local <i>%2</i> @@ -1288,8 +1230,8 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u - Detailed Sync Protocol - Protocolo de Sincronização Detalhado + Detailed Sync Status + @@ -1418,8 +1360,8 @@ enquanto o arquivo do lado do servidor está disponível sob o nome original - The sync protocol has been copied to the clipboard. - O protocolo de sincronização foi copiado para a área de transferência. + The sync status has been copied to the clipboard. + @@ -1440,31 +1382,55 @@ enquanto o arquivo do lado do servidor está disponível sob o nome originalConfigurações - + %1 %1 - - Protocol - Protocolo + + Status + - + General Geral - + Network Rede - + Account Conta + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1479,67 +1445,67 @@ enquanto o arquivo do lado do servidor está disponível sob o nome original - + SSL Connection Conexão SSL - + Warnings about current SSL Connection: Avisos sobre a conexão SSL atual: - + with Certificate %1 com Certificado %1 - - - + + + &lt;not specified&gt; &lt;não especificado&gt; - - + + Organization: %1 Organização: %1 - - + + Unit: %1 Unidade: %1 - - + + Country: %1 País: %1 - + Fingerprint (MD5): <tt>%1</tt> Fingerprint/Identificação (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Fingerprint/Identificação (SHA1): <tt>%1</tt> - + Effective Date: %1 Data efetiva: %1 - + Expiry Date: %1 Data de expiração: %1 - + Issuer: %1 Emissor: %1 @@ -1557,17 +1523,17 @@ enquanto o arquivo do lado do servidor está disponível sob o nome original<p>Uma nova versão do Cliente %1 está disponível.</p><p><b>%2</b> está disponível para baixar. A versão instalada é %3.<p> - + Skip update Pular atualização - + Skip this time Pular desta vêz - + Get update Atualizar @@ -1575,169 +1541,116 @@ enquanto o arquivo do lado do servidor está disponível sob o nome original Mirall::ownCloudGui - + %1 Sync Started %1 Sincronização Iniciada - + Sync started for %n configured sync folder(s). Sincronização iniciada para %n pasta(s) configurada(s).Sincronização iniciada para %n pasta(s) configurada(s). - + 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 - + 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 - + %1 (%2, %3) %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) Sincronizando %1 de %2 (%3 de %4) - + Up to date Até a data - - Mirall::ownCloudInfo - - - Proxy Refused Connection - Conexão Rejeitada pelo Proxy - - - - The configured proxy has refused the connection. Please check the proxy settings. - O proxy configurado recusou a conexão. Por favor, verifique as configurações do proxy. - - - - Proxy Closed Connection - Proxy Conexão fechada - - - - The configured proxy has closed the connection. Please check the proxy settings. - O proxy configurado fechou a conexão. Por favor, verifique as configurações do proxy. - - - - Proxy Not Found - Proxy Não Encontrado - - - - The configured proxy could not be found. Please check the proxy settings. - O proxy configurado para não pôde ser encontrado. Por favor, verifique as configurações do proxy. - - - - Proxy Authentication Error - Erro de Autenticação Proxy - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - O proxy configurado requer login, mas as credenciais de proxy são inválidos. Por favor, verifique as configurações do proxy. - - - - Proxy Connection Timed Out - Conexão Proxy Expirou - - - - The connection to the configured proxy has timed out. - A conexão com o proxy configurado expirou. - - OwncloudAdvancedSetupPage @@ -2003,6 +1916,35 @@ enquanto o arquivo do lado do servidor está disponível sob o nome originalAperteoBotão + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2034,12 +1976,12 @@ enquanto o arquivo do lado do servidor está disponível sob o nome original main.cpp - + System Tray not available Bandeja do Sistema não disponível - + %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 requer em uma bandeja do sistema de trabalho. Se você estiver executando o XFCE, siga <a href="http://docs.xfce.org/xfce/xfce4-panel/systray"> estas instruções </a>. Caso contrário, instale uma aplicação da bandeja do sistema, como 'trayer' e tente novamente. @@ -2082,7 +2024,7 @@ enquanto o arquivo do lado do servidor está disponível sob o nome original - + Context Contexto @@ -2108,44 +2050,60 @@ enquanto o arquivo do lado do servidor está disponível sob o nome original - + deleted excluído - - + + + Move + + + + + downloading baixando - - + + uploading enviando - + inactive inativo - + starting iniciando - + finished finalizado - + delete remover + + + move + + + + + moved + + theme diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts index 9d17ca17c..2d9f5cc03 100644 --- a/translations/mirall_ru.ts +++ b/translations/mirall_ru.ts @@ -77,11 +77,6 @@ Modify Account Изменить учётную запись - - - Sync Status - Синхронизация статуса - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause Пауза @@ -103,6 +98,11 @@ Add Folder... Добавить папку... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ Использование хранилища - + 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> - - Checking %1 connection... - Проверка %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 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. Соединились с <a href="%1">%2</a>. - - Version: %1 (%2) - Версия: %1 (%2) - - - - unknown problem. - неизвестные проблемы. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>Не удалось подключиться к %1: <tt>%2</tt></p> - - - + Start Начать - + Currently Сейчас - + Completely Полностью - + %1 %2 %3 (%4 of %5) %1 %2 %3 (%4 из %5) - + Completely finished. Полностью завершено. - + %1 of %2, file %3 of %4 %1 из %2, файл %3 из %4 - - %1 of %2 in use. - Используется %1 из %2. + + Connected to <a href="%1">%2</a> as <i>%3</i>. + - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. В данный момент информация о заполненности хранилища недоступна. @@ -244,7 +239,7 @@ CSync failed to load the state db. - CSync не удалось загрузить состояние базы данных. + CSync не удалось загрузить базу данных состояния. @@ -304,7 +299,7 @@ A remote file can not be written. Please check the remote access. - Удаленный файл не может быть записан. Пожалуйста, ознакомьтесь с удаленным доступом. + Удаленный файл не может быть записан. Пожалуйста, проверьте удаленный доступ. @@ -357,6 +352,11 @@ CSync unspecified error. Неизвестная ошибка CSync. + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -375,161 +375,129 @@ Aborted by the user - + Прервано пользователем An internal error number %1 happend. - Внутренний номер ошибки %1. + Произошла внутренняя ошибка номер %1. Mirall::ConnectionValidator - - No ownCloud connection configured - Не настроено подключение к ownCloud + + No ownCloud account configured + - + The configured server for this client is too old Настроенный сервер слишком стар для этого клиента - + Please update to the latest server and restart the client. Пожалуйста, обновите сервер до последней версии и перезапустите клиент. - + Unable to connect to %1 Невозможно подключиться к %1 - + The provided credentials are not correct Введённые учётные данные не верны - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - Ни одного введённого пароля не нашлось в ключевой цепочке. Пожалуйста, переконфигурируйте. - - Mirall::Folder - + Unable to create csync-context Невозможно создать контекст csync - + Local folder %1 does not exist. Локальный каталог %1 не существует. - + %1 should be a directory but is not. %1 должен быть каталогом, но не является таковым. - + %1 is not readable. %1 не читается. - + File %1: %2 Файл %1: %2 - + + File %1 Файл %1 - - New file available - Доступен новый файл + + downloaded + - - '%1' has been synced to this machine. - '%1' было синхронизировано с этой машиной. + + removed + - - New files available - Доступны новые файлы - - - - '%1' and %n other file(s) have been synced to this machine. - '%1' и ещё %n файл были синхронизированы с этой машиной.'%1' и ещё %n файла были синхронизированы с этой машиной.'%1' и ещё %n файлов были синхронизированы с этой машиной. + + updated + - - File removed - Файл удален + + renamed + - - '%1' has been removed. - '%1' был удален. + + '%1' has been %2. + - - Files removed - Файлы удалены - - - - '%1' and %n other file(s) have been removed. - '%1' и ещё %n другой файл были удалены.'%1' и ещё %n других файла были удалены.'%1' и ещё %n других файлов были удалены. + + Files %1 + - - File updated - Файл обновлен + + '%1' and %2 other files have been %3. + - - '%1' has been updated. - '%1' был обновлен. - - - - Files updated - Файлы обновлены - - - - '%1' and %n other file(s) have been updated. - '%1' и ещё %n другой файл были обновлены.'%1' и ещё %n других файла были обновлены.'%1' и ещё %n других файлов были обновлены. - - - + Error Ошибка - + The CSync thread terminated. CSync поток закрыт. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". Это действие может удалить все файлы в локальной папке '%1'. Если вы или ваш администратор заново создали вашу учётную запись на сервере, выберите "Сохранить файлы". Если вы хотите стереть всё - выберите "Удалить все файлы". - + 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? @@ -538,17 +506,17 @@ Are you sure you want to perform this operation? Вы уверены, что хотите выполнить операцию? - + Remove All Files? Удалить все файлы? - + Remove all files Удалить все файлы - + Keep files Сохранить файлы @@ -556,62 +524,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. Идет синхронизация. - + Server is currently not available. Сервер недоступен. - + Last Sync was successful. Последняя синхронизация прошла успешно. - + Last Sync was successful, but with warnings on individual files. Последняя синхронизация прошла успешно, но были предупреждения о нескольких файлах. - + Setup Error. Ошибка установки. - + User Abort. - + Отмена пользователем. - + %1 (Sync is paused) %! (синхронизация приостановлена) @@ -650,8 +618,8 @@ documentation for possible fixes. Mirall::FolderWizard - - + + Add Folder Добавить папку @@ -659,42 +627,42 @@ documentation for possible fixes. Mirall::FolderWizardSourcePage - + No local folder selected! Локальная папка не выбрана! - + You have no permission to write to the selected folder! У вас нет права записывать в выбранной папке! - + The local path %1 is already an upload folder.<br/>Please pick another one! - Локальный путь %1 уже имеет папку загрузки.<br/>Пожалуйста, выберите другой! + Локальный путь %1 уже является папкой загрузки.<br/>Пожалуйста, выберите другой! - + An already configured folder is contained in the current entry. - Уже настроенные папки содержатся в текущей записи. + В текущей записи уже есть настроенная папка. - + An already configured folder contains the currently entered directory. - Уже настроенные папки содержатся в текущем каталоге. + В текущем каталоге уже есть настроенная папка. - + The alias can not be empty. Please provide a descriptive alias word. Псевдоним не может быть пустым. Пожалуйста, укажите описательное слово псевдонима. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>Псевдоним <i>%1</i> уже используется. Пожалуйста, выберите другой псевдоним. - + Select the source folder Выберите исходную папку @@ -702,42 +670,42 @@ documentation for possible fixes. Mirall::FolderWizardTargetPage - + Add Remote Folder Добавить удалённую папку - + Enter the name of the new folder: Введите имя новой папки: - + Folder was successfully created on %1. Папка была успешно создана на %1. - + Failed to create the folder on %1.<br/>Please check manually. Не удалось создать папку на %1.<br/>Пожалуйста, проверьте вручную. - + Choose this to sync the entire account Выберите это для синхронизации всей учётной записи - + This directory 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>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. Если вы синхронизируете корневую папку, то <b>не сможете</b> конфигурировать другие папки для синхронизации. @@ -751,8 +719,8 @@ documentation for possible fixes. - General - Главные + General Setttings + @@ -794,7 +762,7 @@ documentation for possible fixes. Удалить - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. @@ -803,29 +771,29 @@ Checked items will also be deleted if they prevent a directory from being remove Выбранные элементы также будут удалены если они не позволят удалить папку. Это полезно для метаданных. - + Could not open file Невозможно открыть файл - + Cannot write changes to '%1'. Невозможно записать изменения для '%1'. - - + + Add Ignore Pattern Добавить шаблон игнорирования - - + + Add a new ignore pattern: Добавить новый шаблон игнорирования - + This entry is provided by the system at '%1' and cannot be modified in this view. Эта запись сделана системой в '%1' и не может быть изменена здесь. @@ -833,52 +801,52 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::LogBrowser - + Log Output Выйти - + &Search: &Поиск: - + &Find &Найти - + Clear Очистить - + Clear the log display. Очистить журнал. - + S&ave Сохранить - + Save the log file to a file on disk for debugging. Сохранить файл журнала на диск для отладки. - + Error Ошибка - + Save log file Сохранить файл журнала - + Could not write to log file Файл журнала не может быть записан @@ -1000,47 +968,47 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudAdvancedSetupPage - + Connect to %1 Подключиться к %1 - + Setup local folder options Настроить локальные папки - + Connect... Соединение... - + Your entire account will be synced to the local folder '%1'. Вся ваша учётная запись будет синхронизирована с локальной папкой '%1'. - + %1 folder '%2' is synced to local folder '%3' %1 папка '%2' синхронизирована с локальной папкой '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> <p><small><strong>Внимание:</strong> У вас настроено несколько папок. Если вы продолжите с текущими настройками, настройки папок будут отменены и будет создана одна корневая папка!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> <p><small><strong>Внимание:</strong> Локальная папка не пуста. Выберите разрешение</small></p> - + Local Sync Folder Локальная папка для синхронизации - + Update advanced setup Обновить дополнительные настройки @@ -1048,44 +1016,21 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudHttpCredsPage - + Connect to %1 Подключиться к %1 - + Enter user credentials Ввести учётные данные - + Update user credentials Обновить учётные данные - - Mirall::OwncloudPropagator - - - Aborted - - - - - Could not remove directory %1 - - - - - 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. - - - Mirall::OwncloudSetupPage @@ -1096,7 +1041,7 @@ Checked items will also be deleted if they prevent a directory from being remove Setup %1 server - + Настроить %1 сервер @@ -1109,137 +1054,134 @@ Checked items will also be deleted if they prevent a directory from being remove Данный URL НЕ БЕЗОПАСЕН. Вам не следует использовать его. - + Update %1 server - + Обновить %1 сервер Mirall::OwncloudSetupWizard - + Folder rename failed Ошибка переименования папки - + 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. Невозможно стереть папку и создать её резервную копию так как папка или файл в ней открыты в другой программе. Пожалуйста закройте папку или файл и повторите попытку, либо прервите мастер настройки. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - Пытаюсь подключиться к %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/> - - Failed to connect to %1:<br/>%2 - Не удалось подключиться к %1:<br/>%2 - - - + 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 - - The remote folder could not be accessed! - Не удалось получить доступ к удаленной папке! + + + 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 не воможно. Пожалуйста, проверьте еще раз. @@ -1247,7 +1189,7 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizard - + %1 Connection Wizard %1 Мастер соединения @@ -1255,29 +1197,29 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizardResultPage - + Open %1 Открыть %1 - + Open Local Folder Открыть локальную папку - + Everything set up! Всё готово! - + Your entire account is synced to the local folder <i>%1</i> Ваша учетная запись полностью синхронизирована с локальной папкой <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> - + %1 папка <i>%1</i> синхронищирована с локальной папкой <i>%2</i> @@ -1289,8 +1231,8 @@ Checked items will also be deleted if they prevent a directory from being remove - Detailed Sync Protocol - Подробная информация о протоколе + Detailed Sync Status + @@ -1421,8 +1363,8 @@ name - The sync protocol has been copied to the clipboard. - Протокол синхронизации скопирован в буфер обмена + The sync status has been copied to the clipboard. + @@ -1443,31 +1385,55 @@ name Конфигурация - + %1 %1 - - Protocol + + Status - + General Главные - + Network Сеть - + Account Аккаунт + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1482,67 +1448,67 @@ name - + SSL Connection SSL соединение - + Warnings about current SSL Connection: Предупреждения о текущем SSL соединении: - + with Certificate %1 Сертификат %1 - - - + + + &lt;not specified&gt; &lt;не указано&gt; - - + + Organization: %1 Организация: %1 - - + + Unit: %1 Подразделение: %1 - - + + Country: %1 Страна: %1 - + Fingerprint (MD5): <tt>%1</tt> Отпечаток (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Отпечаток (SHA1): <tt>%1</tt> - + Effective Date: %1 Дата вступления в силу: %1 - + Expiry Date: %1 Срок действия: %1 - + Issuer: %1 Издатель: %1 @@ -1560,17 +1526,17 @@ name <p>Новая версия программы-клиента %1 доступна.</p><p><b>%2</b> доступна для скачивания. Установленная версия %3.<p> - + Skip update Пропустить обновление - + Skip this time Пропустить в этот раз - + Get update Получить обновление @@ -1578,169 +1544,116 @@ name Mirall::ownCloudGui - + %1 Sync Started %1 Синхронизация начата - + Sync started for %n configured sync folder(s). Синхронизация начата для %n выбранной папки.Синхронизация начата для %n выбранных папок.Синхронизация начата для %n выбранных папки(ок). - + 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 - + Quota n/a Квота недоступна - + %1% of %2 in use Используется %1% из %2. - + No items synced recently Недавно ничего не синхронизировалсь - + %1 (%2, %3) %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) Синхронизируются %1 из %2 (%3 из %4) - + Up to date Актуальная версия - - Mirall::ownCloudInfo - - - Proxy Refused Connection - Прокси отверг соединение - - - - The configured proxy has refused the connection. Please check the proxy settings. - Прокси сервер отверг соединение. Пожалуйста проверьте настройки прокси. - - - - Proxy Closed Connection - Прокси закрыл соединение - - - - The configured proxy has closed the connection. Please check the proxy settings. - Прокси сервер закрыл соединение. Пожалуйста проверьте настройки прокси. - - - - Proxy Not Found - Прокси не найден - - - - The configured proxy could not be found. Please check the proxy settings. - Прокси сервер не найден. Пожалуйста проверьте настройки прокси. - - - - Proxy Authentication Error - Ошибка авторизации прокси - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - Прокси сервер требует аутентификации, но данные учётной записи не верны. Пожалуйста проверьте настройки прокси. - - - - Proxy Connection Timed Out - Нет ответа от прокси - - - - The connection to the configured proxy has timed out. - Время ожидания при соединении с настроенным прокси истекло - - OwncloudAdvancedSetupPage @@ -1979,7 +1892,7 @@ name Enter the URL of the server that you want to connect to (without http or https). - + Введите URL сервера к которому вы хотите подключиться (без http:// и https://). @@ -2006,6 +1919,35 @@ name Нажатькнопку + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2037,12 +1979,12 @@ name main.cpp - + System Tray not available System Tray не доступна - + %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 требует работающего системного трея. Если вы используете XFCE, следуйте <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">этим инструкциям</a>. В противном случае, установите приложение системного трея, например, 'trayer', и попробуйте ещё раз. @@ -2087,7 +2029,7 @@ name - + Context Контекст @@ -2113,44 +2055,60 @@ name - + deleted удален - - + + + Move + + + + + downloading скачиваю - - + + uploading загружаю на сервер - + inactive неактивно - + starting начинается - + finished завершено - + delete удалить + + + move + + + + + moved + + theme @@ -2202,7 +2160,7 @@ name Aborting... - + Прерывание... \ No newline at end of file diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts index d9d68a38e..82354969d 100644 --- a/translations/mirall_sk.ts +++ b/translations/mirall_sk.ts @@ -70,18 +70,13 @@ Edit Ignored Files - Úprava ingorovaných súborov + Upraviť ignorované súbory Modify Account Upraviť účet - - - Sync Status - Synchronizovať stav - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause Pauza @@ -103,6 +98,11 @@ Add Folder... Pridať priečinok... + + + Accounts to Synchronize + + Info... @@ -114,120 +114,115 @@ 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, zahŕňajúc sieťové alebo zdieľané, 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ť resetovanie 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 resetovať 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 odporučenie od správcu.</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> - - Checking %1 connection... - Kontrolujem %1 spojenie... - - - + No %1 connection configured. Žiadne nakonfigurované %1 spojenie - + Sync Running - Prebiehajúca synchronizácia. + Prebiehajúca synchronizácia - + + No account configured. + + + + The syncing operation is running.<br/>Do you want to terminate it? Proces synchronizácie práve prebieha.<br/>Chcete ho ukončiť? - + + %1 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. Pripojené k <a href="%1">%2</a>. - - Version: %1 (%2) - Verzia: %1 (%2) - - - - unknown problem. - neznámy problém. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>Nemožno pripojiť na %1: <tt>%2</tt></p> - - - + Start Štart - + Currently Aktuálne - + Completely Úplne - + %1 %2 %3 (%4 of %5) %1 %2 %3 (%4 z %5) - + Completely finished. Úplne dokončené. - + %1 of %2, file %3 of %4 %1 z %2, súbor %3 z %4 - - %1 of %2 in use. - %1 z %2 v používaní. + + Connected to <a href="%1">%2</a> as <i>%3</i>. + - - Currently there is no storage usage information available. + + No connection to %1 at <a href="%1">%2</a>. + + + Currently there is no storage usage information available. + Teraz nie sú k dispozícii žiadne informácie o využití úložiska. + Mirall::CSyncThread @@ -249,7 +244,7 @@ CSync failed to write the state db. - + CSync zlyhal pri zápise do databázy stavu. @@ -309,7 +304,7 @@ The local filesystem can not be written. Please check permissions. - Lokálny súborový systém nie je možné zapísať. Prosím skontrolujte povolenia. + Do lokálneho súborového systému nie je možné zapisovať. Prosím skontrolujte povolenia. @@ -319,7 +314,7 @@ CSync could not authenticate at the proxy. - + CSync sa nemohol prihlásiť k proxy. @@ -357,6 +352,11 @@ CSync unspecified error. CSync nešpecifikovaná chyba. + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -375,7 +375,7 @@ Aborted by the user - + Zrušené používateľom @@ -386,169 +386,137 @@ Mirall::ConnectionValidator - - No ownCloud connection configured + + No ownCloud account configured + + + The configured server for this client is too old + Nakonfigurovaný server pre tohto klienta je príliš starý + + + + Please update to the latest server and restart the client. + Prosím aktualizujte na najnovšiu verziu servera a reštartujte klienta. + - The configured server for this client is too old - - - - - Please update to the latest server and restart the client. - - - - Unable to connect to %1 - + Nedá sa pripojiť k %1 - + The provided credentials are not correct - - - - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - V kľúčenke nebolo nájdené heslo. Prosím, rekonfigurujte. + Poskytnuté poverenia nie sú správne Mirall::Folder - + Unable to create csync-context Nemožno vytvoriť "csync-kontext" - + Local folder %1 does not exist. Lokálny priečinok %1 neexistuje. - + %1 should be a directory but is not. %1 by mal byť priečinok, avšak nie je. - + %1 is not readable. %1 nie je čitateľný. - + File %1: %2 Súbor %1: %2 - + + File %1 Súbor %1 - - New file available - Nový súbor dostupný + + downloaded + - - '%1' has been synced to this machine. - '%1' bol synchronizovaný do tohto stroja. + + removed + - - New files available - Nové súbory dostupné - - - - '%1' and %n other file(s) have been synced to this machine. - + + updated + - - File removed - Súbor odstránený + + renamed + - - '%1' has been removed. - '%1' bol odstránený. + + '%1' has been %2. + - - Files removed - Súbory odstránené - - - - '%1' and %n other file(s) have been removed. - + + Files %1 + - - File updated - Súbor aktualizovaný + + '%1' and %2 other files have been %3. + - - '%1' has been updated. - '%1' bol aktualizovaný. - - - - Files updated - Súbory aktualizované - - - - '%1' and %n other file(s) have been updated. - - - - + Error Chyba - + The CSync thread terminated. Vlákno "CSync" ukončené. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". - Daná synchronizácia odstáni všetky súbory v lokálnom synchronizačnom priečinku '%1'. -Pokiaľ vy alebo váš správca resetoval váš účet na serveri, vyberte "Ponechať súbory". Pokiaľ chcete odstrániť vaše dáta, vyberte "Odstrániť všetky súbory". + Táto synchronizácia odstráni všetky súbory v lokálnom synchronizačnom priečinku '%1'. +Pokiaľ vy alebo váš správca zresetoval váš účet na serveri, vyberte možnosť "Ponechať súbory". Pokiaľ chcete odstrániť vaše dáta, vyberte možnosť "Odstrániť všetky súbory". - + 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? - Dan synchronizácia odstráni všetky súbory v synchronizačnom priečinku '%1'. + Táto synchronizácia odstráni všetky súbory v synchronizačnom priečinku '%1'. Toto môže byť kvôli tichej rekonfigurácii priečinka, prípadne boli všetky súbory manuálne odstránené. 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 @@ -556,62 +524,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. - + Server is currently not available. Sever momentálne nie je prístupný. - + Last Sync was successful. Posledná synchronizácia ú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šenie používateľom - + %1 (Sync is paused) %1 (Synchronizácia zapauzovaná) @@ -642,7 +610,7 @@ Ste si istý, že chcete uskutočniť danú operáciu? Could not monitor directories due to system limitations. The application will not work reliably. Please check the documentation for possible fixes. - Nebolo možné monitorovať adresáre pre systémové obmedzenia. + Nebolo možné monitorovať priečinky pre systémové obmedzenia. Aplikácia nebude fungovať spoľahlivo. Prosím skontrolujte dokumentáciu pre možné riešenia. @@ -650,8 +618,8 @@ dokumentáciu pre možné riešenia. Mirall::FolderWizard - - + + Add Folder Pridať priečinok @@ -659,42 +627,42 @@ dokumentáciu pre možné riešenia. Mirall::FolderWizardSourcePage - + No local folder selected! - Nevybraný žiadny lokálny priečinok! + Nie je vybraný žiadny 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.<br/>Please pick another one! Lokálna cesta %1 už je "upload" priečinkom.<br/>Prosím vyberte inú! - + An already configured folder is contained in the current entry. V aktuálnej položke je už obsiahnutý rovnaký konfigurovaný priečinok. - + An already configured folder contains the currently entered directory. V aktuálnom priečinku je už obsiahnutý rovnaký konfigurovaný podpriečinok. - + The alias can not be empty. Please provide a descriptive alias word. - Alias nesmie byť prázdny. Prosím poskytnite charakterizujúci alias. + Alias nesmie byť prázdny. Prosím uveďte názov charakterizujúci alias. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>Alias <i>%1</i> sa už používa. Vyberte prosím iný. - + Select the source folder Vyberte zdrojový priečinok @@ -702,44 +670,44 @@ dokumentáciu pre možné riešenia. Mirall::FolderWizardTargetPage - + 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.<br/>Please check manually. - Nemožno vytvoriť priečinok na %1.<br/>Prosím skontrolujte manuálne. + Nemožno vytvoriť priečinok na %1.<br/>Prosím skontrolujte to ručne. - + Choose this to sync the entire account Zvoľte pre synchronizáciu celého účtu - + This directory is already being synced. - + Tento priečinok je už synchronizovaný. - + 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>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. - Pokiaľ synchronizujete koreňový priečinok, <b>nemôžte</b> nakonfigurovať synchronizáciu iného adresára. + Ak synchronizujete koreňový priečinok, <b>nemôžte</b> nakonfigurovať synchronizáciu iného priečinka. @@ -751,8 +719,8 @@ dokumentáciu pre možné riešenia. - General - Všeobecné + General Setttings + @@ -794,91 +762,91 @@ dokumentáciu pre možné riešenia. Odobrať - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. - Súbory alebo adresáre spĺňajúce daný vzor nebudú synchronizované. + Súbory alebo priečinky spĺňajúce daný vzor nebudú synchronizované. Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri odstraňovaní. Toto je užitočné pre metadáta. - + Could not open file Nemožno otvoriť súbor - + Cannot write changes to '%1'. Nemožno zapísať zmeny do '%1'. - - - - Add Ignore Pattern - Pridať ignorovací vzor - - Add a new ignore pattern: - Pridať nový ignorovací vzor: + Add Ignore Pattern + Pridať vzor ignorovaného súboru - + + + Add a new ignore pattern: + Pridať nový vzor ignorovaného súboru: + + + This entry is provided by the system at '%1' and cannot be modified in this view. - Daná položka je poskytovaná systémom na '%1' a nesmie byť modifikovaná v tomto zobrazení. + Táto položka je poskytovaná systémom na '%1' a nesmie byť modifikovaná v tomto zobrazení. Mirall::LogBrowser - + Log Output Systémový záznam (log) - + &Search: &Hľadať: - + &Find &Nájsť - + Clear Vyčistiť - + Clear the log display. Vyčistiť zobrazenie záznamu (logu). - + S&ave &Uložiť - + Save the log file to a file on disk for debugging. Uložiť log súbor do súboru na disk pre proces debugovania. - + Error Chyba - + Save log file Uložiť súbor so záznamami (log) - + Could not write to log file Nemožno zapísať do záznamového súboru (logu) @@ -941,13 +909,13 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods Download Bandwidth - Dátová šírka downlinku + Dátová šírka pre download Limit to - Limitovať na + Limitovať do @@ -964,7 +932,7 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods Upload Bandwidth - Dátová šírka uplinku + Dátová šírka pre upload @@ -979,7 +947,7 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods Username for proxy server - Užívateľské meno pre proxy server + Používateľské meno pre proxy server @@ -1000,47 +968,47 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods Mirall::OwncloudAdvancedSetupPage - + Connect to %1 Pripojené k %1 - + Setup local folder options Nastaviť možnosti lokálneho priečinku - + Connect... Pripojiť... - + Your entire account will be synced to the local folder '%1'. - Váš celý účet bude synchronizovaný do lokálneho priečinka '%1'. + Váš celý účet bude zosynchronizovaný do lokálneho priečinka '%1'. - + %1 folder '%2' is synced to local folder '%3' %1 priečinok '%2' je synchronizovaný do lokálneho priečinka '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> - <p><small><strong>Varovanie:</strong> V súčasnosti máte nakonfigurovaných viac priečinkov. Pokiaľ budete pokračovať z danými nastaveniami, konfigurácie priečinkov budú zabudnuté a jednotný koreňový priečinok bude nasledovne vytvorený!</small></p> + <p><small><strong>Varovanie:</strong> V súčasnosti máte nakonfigurovaných viac priečinkov. Pokiaľ budete pokračovať z danými nastaveniami, konfigurácie priečinkov budú zabudnuté a jednotný koreňový priečinok bude následne vytvorený!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> - <p><small><strong>Varovanie:</strong> Lokálny adresár nie je prázdny. Vyberte riešenie!</small></p> + <p><small><strong>Varovanie:</strong> Lokálny priečinok nie je prázdny. Vyberte riešenie!</small></p> - + Local Sync Folder Lokálny synchronizačný priečinok - + Update advanced setup Aktualizovať pokročilé nastavenie @@ -1048,44 +1016,21 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods Mirall::OwncloudHttpCredsPage - + Connect to %1 Pripojiť k %1 - + Enter user credentials Vložte prihlasovacie údaje - + Update user credentials Aktualizovať prihlasovacie údaje - - Mirall::OwncloudPropagator - - - Aborted - - - - - Could not remove directory %1 - - - - - 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. - - - Mirall::OwncloudSetupPage @@ -1096,7 +1041,7 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods Setup %1 server - + Nastaviť server %1 @@ -1109,145 +1054,142 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods Táto URL nie je bezpečná. Nemali by ste ju používať. - + Update %1 server - + Updatovať server %1 Mirall::OwncloudSetupWizard - + Folder rename failed Premenovanie priečinka zlyhalo - + 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 zálohovať priečinok, pretože priečinok alebo súbor v ňom je využívaný iným programom. Prosím zatvorte priečinok alebo súbor a proces opakujte alebo zrušte inštaláciu. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - Pokus o pripojenie k %1 na %2 pre zistenie autentifikačného typu... - - - + <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/> - - Failed to connect to %1:<br/>%2 - Nepodarilo sa pripojiť k %1:<br/>%2 - - - + 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 synch. priečinka %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ť miestny priečinok %1 - - The remote folder could not be accessed! - Vzdialený priečinok nie je dostupný! + + + Failed to connect to %1 at %2:<br/>%3 + - + + No remote folder specified! + + + + 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 úspešne vytvorený. + 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 z HTTP chybovým kódom %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, nakoľko použité prihlasovacie údaje sú nesprávne!<br/>Prosím skontrolujte vaše údaje a skúste znova.</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 vzidaleného priečinka %2 bolo práve nastavené. + 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 znova. + Pripojenie k %1 nemohlo byť iniciované. Prosím skontrolujte to znovu. Mirall::OwncloudWizard - + %1 Connection Wizard %1 Asistent pripojenia @@ -1255,29 +1197,29 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods Mirall::OwncloudWizardResultPage - + Open %1 Otvoriť %1 - + Open Local Folder - Otvoriť miestny priečinok + Otvoriť lokálny priečinok - + Everything set up! Všetko je nastavené! - + Your entire account is synced to the local folder <i>%1</i> Váš celý účet bol synchronizovaný z lokálnym priečinkom <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> - + Priečinok %1 <i>%1</i> je synchronizovaný do lokálneho priečinka <i>%2</i> @@ -1289,8 +1231,8 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods - Detailed Sync Protocol - Detailný záznam synchronizácie + Detailed Sync Status + @@ -1305,7 +1247,7 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods TextLabel - TextLabel + Štítok @@ -1340,13 +1282,14 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods Soft Link ignored - + Symbolický odkaz je ignorovaný Softlinks break the semantics of synchronization. Please do not use them in synced directories - + Symbolické odkazy narušujú sémantiku synchronizácie. +Prosím, nepoužívajte ich v synchronizovaných priečinkoch @@ -1363,39 +1306,43 @@ Please do not use them in synced directories The %1 was ignored because it is listed in the clients ignore list or the %1 name contains characters that are not syncable in a cross platform environment - + Položka %1 bola ignorovaná, pretože je na zozname ignorovaných v synchronizačnom klientovi +alebo názov %1 obsahuje znaky nesynchronizovateľné +v prostredí viacerých platforiem Item ignored - + Položka je ignorovaná %1 on ignore list - + %1 v zozname ignorovaných The %1 was skipped because it is listed on the clients list of names to ignore - + Položka %1 bola preskočená, pretože je na zozname +ignorovaných názvov v synchronizačnom klientovi Invalid characters - + Neplatné znaky The %1 name contains one or more invalid characters which break syncing in a cross platform environment - + Názov %1 obsahuje aspoň jeden neplatný znak, ktorý narušuje +synchronizáciu v prostredí viacerých platforiem Conflict file. - Konfliktný súbor. + Súbor v konflikte. @@ -1414,8 +1361,8 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvom - The sync protocol has been copied to the clipboard. - Záznam synchronizácie bol skopírovaný do "clipboard". + The sync status has been copied to the clipboard. + @@ -1436,31 +1383,55 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvomNastavenia - + %1 %1 - - Protocol + + Status - + General Všeobecné - + Network Sieť - + Account Účet + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1475,67 +1446,67 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvom - + SSL Connection Šifrované (SSL) spojenie - + Warnings about current SSL Connection: Varovania ohľadom aktuálneho šifrovaného (SSL) spojenia: - + with Certificate %1 s certifikátom %1 - - - + + + &lt;not specified&gt; &lt;nešpecifikované&gt; - - + + Organization: %1 Organizácia: %1 - - + + Unit: %1 Jednotka: %1 - - + + Country: %1 Krajina: %1 - + Fingerprint (MD5): <tt>%1</tt> Odtlačok (MD5 hash): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Odtlačok (SHA1 hash): <tt>%1</tt> - + Effective Date: %1 Dátum platnosti: %1 - + Expiry Date: %1 Dátum expirácie: %1 - + Issuer: %1 Vydavateľ: %1 @@ -1550,20 +1521,20 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvom <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>Nová verzia %1 klienta je dostupná.</p><p><b>%2</b> je dostupný na stiahnutie. Inštalovaná verzia je %3.</p> + <p>Nová verzia %1 klienta je dostupná.</p><p><b>%2</b> je dostupný na stiahnutie. Nainštalovaná verzia je %3.</p> - + Skip update Preskočiť aktualizáciu - + Skip this time Tentoraz preskočiť - + Get update Aktualizovať teraz @@ -1571,169 +1542,116 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvom Mirall::ownCloudGui - + %1 Sync Started %1 Synchronizácia začala - + Sync started for %n configured sync folder(s). - + Je spustená synchronizácia pre %n nastavený priečinok.Je spustená synchronizácia pre %n nastavené priečinky.Je spustená synchronizácia pre %n nastavených priečinkov. - + Folder %1: %2 Priečinok %1: %2 - + No sync folders configured. - Nenastavené žiadne synchronizačné priečinky. + Nie sú nastavené žiadne synchronizačné priečinky. - + None. Žiaden. - + Recent Changes Nedávne zmeny - + Open %1 folder - Otvoriť %1 adresár + 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... - Kalkulovanie kvóty... + Počítanie kvóty... - + Unknown status Neznámy stav - + Settings... Nastavenia... - + Details... Detaily... - + Help Pomoc - + Quit %1 Ukončiť %1 - + Quota n/a Kvóta n/a - + %1% of %2 in use - %1% z %2 v používaní + %1% z %2 sa používa - + No items synced recently Žiadne nedávno synchronizované položky - + %1 (%2, %3) %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) Synchronizovanie %1 z %2 (%3 z %4) - + Up to date Až do dnešného dňa - - Mirall::ownCloudInfo - - - Proxy Refused Connection - Proxy odmietlo spojenie - - - - The configured proxy has refused the connection. Please check the proxy settings. - Nakonfigurované proxy odmietlo spojenie. Prosím skontrolujte nastavenia proxy. - - - - Proxy Closed Connection - Proxy spojenie ukončené - - - - The configured proxy has closed the connection. Please check the proxy settings. - Nakonfigurované proxy ukončilo spojenie. Prosím skontrolujte nastavenia proxy. - - - - Proxy Not Found - Proxy nenájdené - - - - The configured proxy could not be found. Please check the proxy settings. - Nakonfigurované proxy nebolo nájdené. Prosím skontrolujte nastavenia proxy. - - - - Proxy Authentication Error - Proxy autentifikácia zlyhala - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - Nakonfigurované proxy vyžaduje prihlásenie, ale prihlasovanie údaje k proxy sú nesprávne. Prosím skontrolujte nastavenia proxy. - - - - Proxy Connection Timed Out - Proxy spojenie vypršalo - - - - The connection to the configured proxy has timed out. - Spojenie z nakonfigurovaným proxy práve vypršalo. - - OwncloudAdvancedSetupPage @@ -1746,7 +1664,7 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvom TextLabel - TextLabel + Štítok @@ -1766,12 +1684,12 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvom <small>Syncs your existing data to new location.</small> - <small>Synchronizuje vaše existujúce dáta do nového umiestnenia.</small> + <small>Zosynchronizuje vaše existujúce dáta do nového umiestnenia.</small> <html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html> - <html><head/><body><p>Pokiaľ je toto pole zaškrtnuté, existujúci obsah lokálneho priečinka bude vymazaný pre začatie čistej synchronizácie zo servera.</p><p>Nezaškrtnite pokiaľ má byť lokálny obsah nahraný do serverového adresára.</p></body></html> + <html><head/><body><p>Pokiaľ je toto pole zaškrtnuté, existujúci obsah lokálneho priečinka bude vymazaný pre začatie čistej synchronizácie zo servera.</p><p>Nezaškrtnite pokiaľ má byť lokálny obsah nahraný do serverového priečinka.</p></body></html> @@ -1815,7 +1733,7 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvom TextLabel - TextLabel + Štítok @@ -1841,7 +1759,7 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvom TextLabel - TextLabel + Štítok @@ -1873,12 +1791,12 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvom Enter the ownCloud password. - Vložte heslo k ownCloud. + Vložte heslo k prístupu do ownCloudu. Do not allow the local storage of the password. - Nepovoliť lokálne uloženie hesla. + Nepovoliť uloženie hesla na lokálne úložisko. @@ -1899,7 +1817,7 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvom &Local Folder - &Miestny priečinok + &Lokálny priečinok @@ -1919,7 +1837,7 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvom <html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html> - <html><head/><body><p>Pokiaľ je toto pole zaškrtnuté, existujúci obsah lokálneho priečinka bude vymazaný pre začatie čistej synchronizácie zo servera.</p><p>Nezaškrtnite pokiaľ má byť lokálny obsah nahraný do serverového adresára.</p></body></html> + <html><head/><body><p>Pokiaľ je toto pole zaškrtnuté, existujúci obsah lokálneho priečinka bude vymazaný pre začatie čistej synchronizácie zo servera.</p><p>Nezaškrtnite, pokiaľ má byť lokálny obsah nahraný do serverového priečinka.</p></body></html> @@ -1972,7 +1890,7 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvom Enter the URL of the server that you want to connect to (without http or https). - + Zadajte URL adresu servera, ku ktorému sa chcete pripojiť (bez http či https). @@ -1999,45 +1917,74 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvomTlačidloPush + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility %L1 TB - + %L1 TB %L1 GB - + %L1 GB %L1 MB - + %L1 MB %L1 kB - + %L1 kB %L1 B - + %L1 B main.cpp - + System Tray not available Systémová lišta "tray" neprístupná - + %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 vyžaduje funkčnú systémovú lištu "tray". Pokiaľ používate prostredie XFCE, prosím pokračujte <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">týmito inštrukciami</a>. Inak prosím inštalujte aplikáciu systémovej lišty "tray" ako napr. 'trayer' a skúste znova. + %1 vyžaduje funkčnú systémovú lištu "tray". Pokiaľ používate prostredie XFCE, prosím pokračujte <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">podľa týchto inštrukcií</a>. Inak si prosím nainštalujte aplikáciu systémovej lišty "tray" ako napr. 'trayer' a skúste to znova. @@ -2046,7 +1993,7 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvom 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! - Pokiaľ nemáte ešte ownCloud server, pozrite <a href="https://owncloud.com">owncloud.com</a> pre viac informácií. + Ak ešte nemáte vlastný ownCloud server, na stránke <a href="https://owncloud.com">owncloud.com</a> nájdete viac informácií. @@ -2059,7 +2006,7 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvom <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 viac informácií navštívte <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>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 @@ -2078,14 +2025,14 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvom - + Context Kontext Inactive - Nekatívny + Neaktívny @@ -2104,44 +2051,60 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvom - + deleted zmazané - - + + + Move + + + + + downloading sťahujem - - + + uploading nahrávam - + inactive - nekatívny + neaktívny - + starting začínam - + finished dokončené - + delete vymazať + + + move + + + + + moved + + theme @@ -2168,12 +2131,12 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvom Sync Success, problems with individual files. - Synchronizácia úspešná, problémy z individuálnymi súbormi. + Synchronizácia bola úspešná, problémy z individuálnymi súbormi. Sync Error - Click info button for details. - Chyba synchronizácie - Kliknite na informačné tlačidlo pre detaily. + Chyba synchronizácie - Kliknite na tlačidlo Info pre zobrazenie detailov. @@ -2188,12 +2151,12 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvom Preparing to sync - Príprava k synchronizácii + Príprava na synchronizáciu Aborting... - + Ruším... \ No newline at end of file diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts index de1fcc21c..6e01cc9e1 100644 --- a/translations/mirall_sl.ts +++ b/translations/mirall_sl.ts @@ -32,7 +32,7 @@ Select a destination folder - Izberite ciljni direktorij + Izbor ciljne mape @@ -47,7 +47,7 @@ Folders - + Mape @@ -65,7 +65,7 @@ Account Maintenance - Vzdrževanje računa + Upravljanje računa @@ -77,19 +77,14 @@ Modify Account Spremeni račun - - - Sync Status - - Connected with <server> as <user> - + Vzpostavljena je povezava s strežnikom <server> kot <user> - + Pause Premor @@ -101,12 +96,17 @@ Add Folder... + Dodaj mapo ... + + + + Accounts to Synchronize Info... - Info... + Podrobnosti ... @@ -114,117 +114,112 @@ Poraba prostora - + Retrieving usage information... - Pridobivanje podatkov o porabi... + 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 ne bodo odstranjene mape iz odjemalca.</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> - - Checking %1 connection... - Preverjam %1 povezavo ... - - - + No %1 connection configured. Ni nastavljenih %1 povezav. - + Sync Running - Usklajevanje se izvaja + Usklajevanje je v teku - + + No account configured. + + + + The syncing operation is running.<br/>Do you want to terminate it? - Izvaja se usklajevanje.<br/>Ali ga želite prekiniti? + Izvaja se usklajevanje.<br/>Ali želite opravilo prekiniti? - + + %1 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. - - Version: %1 (%2) - Različica: %1 (%2) - - - - unknown problem. - neznan problem. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>Ne morem se povezati z %1: <tt>%2</tt></p> - - - + Start Začni - + Currently Trenutno - + Completely - Skupno + V celoti - + %1 %2 %3 (%4 of %5) - + %1 %2 %3 (%4 od %5) - + Completely finished. - + V celoti končano. - + %1 of %2, file %3 of %4 + %1 od %2, datoteka %3 od %4 + + + + Connected to <a href="%1">%2</a> as <i>%3</i>. - - %1 of %2 in use. + + No connection to %1 at <a href="%1">%2</a>. - + Currently there is no storage usage information available. @@ -357,6 +352,11 @@ CSync unspecified error. Nedoločena napaka CSync. + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -375,7 +375,7 @@ Aborted by the user - + Opravilo je bilo prekinjeno s strani uporabnika @@ -386,231 +386,199 @@ Mirall::ConnectionValidator - - No ownCloud connection configured + + No ownCloud account configured - + The configured server for this client is too old - + Please update to the latest server and restart the client. - + Unable to connect to %1 - + The provided credentials are not correct - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - V verigi ključev ni ustreznih gesel. Napaka zahteva ponovno nastavljanje sistema. - - Mirall::Folder - + Unable to create csync-context - + Ni mogoče ustvariti vsebine csync-context - + Local folder %1 does not exist. Krajevna mapa %1 ne obstaja. - + %1 should be a directory but is not. %1 bi morala biti mapa, vendar ni. - + %1 is not readable. %1 ni mogoče brati. - + File %1: %2 - + Datoteka %1: %2 - + + File %1 + Datoteka %1 + + + + downloaded - - New file available + + removed - - '%1' has been synced to this machine. + + updated - - New files available - - - - - '%1' and %n other file(s) have been synced to this machine. - - - - - File removed + + renamed - - '%1' has been removed. + + '%1' has been %2. - - Files removed - - - - - '%1' and %n other file(s) have been removed. - - - - - File updated + + Files %1 - - '%1' has been updated. + + '%1' and %2 other files have been %3. - - Files updated - - - - - '%1' and %n other file(s) have been updated. - - - - + Error Napaka - + The CSync thread terminated. CSync nit je zaključena. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". - + 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? - + Ali naj bodo odstranjene vse datoteke? - + Remove all files - Odstrani vse dokumente + Odstrani vse datoteke - + Keep files - Ohrani dokumente + Ohrani datoteke Mirall::FolderMan - + Could not reset folder state - Stanja mape ni mogoče ponastaviti + 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 strarejši dnevnik sinhronizacije '%1', vendar ne more biti odstranjen. Preverite, da ni v uporabi. - + Undefined State. Nedoločeno stanje. - + Waits to start syncing. - Čakam na začetek usklajevanja. + V čakanju na začetek usklajevanja. - + Preparing for sync. - + Poteka priprava za usklajevanje. - + Sync is running. - Usklajevanje se izvaja. + 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. + Zadnje usklajevanje je bilo uspešno končano. - + Last Sync was successful, but with warnings on individual files. - + Setup Error. - Napaka nastavitev. + Napaka nastavitve. - + User Abort. - + %1 (Sync is paused) - + %1 (usklajevanje je v premoru) @@ -645,8 +613,8 @@ documentation for possible fixes. Mirall::FolderWizard - - + + Add Folder Dodaj mapo @@ -654,42 +622,42 @@ documentation for possible fixes. Mirall::FolderWizardSourcePage - + No local folder selected! - Niste izbrali lokalne mape! + Ni izbrane krajevne mape! - + You have no permission to write to the selected folder! - Nimate pravic pisanja v izbrano mapo! + Ni ustreznih dovoljenj za pisanje v izbrano mapo! - + The local path %1 is already an upload folder.<br/>Please pick another one! Krajevna pot %1 je že usklajena v oblaku.<br/>Te ni treba znova dodajati! - + An already configured folder is contained in the current entry. Trenutni vnos določa mapo, ki je že nastavljena. - + An already configured folder contains the currently entered directory. Trenutna mapa je že vsebovana v eni izmed nastavljenih map. - + The alias can not be empty. Please provide a descriptive alias word. Vzdevek ne sme biti izpuščen, zato ga je treba vpisati. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>Vzdevek <i>%1</i> je že v uporabi. Izbrati je treba novega. - + Select the source folder Izbor izvorne mape @@ -697,44 +665,44 @@ documentation for possible fixes. Mirall::FolderWizardTargetPage - + 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.<br/>Please check manually. Mape na %1 ni mogoče ustvariti.<br/>Nastavitve je treba preveriti ročno. - + Choose this to sync the entire account - + This directory is already being synced. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. - Če boste sinhronizirali korenski (root) direktorij, ostalih direktorijev <b>ne</b> bo mogoče nastaviti za sihnronizacijo. + Če bo za usklajevanje določena korenska mapa, drugih map <b>ne</b> bo mogoče nastaviti. @@ -746,29 +714,29 @@ documentation for possible fixes. - General - Splošno + General Setttings + Launch on System Startup - + Zaženi ob zagonu sistema Show Desktop Notifications - + Pokaži obvestila namizja Use Monochrome Icons - + Uporabi enobarvne ikone About - O oblaku ownCloud + O oblaku @@ -789,36 +757,36 @@ documentation for possible fixes. Odstrani - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. - - - Could not open file - Datoteke ni bilo mogoče odpreti. - - Cannot write changes to '%1'. - + Could not open file + Datoteke ni mogoče odpreti - - - Add Ignore Pattern - + + Cannot write changes to '%1'. + Ni mogoče zapisati sprememb v '%1'. - Add a new ignore pattern: - + Add Ignore Pattern + Dodaj vzorec za izpuščanje - + + + Add a new ignore pattern: + Dodaj nov vzorec za izpuščanje: + + + This entry is provided by the system at '%1' and cannot be modified in this view. @@ -826,52 +794,52 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::LogBrowser - + Log Output Beleži odvod - + &Search: &Poišči: - + &Find &Najdi - + Clear Počisti - + Clear the log display. Počisti izpis dnevnika. - + S&ave S&hrani - + Save the log file to a file on disk for debugging. Shrani beleženje v dnevniško datoteko na disk za nadaljnje razhroščevanje. - + Error Napaka - + Save log file Shrani dnevniško datoteko - + Could not write to log file V dnevniško datoteko ni mogoče pisati. @@ -899,22 +867,22 @@ Checked items will also be deleted if they prevent a directory from being remove Proxy Settings - Proxy nastavitve + Nastavitve posredniškega strežnika No Proxy - Brez proxy strežnika + Brez posredniškega strežnika Use system proxy - Uporabi sistemski proxy + Uporabi sistemski posredniški strežnik Specify proxy manually as - + Določi posredniški strežnik ročno kot @@ -924,159 +892,136 @@ Checked items will also be deleted if they prevent a directory from being remove : - + : Proxy server requires authentication - + Posredniški strežnik zahteva overitev Download Bandwidth - + Pasovna širina prejemanja Limit to - + Omeji na KBytes/s - + KBajtov/s No limit - + Ni omejitve Upload Bandwidth - + Pasovna širina pošiljanja Limit automatically - + Samodejno omeji Hostname of proxy server - Ime gostitelja proxy strežnika + Ime gostitelja posredniškega strežnika Username for proxy server - Uporabniško ime za proxy strežnik + Uporabniško ime za posredniški strežnik Password for proxy server - Geslo za proxy strežnik + Geslo za posredniški strežnik HTTP(S) proxy - + Posredniški strežnik HTTP(S) SOCKS5 proxy - + Posredniški strežnik SOCKS5 Mirall::OwncloudAdvancedSetupPage - + Connect to %1 - + Poveži s strežnikom %1 - + Setup local folder options - + Connect... - + Vzpostavi povezavo ... - + Your entire account will be synced to the local folder '%1'. - + %1 folder '%2' is synced to local folder '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> - + <p><small><strong>Opozorilo:</strong> krajevna mapa ni prazna. Kaj storiti?</small></p> - + Local Sync Folder - + Krajevna mapa usklajevanja - + Update advanced setup - + Posodobi napredne nastavitve Mirall::OwncloudHttpCredsPage - - - Connect to %1 - - + Connect to %1 + Vzpostavi povezavo s strežnikom %1 + + + Enter user credentials - + Vpiši uporabniška poverila - + Update user credentials - - - - - Mirall::OwncloudPropagator - - - Aborted - - - - - Could not remove directory %1 - - - - - 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. - + Posodobi uporabniška poverila @@ -1084,7 +1029,7 @@ Checked items will also be deleted if they prevent a directory from being remove Connect to %1 - + Vzpostavi povezavo s strežnikom %1 @@ -1094,15 +1039,15 @@ Checked items will also be deleted if they prevent a directory from being remove This url is secure. You can use it. - Ta internetni naslov je varen. Lahko ga uporabite. + Ta naslov URL je varen za uporabo. This url is NOT secure. You should not use it. - Ta internetni naslov NI varen. Ne uporabite ga. + Ta naslov URL ni varen za uporabo. - + Update %1 server @@ -1110,129 +1055,126 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudSetupWizard - + Folder rename failed Preimenovanje mape je spodletelo - + 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 in ustvariti njeno varnostno kopijo, saj je mapa oziroma dokument v njej odprt v drugem programu. Zaprite mapo/dokument ali prekinite nastavitev. - + + <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 ... - - Trying to connect to %1 at %2 to determine authentication type... - - - - + <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/> - - Failed to connect to %1:<br/>%2 - Povezava je spodletela %1:<br/>%2 - - - + 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 - Lokalne mape ni bilo mogoče ustvariti %1 + Krajevne mape %1 ni mogoče ustvariti. - - The remote folder could not be accessed! - Oddaljene mape ni bilo mogoče doseči. + + + Failed to connect to %1 at %2:<br/>%3 + - + + No remote folder specified! + + + + Error: %1 Napaka: %1 - + creating folder on ownCloud: %1 - ustvarjanje mape na 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 oddaljene mape je spodletelo, saj ste navedli napačne dostopovne podatke. <br/>Poskusite s prijavo ponovno.</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. @@ -1240,35 +1182,35 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizard - + %1 Connection Wizard - %1 čarovnik za povezavo + Čarovnik za povezavo %1 Mirall::OwncloudWizardResultPage - + Open %1 Odpri %1 - + Open Local Folder - Odpri lokalno mapo + Odpri krajevno mapo - + Everything set up! - + Vse je pripravljeno za uporabo! - + Your entire account is synced to the local folder <i>%1</i> - Vaš račun je v celoti sinhroniziran z lokalno mapo. <i>%1</i> + Naveden račun je v celoti usklajen s krajevno mapo. <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> @@ -1282,18 +1224,18 @@ Checked items will also be deleted if they prevent a directory from being remove - Detailed Sync Protocol - Podroben protokol CSync + Detailed Sync Status + 3 - + 3 4 - + 4 @@ -1318,7 +1260,7 @@ Checked items will also be deleted if they prevent a directory from being remove Action - + Dejanje @@ -1349,7 +1291,7 @@ Please do not use them in synced directories directory - direktorij + mapa @@ -1377,7 +1319,7 @@ list of names to ignore Invalid characters - + Neveljavni znaki @@ -1405,8 +1347,8 @@ name - The sync protocol has been copied to the clipboard. - Protokol usklajevanja je kopiran v odložišče. + The sync status has been copied to the clipboard. + @@ -1427,29 +1369,53 @@ name Nastavitve - + %1 + %1 + + + + Status - - Protocol - - - - + General Splošno - + Network + Omrežje + + + + Account + Račun + + + + Mirall::ShibbolethWebView + + + %1 - Authenticate - - Account - Račun + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + @@ -1462,71 +1428,71 @@ name Trust this certificate anyway - Vseeno zaupaj certifikatu + Vseeno zaupaj digitalnemu potrdilu - + SSL Connection Povezava SSL - + Warnings about current SSL Connection: Opozorila o trenutni povezavi SSL: - + with Certificate %1 s potrdilom %1 - - - + + + &lt;not specified&gt; &lt;ni podano&gt; - - + + Organization: %1 Ustanova: %1 - - + + Unit: %1 Enota: %1 - - + + Country: %1 Država: %1 - + Fingerprint (MD5): <tt>%1</tt> Prstni odtis (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Prstni odtis (SHA1): <tt>%1</tt> - + Effective Date: %1 Začetek veljavnosti: %1 - + Expiry Date: %1 Datum poteka: %1 - + Issuer: %1 Izdajatelj: %1 @@ -1536,25 +1502,25 @@ name New Version Available - Novejša različica je na voljo + Na voljo je novejša različica <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>Nova različica %1 odjemalca je na voljo,</p><p><b>%2</b> Lahko jo prenesete k sebi. Nameščena različica je %3.<p> + <p>Na voljo je nova različica odjemalca %1.</p><p>Datoteka <b>%2</b> je na voljo za prejem. Trenutno je nameščena različica %3.<p> - + Skip update Preskoči posodobitev - + Skip this time - Tokrat posodobitev preskoči + Posodobitev tokrat preskoči - + Get update Pridobi posodobitve @@ -1562,169 +1528,116 @@ name Mirall::ownCloudGui - + %1 Sync Started Usklajevanje %1 je začeto - + Sync started for %n configured sync folder(s). - + Folder %1: %2 Mapa %1: %2 - + No sync folders configured. Ni nastavljenih map za usklajevanje. - + None. - + Recent Changes - + Open %1 folder Odpri %1 mapo - + Managed Folders: Upravljane mape: - + Open folder '%1' - - - - - Open %1 in browser - - - - - Calculating quota... - Preračunavanje kvote... - - - - Unknown status - Neznan status - - - - Settings... - Nastavitve... + Odpri mapo '%1' - Details... - + 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 - - - - - Quota n/a - + Končaj %1 - %1% of %2 in use - + Quota n/a + Količinska omejitev ni na voljo - + + %1% of %2 in use + %1% od %2 v uporabi + + + No items synced recently - + %1 (%2, %3) - + %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) - + Poteka usklajevanje %1 od %2 (%3 od %4) - + Up to date Ni posodobitev - - Mirall::ownCloudInfo - - - Proxy Refused Connection - Namestniški strežnik ni dovolil povezave - - - - The configured proxy has refused the connection. Please check the proxy settings. - Nastavljen posredovalni strežnik je preprečil povezavo. Preverite nastavitve strežnika. - - - - Proxy Closed Connection - Posredovalni strežnik je zaprl povezavo - - - - The configured proxy has closed the connection. Please check the proxy settings. - Nastavljen posredovalni strežnik je zaprl povezavo. Preverite nastavitve strežnika. - - - - Proxy Not Found - Posredovalnega strežnika ni bilo mogoče najti. - - - - The configured proxy could not be found. Please check the proxy settings. - Nastavljenega posredovalnega strežnika ni bilo mogoče najti. Preverite nastavitve strežnika. - - - - Proxy Authentication Error - Napaka pri avtentikaciji posredovalnega strežnika. - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - Nastavljen posredovalni strežnik zahteva prijavo, a dostopni podatki niso veljavi. Preverite nastavitve strežnika. - - - - Proxy Connection Timed Out - Potekla je časovna omejitev pri povezavi. - - - - The connection to the configured proxy has timed out. - Iztekla se je časovna omejitev pri dostopu do posredovalnega strežnika. - - OwncloudAdvancedSetupPage @@ -1742,7 +1655,7 @@ name &Local Folder - + &Krajevna mapa @@ -1752,12 +1665,12 @@ name &Keep local data - + &Ohrani krajevno shranjene podatke <small>Syncs your existing data to new location.</small> - + <small>Izvedeno bo usklajevanje obstoječih podatkov na novo mesto.</small> @@ -1767,17 +1680,17 @@ name &Start a clean sync - + &Začni usklajevanje na novo <small>Erases the contents of the local folder before syncing using the new settings.</small> - + <small>Najprej bo izbrisana celotna vsebina krajevne mape, nato pa bodo datoteke usklajene na novo z novimi nastavitvami.</small> Status message - + Sporočilo stanja @@ -1790,17 +1703,17 @@ name &Username - + &Uporabniško ime &Password - + &Geslo Error Label - + Oznaka napake @@ -1890,7 +1803,7 @@ name &Local Folder - &Lokalna mapa + &Krajevna mapa @@ -1900,12 +1813,12 @@ name &Keep local data - &Obdrži lokalne podatke + &Ohrani krajevne podatke <small>Syncs your existing data to new location.</small> - <small>Sinhronizacija obstoječih podatkov na novo lokacijo.</small> + <small>Izvedeno bo usklajevanje obstoječih podatkov na novo mesto.</small> @@ -1915,24 +1828,24 @@ name &Start a clean sync - &Začni z novo sihnronizacijo + &Začni usklajevanje na novo <small>Erases the contents of the local folder before syncing using the new settings.</small> - <small>Izbris vsebine v lokalni mapi pred sihnronizacijo z novimi nastavitvami.</small> + <small>Najprej bo izbrisana celotna vsebina krajevne mape, nato pa bodo datoteke usklajene na novo z novimi nastavitvami.</small> Server &Address - Strežnik &naslov + &Naslov strežnika https://... - https://... + https:// ... @@ -1953,12 +1866,12 @@ name Advanced &Settings - Napredno &Nastavitve + Napredne &nastavitve Status message - Stanje + Sporočilo stanja @@ -1981,7 +1894,7 @@ name Your entire account is synced to the local folder - Vaš račun je v celoti sinhroniziran z lokalno mapo. + Naveden račun je v celoti usklajen s krajevno mapo @@ -1990,43 +1903,72 @@ name Potisni gumb + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility %L1 TB - + %L1 TB %L1 GB - + %L1 GB %L1 MB - + %L1 MB %L1 kB - + %L1 kB %L1 B - + %L1 B main.cpp - + System Tray not available - + Sistemska vrstica ni na voljo - + %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. @@ -2069,70 +2011,86 @@ name - + Context - + Vsebina Inactive - + Nedejavno Start - + Začni Finished - + Končano For deletion - + Za izbris - + deleted izbrisano - - - - downloading + + + Move - - - - uploading - + + + + downloading + prejemanje - inactive - - - - - starting - - - + - finished - + uploading + pošiljanje + + + + inactive + nedejavno + starting + začenjanje + + + + finished + končano + + + delete izbriši + + + move + + + + + moved + + theme @@ -2144,7 +2102,7 @@ name Waiting to start sync - Čakam na začetek usklajevanja + Čakanje začetek usklajevanja @@ -2154,37 +2112,37 @@ name Sync Success - Usklajevanje je bilo uspešno + Usklajevanje je uspešno končano Sync Success, problems with individual files. - + Usklajevanje je končano, ostajajo pa nerešene težave s posameznimi datotekami. Sync Error - Click info button for details. - Napaka pri usklajevanju - Kliknite gumb info za prikaz podrobnosti. + Napaka med usklajevanjem - za več podrobnosti kliknite povezavo Setup Error - Napaka pri nastavitvi + Napaka nastavitve The server is currently unavailable - + Strežnik trenutno ni na voljo Preparing to sync - + Priprava na usklajevanje Aborting... - + Poteka prekinjanje ... \ No newline at end of file diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts index b37a3a182..ac4c4b510 100644 --- a/translations/mirall_sv.ts +++ b/translations/mirall_sv.ts @@ -77,11 +77,6 @@ Modify Account Ändra Konto - - - Sync Status - Synkroniseringsstatus - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause Paus @@ -103,6 +98,11 @@ Add Folder... Lägg till mapp + + + Accounts to Synchronize + + Info... @@ -114,120 +114,115 @@ 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> - - Checking %1 connection... - Kontrollerar %1 anslutning... - - - + No %1 connection configured. Ingen %1 anslutning konfigurerad. - + Sync Running Synkronisering pågår - + + No account configured. + + + + The syncing operation is running.<br/>Do you want to terminate it? En synkronisering pågår.<br/>Vill du avbryta den? - + + %1 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. Ansluten till <a href="%1">%2</a>. - - Version: %1 (%2) - Version: %1 (%2) - - - - unknown problem. - okänt fel. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>Misslyckades ansluta till %1: <tt>%2</tt></p> - - - + Start Start - + Currently För närvarande: - + Completely Fullständigt - + %1 %2 %3 (%4 of %5) %1 %2 %3 (%4 av %5) - + Completely finished. Helt klar. - + %1 of %2, file %3 of %4 %1 av %2, fil %3 av %4 - - %1 of %2 in use. - %1 av %2 används. + + Connected to <a href="%1">%2</a> as <i>%3</i>. + - - Currently there is no storage usage information available. + + No connection to %1 at <a href="%1">%2</a>. + + + Currently there is no storage usage information available. + Just nu finns ingen utrymmes information tillgänglig + Mirall::CSyncThread @@ -357,6 +352,11 @@ CSync unspecified error. CSync ospecificerat fel. + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -386,150 +386,118 @@ Mirall::ConnectionValidator - - No ownCloud connection configured - Ingen ownCloud uppkoppling konfigurerad + + No ownCloud account configured + - + The configured server for this client is too old Den konfigurerade servern är för den här klienten är för gammal - + Please update to the latest server and restart the client. Uppgradera servern och starta sedan om klienten. - + Unable to connect to %1 Kan ej koppla upp till %1 - + The provided credentials are not correct De angivna uppgifterna stämmer ej - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - Inget lösenord kan hittas i nyckelringen. Vänligen konfigurera om. - - Mirall::Folder - + Unable to create csync-context Kan inte skapa csync-context - + Local folder %1 does not exist. Den lokala mappen %1 finns inte. - + %1 should be a directory but is not. %1 ska vara en mapp, men är inte det. - + %1 is not readable. %1 är inte läsbar. - + File %1: %2 Fil %1: %2 - + + File %1 Fil %1 - - New file available - Ny fil tillgänglig + + downloaded + - - '%1' has been synced to this machine. - '%1' har blivit synkad till denna dator. + + removed + - - New files available - Nya filer tillgängliga - - - - '%1' and %n other file(s) have been synced to this machine. - '%1' och %n andra fil(er) har blivit synkade till denna dator.'%1' och %n andra fil(er) har blivit synkade till denna dator. + + updated + - - File removed - Fil raderad + + renamed + - - '%1' has been removed. - '%1' har raderats. + + '%1' has been %2. + - - Files removed - Filer raderade - - - - '%1' and %n other file(s) have been removed. - '%1' och %n andra fil(er) har tagits bort.'%1' och %n andra fil(er) har tagits bort. + + Files %1 + - - File updated - Fil updaterad + + '%1' and %2 other files have been %3. + - - '%1' has been updated. - '%1' har laddats upp. - - - - Files updated - Filer uppdaterade - - - - '%1' and %n other file(s) have been updated. - '%1' och %n andra fil(er) har uppdaterats.'%1' och %n andra fil(er) har uppdaterats. - - - + Error Fel - + The CSync thread terminated. CSync-tråden avslutades. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". Denna synk skulle radera alla filer i den lokala mappen '%1'. Om systemadministratören har återställt ditt konto på servern, välj "Behåll filer". Om du vill att dina filer ska raderas, välj "Radera alla filer". - + 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? @@ -538,17 +506,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 @@ -556,62 +524,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. - + 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 - + %1 (Sync is paused) %1 (Synk är stoppad) @@ -649,8 +617,8 @@ Applikationen kommer inte att fungera tillförlitligt. Kontrollera dokumentation Mirall::FolderWizard - - + + Add Folder Lägg till mapp @@ -658,42 +626,42 @@ Applikationen kommer inte att fungera tillförlitligt. Kontrollera dokumentation Mirall::FolderWizardSourcePage - + No local folder selected! Ingen 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.<br/>Please pick another one! Den lokala sökvägen %1 är redan en uppladdningsmapp.<br/>Välj en annan! - + An already configured folder is contained in the current entry. En redan konfigurerad mapp finns i den aktuella posten. - + An already configured folder contains the currently entered directory. En redan konfigurerad mapp innehåller den angivna katalogen. - + The alias can not be empty. Please provide a descriptive alias word. Alias ​​kan inte vara tomt. Ange ett beskrivande ord för alias. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>Detta alias <i>%1</i> används redan. Ange ett annat alias. - + Select the source folder Välj källmapp @@ -701,42 +669,42 @@ Applikationen kommer inte att fungera tillförlitligt. Kontrollera dokumentation Mirall::FolderWizardTargetPage - + 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.<br/>Please check manually. Misslyckades att skapa mappen på %1.<br/>Var god kontrollera manuellt. - + Choose this to sync the entire account Välj detta för att synka allt - + This directory is already being synced. Den här mappen håller redan på att synka. - + 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> - + If you sync the root folder, you can <b>not</b> configure another sync directory. Om du synkroniserar root-mappen så kan du <b>inte</b> konfigurera en till mapp att synkronisera. @@ -750,8 +718,8 @@ Applikationen kommer inte att fungera tillförlitligt. Kontrollera dokumentation - General - Allmänt + General Setttings + @@ -793,7 +761,7 @@ Applikationen kommer inte att fungera tillförlitligt. Kontrollera dokumentation Radera - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. @@ -802,29 +770,29 @@ Checked items will also be deleted if they prevent a directory from being remove Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort. Detta är användbart för meta-data. - + Could not open file Kunde inte öppna fil - + Cannot write changes to '%1'. Kan inte skriva förändringar till '%1'. - - + + Add Ignore Pattern Lägg till synk-filter - - + + Add a new ignore pattern: Lägg till ett nytt synk-filter: - + This entry is provided by the system at '%1' and cannot be modified in this view. Denna post hanteras av systemet på '%1' och kan inte ändras här. @@ -832,52 +800,52 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort Mirall::LogBrowser - + Log Output Loggdata - + &Search: &Sök: - + &Find &Hitta - + Clear Rensa - + Clear the log display. Rensa loggfönstret. - + S&ave S&para - + Save the log file to a file on disk for debugging. Spara loggfilen till en fil på disk för felsökning. - + Error Fel - + Save log file Spara loggfil - + Could not write to log file Kunde inte skriva till loggfilen @@ -999,47 +967,47 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort Mirall::OwncloudAdvancedSetupPage - + Connect to %1 Ansluten till %1 - + Setup local folder options Inställningar för lokala mappar. - + Connect... Anslut... - + Your entire account will be synced to the local folder '%1'. Alla filer kommer att synkroniseras till den lokala mappen '%1'. - + %1 folder '%2' is synced to local folder '%3' %1 mappen '%2' är synkroniserad mot den lokala mappen '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> <p><small><strong>Varning:</strong> Du har för närvarande flera mappar konfigurerade. Om du fortsätter med nuvarande inställningar så kommer inställningarna för synkronisering av mapparna att tas bort och ersättas med en enda synkronisering av själva rot-mappen!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> <p><small><strong>Varning:</strong> Den lokala mappen är inte tom. Välj en lösning!</small></p> - + Local Sync Folder Lokal mapp för synkning - + Update advanced setup Uppdatera avancerade inställningar @@ -1047,44 +1015,21 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort Mirall::OwncloudHttpCredsPage - + Connect to %1 Anslut till %1 - + Enter user credentials Ange inloggningsuppgifter - + Update user credentials Uppdatera inloggningsuppgifter - - Mirall::OwncloudPropagator - - - Aborted - Avbrutits - - - - Could not remove directory %1 - Kunde ej ta bort mappen %1 - - - - 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. - - - Mirall::OwncloudSetupPage @@ -1108,7 +1053,7 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort Denna url är INTE säker. Du bör inte använda den. - + Update %1 server Uppdaterar %1 server @@ -1116,129 +1061,126 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort Mirall::OwncloudSetupWizard - + Folder rename failed Omdöpning av mapp misslyckades - + 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äkerhetkopia 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. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - Försöker ansluta till %1 på %2 för att avgöra autentiseringstyp... - - - + <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/> - - Failed to connect to %1:<br/>%2 - Kunde inte ansluta till %1:<br/>%2 - - - + 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 - - The remote folder could not be accessed! - Fjärrmappen kunde inte nås! + + + Failed to connect to %1 at %2:<br/>%3 + - + + No remote folder specified! + + + + 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/>Vänligen 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. @@ -1246,7 +1188,7 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort Mirall::OwncloudWizard - + %1 Connection Wizard %1 Anslutningsguiden @@ -1254,29 +1196,29 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort Mirall::OwncloudWizardResultPage - + Open %1 Öppnar %1 - + Open Local Folder Öppnar lokal mapp - + Everything set up! Allt är konfigurerat! - + Your entire account is synced to the local folder <i>%1</i> Hela ditt konto är synkroniserat mot den lokala mappen <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> - + %1 mapp <i>%1</i> är synkroniserad mot lokal mapp <i>%2</i> @@ -1288,8 +1230,8 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort - Detailed Sync Protocol - Detaljerat Synkprotokoll + Detailed Sync Status + @@ -1418,8 +1360,8 @@ medan filen från serversidan är tillgänglig under originalnamnet - The sync protocol has been copied to the clipboard. - Synkprotokollet har kopierats till urklipp. + The sync status has been copied to the clipboard. + @@ -1440,31 +1382,55 @@ medan filen från serversidan är tillgänglig under originalnamnetInställningar - + %1 %1 - - Protocol - Protokoll + + Status + - + General Allmänt - + Network Nätverk - + Account Konto + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1479,67 +1445,67 @@ medan filen från serversidan är tillgänglig under originalnamnet - + SSL Connection SSL-anslutning - + Warnings about current SSL Connection: Varningar angående aktuell SSL-anslutning: - + with Certificate %1 med Certifikat %1 - - - + + + &lt;not specified&gt; &lt;inte angivet&gt; - - + + Organization: %1 Organisation: %1 - - + + Unit: %1 Enhet: %1 - - + + Country: %1 Land: %1 - + Fingerprint (MD5): <tt>%1</tt> Fingeravtryck (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Fingeravtryck (SHA1): <tt>%1</tt> - + Effective Date: %1 Giltigt datum: %1 - + Expiry Date: %1 Utgångsdatum: %1 - + Issuer: %1 Utfärdare: %1 @@ -1557,17 +1523,17 @@ medan filen från serversidan är tillgänglig under originalnamnet<p>En ny version av %1 Client är tillgänglig.</p><p><b>%2</b> är tillgänglig för nedladdning. Den installerade versionen är %3.<p> - + Skip update Hoppa över uppdatering - + Skip this time Hoppa över denna gång - + Get update Hämta uppdatering @@ -1575,169 +1541,116 @@ medan filen från serversidan är tillgänglig under originalnamnet Mirall::ownCloudGui - + %1 Sync Started %1 Synk startad - + Sync started for %n configured sync folder(s). - + Synkronisering startad för %n konfigurerad synk-katalog.Synkronisering startad för %n konfigurerade synk-kataloger. - + 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 - + 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 - + %1 (%2, %3) %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) Synkar %1 av %2 (%3 av %4) - + Up to date Aktuell version - - Mirall::ownCloudInfo - - - Proxy Refused Connection - Proxy nekade anslutning - - - - The configured proxy has refused the connection. Please check the proxy settings. - Den konfigurerade proxyn har nekat anslutningen. Vänligen kontrollera proxyinställningarna. - - - - Proxy Closed Connection - Proxy stängde anslutningen - - - - The configured proxy has closed the connection. Please check the proxy settings. - Den konfigurerade proxyn stängde anslutningen. Vänligen kontrollera proxyinställningarna - - - - Proxy Not Found - Proxy hittades inte - - - - The configured proxy could not be found. Please check the proxy settings. - Den konfigurerade proxyn kunde inte hittas. Vänligen kontrollera proxyinställningarna - - - - Proxy Authentication Error - Proxy autentiseringsfel - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - Den konfigurerade proxyn kräver inloggning. Men proxyuppgifter är ogiltiga. Vänligen kontrollera proxyinställningarna. - - - - Proxy Connection Timed Out - Tidsgräns överskriden för proxyanslutningen - - - - The connection to the configured proxy has timed out. - Tidsgränsen för anslutningen till den konfigurerade proxyn har upphört. - - OwncloudAdvancedSetupPage @@ -2003,6 +1916,35 @@ medan filen från serversidan är tillgänglig under originalnamnetPushButton + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2034,12 +1976,12 @@ medan filen från serversidan är tillgänglig under originalnamnet main.cpp - + System Tray not available Systemfältet är inte tillgängligt - + %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 krävs på ett fungerande systemfält. Om du kör XFCE, vänligen följ <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">dessa instruktioner</a>. Annars, vänligen installera ett systemfälts-program som 'trayer' och försök igen. @@ -2082,7 +2024,7 @@ medan filen från serversidan är tillgänglig under originalnamnet - + Context Kontext @@ -2108,44 +2050,60 @@ medan filen från serversidan är tillgänglig under originalnamnet - + deleted raderad - - + + + Move + + + + + downloading laddar ner - - + + uploading laddar upp - + inactive inaktiv - + starting startar - + finished klar - + delete radera + + + move + + + + + moved + + theme diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts index 5876f17f3..33287ffd5 100644 --- a/translations/mirall_th.ts +++ b/translations/mirall_th.ts @@ -77,11 +77,6 @@ Modify Account - - - Sync Status - - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause หยุดชั่วคราว @@ -103,6 +98,11 @@ Add Folder... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ - + 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> - - Checking %1 connection... - กำลังตรวจสอบ %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 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. - - Version: %1 (%2) - รุ่น: %1 (%2) - - - - unknown problem. - ปัญหาที่ไม่ทราบสาเหตุ - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>ล้มเหลวในการเชื่อมต่อไปที่ %1: <tt>%2</tt></p> - - - + Start - + Currently - + Completely - + %1 %2 %3 (%4 of %5) - + Completely finished. - + %1 of %2, file %3 of %4 - - %1 of %2 in use. + + Connected to <a href="%1">%2</a> as <i>%3</i>. - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. @@ -357,6 +352,11 @@ CSync unspecified error. CSync ไม่สามารถระบุข้อผิดพลาดได้ + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -386,166 +386,134 @@ Mirall::ConnectionValidator - - No ownCloud connection configured + + No ownCloud account configured - + The configured server for this client is too old - + Please update to the latest server and restart the client. - + Unable to connect to %1 - + The provided credentials are not correct - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - ไม่พบรายการรหัสผ่านใน keychain กรุณากำหนดค่าอีกครั้ง - - Mirall::Folder - + Unable to create csync-context - + Local folder %1 does not exist. โฟลเดอร์ในเครื่อง %1 ไม่มีอยู่ - + %1 should be a directory but is not. %1 ควรเป็นไดเร็กทอรี่แต่ไม่ได้เป็น - + %1 is not readable. ไม่สามารถอ่านข้อมูล %1 ได้ - + File %1: %2 - + + File %1 - - New file available + + downloaded - - '%1' has been synced to this machine. + + removed - - New files available - - - - - '%1' and %n other file(s) have been synced to this machine. - - - - - File removed + + updated - - '%1' has been removed. + + renamed - - Files removed - - - - - '%1' and %n other file(s) have been removed. - - - - - File updated + + '%1' has been %2. - - '%1' has been updated. + + Files %1 - - Files updated + + '%1' and %2 other files have been %3. - - - '%1' and %n other file(s) have been updated. - - - + Error ข้อผิดพลาด - + The CSync thread terminated. หัวข้อ CSync สิ้นสุดลงแล้ว - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". - + 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 @@ -553,62 +521,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. การซิงค์ข้อมูลกำลังทำงาน - + Server is currently not available. - + Last Sync was successful. การซิงค์ข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว - + Last Sync was successful, but with warnings on individual files. - + Setup Error. เกิดข้อผิดพลาดในการติดตั้ง - + User Abort. - + %1 (Sync is paused) @@ -645,8 +613,8 @@ documentation for possible fixes. Mirall::FolderWizard - - + + Add Folder เพิ่มโฟลเดอร์ @@ -654,42 +622,42 @@ documentation for possible fixes. Mirall::FolderWizardSourcePage - + No local folder selected! - + You have no permission to write to the selected folder! - + The local path %1 is already an upload folder.<br/>Please pick another one! ตำแหน่งภายใน %1 เป็นโฟลเดอร์ที่อัพโหลดไว้อยู่แล้ว <br/>กรุณาเลือกอันอื่น - + An already configured folder is contained in the current entry. โฟลเดอร์ที่ถูกกำหนดค่าไว้แล้วได้บรรจุรายการปัจจุบันอยู่ - + An already configured folder contains the currently entered directory. โฟลเดอร์ที่มีการกำหนดค่าไว้แล้วมีไดเร็กทอรี่ที่เพิ่งกรอกข้อมูลเข้าไปอยู่ - + The alias can not be empty. Please provide a descriptive alias word. นามแฝงไม่สามารถเว้นว่างได้ กรุณาใส่คำที่ต้องการใช้เป็นนามแฝง - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>นามแฝง <i>%1</i> ถูกใช้งานไปแล้ว กรุณาเลือกชื่ออื่น - + Select the source folder เลือกโฟลเดอร์ต้นฉบับ @@ -697,42 +665,42 @@ documentation for possible fixes. Mirall::FolderWizardTargetPage - + Add Remote Folder - + Enter the name of the new folder: - + Folder was successfully created on %1. โฟลเดอร์ถูกสร้างขึ้นเรียบร้อยแล้วเมื่อ %1... - + Failed to create the folder on %1.<br/>Please check manually. ล้มเหลวในการสร้างโฟลเดอร์ที่ %1 <br/> กรุณาตรวจสอบด้วยตนเองอีกครั้ง - + Choose this to sync the entire account - + This directory is already being synced. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. @@ -746,8 +714,8 @@ documentation for possible fixes. - General - ทั่วไป + General Setttings + @@ -789,36 +757,36 @@ documentation for possible fixes. ลบออก - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. - + Could not open file - + Cannot write changes to '%1'. - - - - Add Ignore Pattern - - + Add Ignore Pattern + + + + + Add a new ignore pattern: - + This entry is provided by the system at '%1' and cannot be modified in this view. @@ -826,52 +794,52 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::LogBrowser - + Log Output บันทึกข้อมูลผลลัพธ์ - + &Search: &ค้นหา - + &Find &ค้น - + Clear ล้างข้อมูล - + Clear the log display. ล้างข้อมูลบันทึกการเปลี่ยนแปลงที่แสดงอยู่ - + S&ave &บันทึก - + Save the log file to a file on disk for debugging. บันทึกไฟล์บันทึกการเปลี่ยนแปลงไปที่ไฟล์ที่อยู่ดิสก์เพื่อตรวจสอบข้อผิดพลาด - + Error ข้อผิดพลาด - + Save log file บันทึกข้อมูลไฟล์ log - + Could not write to log file ไม่สามารถเขียนข้อมูลไปไว้ที่ log ไฟล์ได้ @@ -993,47 +961,47 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudAdvancedSetupPage - + Connect to %1 - + Setup local folder options - + Connect... - + Your entire account will be synced to the local folder '%1'. - + %1 folder '%2' is synced to local folder '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> - + Local Sync Folder - + Update advanced setup @@ -1041,44 +1009,21 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudHttpCredsPage - + Connect to %1 - + Enter user credentials - + Update user credentials - - Mirall::OwncloudPropagator - - - Aborted - - - - - Could not remove directory %1 - - - - - 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. - - - Mirall::OwncloudSetupPage @@ -1102,7 +1047,7 @@ Checked items will also be deleted if they prevent a directory from being remove - + Update %1 server @@ -1110,129 +1055,126 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudSetupWizard - + Folder rename failed - + 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. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - - - - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">เชื่อมต่อกับ %1: %2 รุ่น %3 (%4) เสร็จเรียบร้อยแล้ว</font><br/><br/> - - Failed to connect to %1:<br/>%2 - - - - + 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 - - The remote folder could not be accessed! + + + 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. โฟลเดอร์ระยะไกล %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 ไม่สามารถดำเนินการได้ กรุณาตรวจสอบอีกครั้ง @@ -1240,7 +1182,7 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizard - + %1 Connection Wizard %1 ตัวช่วยสร้างการเชื่อมต่อ @@ -1248,27 +1190,27 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizardResultPage - + Open %1 - + Open Local Folder - + Everything set up! - + Your entire account is synced to the local folder <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> @@ -1282,8 +1224,8 @@ Checked items will also be deleted if they prevent a directory from being remove - Detailed Sync Protocol - โปรโตคอลที่ใช้ในการผสานข้อมูลโดยละเอียด + Detailed Sync Status + @@ -1405,7 +1347,7 @@ name - The sync protocol has been copied to the clipboard. + The sync status has been copied to the clipboard. @@ -1427,31 +1369,55 @@ name ตั้งค่า - + %1 - - Protocol + + Status - + General ทั่วไป - + Network - + Account + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1466,67 +1432,67 @@ name - + SSL Connection SSL Connection - + Warnings about current SSL Connection: คำเตือนเกี่ยวกับการเชื่อมต่อด้วย SSL ที่ใช้อยู่ - + with Certificate %1 ด้วยใบรับรองความปลอดภัย %1 - - - + + + &lt;not specified&gt; &lt;ยังไม่ได้ถูกระบุ&gt; - - + + Organization: %1 หน่วยงาน: %1 - - + + Unit: %1 หน่วย: %1 - - + + Country: %1 ประเทศ: %1 - + Fingerprint (MD5): <tt>%1</tt> ลายนิ้วมือ (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> ลายนิ้วมือ (SHA1): <tt>%1</tt> - + Effective Date: %1 วันที่บังคับใช้: %1 - + Expiry Date: %1 วันที่หมดอายุ: %1 - + Issuer: %1 ผู้รับรอง: %1 @@ -1544,17 +1510,17 @@ name - + Skip update - + Skip this time - + Get update @@ -1562,169 +1528,116 @@ name Mirall::ownCloudGui - + %1 Sync Started การซิงค์ข้อมูล %1 เริ่มต้นแล้ว - + Sync started for %n configured sync folder(s). - + 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 - + Quota n/a - + %1% of %2 in use - + No items synced recently - + %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) - + Up to date - - Mirall::ownCloudInfo - - - Proxy Refused Connection - - - - - The configured proxy has refused the connection. Please check the proxy settings. - - - - - Proxy Closed Connection - - - - - The configured proxy has closed the connection. Please check the proxy settings. - - - - - Proxy Not Found - - - - - The configured proxy could not be found. Please check the proxy settings. - - - - - Proxy Authentication Error - - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - - - - - Proxy Connection Timed Out - - - - - The connection to the configured proxy has timed out. - - - OwncloudAdvancedSetupPage @@ -1990,6 +1903,35 @@ name + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2021,12 +1963,12 @@ name main.cpp - + System Tray not available - + %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. @@ -2069,7 +2011,7 @@ name - + Context @@ -2095,44 +2037,60 @@ name - + deleted ลบแล้ว - - + + + Move + + + + + downloading - - + + uploading - + inactive - + starting - + finished - + delete ลบ + + + move + + + + + moved + + theme diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts index 4ee44bee0..f2b6b9260 100644 --- a/translations/mirall_uk.ts +++ b/translations/mirall_uk.ts @@ -77,11 +77,6 @@ Modify Account - - - Sync Status - - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause Пауза @@ -103,6 +98,11 @@ Add Folder... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ - + 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> - - Checking %1 connection... - Перевірка %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 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. - - Version: %1 (%2) - Версія: %1 (%2) - - - - unknown problem. - невідома проблема. - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>Не вдалося підключитись до %1: <tt>%2</tt></p> - - - + Start - + Currently - + Completely - + %1 %2 %3 (%4 of %5) - + Completely finished. - + %1 of %2, file %3 of %4 - - %1 of %2 in use. + + Connected to <a href="%1">%2</a> as <i>%3</i>. - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. @@ -357,6 +352,11 @@ CSync unspecified error. Невизначена помилка CSync. + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -386,166 +386,134 @@ Mirall::ConnectionValidator - - No ownCloud connection configured + + No ownCloud account configured - + The configured server for this client is too old - + Please update to the latest server and restart the client. - + Unable to connect to %1 - + The provided credentials are not correct - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - Не знайдено запису про пароль в брелку. Будь ласка, переналаштуйте. - - Mirall::Folder - + Unable to create csync-context - + Local folder %1 does not exist. Локальна тека %1 не існує. - + %1 should be a directory but is not. %1 повинна бути текою, але нею не є. - + %1 is not readable. %1 не читається. - + File %1: %2 - + + File %1 - - New file available + + downloaded - - '%1' has been synced to this machine. + + removed - - New files available - - - - - '%1' and %n other file(s) have been synced to this machine. - - - - - File removed + + updated - - '%1' has been removed. + + renamed - - Files removed - - - - - '%1' and %n other file(s) have been removed. - - - - - File updated + + '%1' has been %2. - - '%1' has been updated. + + Files %1 - - Files updated + + '%1' and %2 other files have been %3. - - - '%1' and %n other file(s) have been updated. - - - + Error Помилка - + The CSync thread terminated. CSync процес відмінено. - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". - + 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 @@ -553,62 +521,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. Синхронізація запущена. - + Server is currently not available. - + Last Sync was successful. Остання синхронізація була успішною. - + Last Sync was successful, but with warnings on individual files. - + Setup Error. Помилка установки. - + User Abort. - + %1 (Sync is paused) @@ -645,8 +613,8 @@ documentation for possible fixes. Mirall::FolderWizard - - + + Add Folder Додати Теку @@ -654,42 +622,42 @@ documentation for possible fixes. Mirall::FolderWizardSourcePage - + No local folder selected! - + You have no permission to write to the selected folder! - + The local path %1 is already an upload folder.<br/>Please pick another one! Локальний шлях %1 вже є текою для завантаження.<br/>Будь ласка, оберіть інший! - + An already configured folder is contained in the current entry. В поточному запису містяться вже налаштовані теки. - + An already configured folder contains the currently entered directory. Вже налаштована тека містить вказаний каталог. - + The alias can not be empty. Please provide a descriptive alias word. Псевдонім не може бути порожнім. Будь ласка, вкажіть описове слово-псевдонім. - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>Псевдонім <i>%1</i> уже використовується. Будь ласка, оберіть інший. - + Select the source folder Оберіть початкову теку @@ -697,42 +665,42 @@ documentation for possible fixes. Mirall::FolderWizardTargetPage - + Add Remote Folder - + Enter the name of the new folder: - + Folder was successfully created on %1. Теку успішно створено на %1. - + Failed to create the folder on %1.<br/>Please check manually. Не вдалося створити теку на %1.<br/>Будь ласка, перевірте вручну. - + Choose this to sync the entire account - + This directory is already being synced. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. @@ -746,8 +714,8 @@ documentation for possible fixes. - General - Загалом + General Setttings + @@ -789,36 +757,36 @@ documentation for possible fixes. Видалити - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. - + Could not open file - + Cannot write changes to '%1'. - - - - Add Ignore Pattern - - + Add Ignore Pattern + + + + + Add a new ignore pattern: - + This entry is provided by the system at '%1' and cannot be modified in this view. @@ -826,52 +794,52 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::LogBrowser - + Log Output Вивід журналу - + &Search: &Пошук: - + &Find &Знайти - + Clear Очистити - + Clear the log display. Очистити дисплей журналу. - + S&ave З&берегти - + Save the log file to a file on disk for debugging. Зберегти файл журналу у файл на диску для обробки. - + Error Помилка - + Save log file Зберегти файл журналу - + Could not write to log file Не вдалося записати файл журналу @@ -993,47 +961,47 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudAdvancedSetupPage - + Connect to %1 - + Setup local folder options - + Connect... - + Your entire account will be synced to the local folder '%1'. - + %1 folder '%2' is synced to local folder '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> - + Local Sync Folder - + Update advanced setup @@ -1041,44 +1009,21 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudHttpCredsPage - + Connect to %1 - + Enter user credentials - + Update user credentials - - Mirall::OwncloudPropagator - - - Aborted - - - - - Could not remove directory %1 - - - - - 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. - - - Mirall::OwncloudSetupPage @@ -1102,7 +1047,7 @@ Checked items will also be deleted if they prevent a directory from being remove - + Update %1 server @@ -1110,129 +1055,126 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudSetupWizard - + Folder rename failed - + 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. - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - - - - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">Успішно підключено до %1: %2 версія %3 (%4)</font><br/><br/> - - Failed to connect to %1:<br/>%2 - - - - + 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 - - The remote folder could not be accessed! + + + 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. Віддалена тека %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> - + <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 встановити не вдалося. Будь ласка, перевірте ще раз. @@ -1240,7 +1182,7 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizard - + %1 Connection Wizard Майстер з'єднання %1 @@ -1248,27 +1190,27 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizardResultPage - + Open %1 - + Open Local Folder - + Everything set up! - + Your entire account is synced to the local folder <i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> @@ -1282,8 +1224,8 @@ Checked items will also be deleted if they prevent a directory from being remove - Detailed Sync Protocol - Докладний Протокол Синхронізації + Detailed Sync Status + @@ -1405,8 +1347,8 @@ name - The sync protocol has been copied to the clipboard. - Протокол синхронізації був скопійований в буфер обміну. + The sync status has been copied to the clipboard. + @@ -1427,31 +1369,55 @@ name Налаштування - + %1 - - Protocol + + Status - + General Загалом - + Network - + Account + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1466,67 +1432,67 @@ name - + SSL Connection SSL з'єднання - + Warnings about current SSL Connection: Попередження про існуюче SSL з'єднання: - + with Certificate %1 з Сертифікатом %1 - - - + + + &lt;not specified&gt; &lt;не вказано&gt; - - + + Organization: %1 Організація: %1 - - + + Unit: %1 Підрозділ: %1 - - + + Country: %1 Країна: %1 - + Fingerprint (MD5): <tt>%1</tt> Відбиток (MD5): <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> Відбиток (SHA1): <tt>%1</tt> - + Effective Date: %1 Дата введення в дію: %1 - + Expiry Date: %1 Дата закінчення дії: %1 - + Issuer: %1 Емітент: %1 @@ -1544,17 +1510,17 @@ name - + Skip update - + Skip this time - + Get update @@ -1562,169 +1528,116 @@ name Mirall::ownCloudGui - + %1 Sync Started %1 синхронізація розпочата - + Sync started for %n configured sync folder(s). - + 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 - + Quota n/a - + %1% of %2 in use - + No items synced recently - + %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) - + Up to date - - Mirall::ownCloudInfo - - - Proxy Refused Connection - - - - - The configured proxy has refused the connection. Please check the proxy settings. - - - - - Proxy Closed Connection - - - - - The configured proxy has closed the connection. Please check the proxy settings. - - - - - Proxy Not Found - - - - - The configured proxy could not be found. Please check the proxy settings. - - - - - Proxy Authentication Error - - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - - - - - Proxy Connection Timed Out - - - - - The connection to the configured proxy has timed out. - - - OwncloudAdvancedSetupPage @@ -1990,6 +1903,35 @@ name + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2021,12 +1963,12 @@ name main.cpp - + System Tray not available - + %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. @@ -2069,7 +2011,7 @@ name - + Context @@ -2095,44 +2037,60 @@ name - + deleted видалені - - + + + Move + + + + + downloading - - + + uploading - + inactive - + starting - + finished - + delete видалити + + + move + + + + + moved + + theme diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts index 29c79f4ab..c3043e596 100644 --- a/translations/mirall_zh_CN.ts +++ b/translations/mirall_zh_CN.ts @@ -77,11 +77,6 @@ Modify Account - - - Sync Status - 同步状态 - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause 暂停 @@ -103,6 +98,11 @@ Add Folder... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ 存储使用情况 - + 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> - - Checking %1 connection... - 检查 %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 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. - - Version: %1 (%2) - 版本：%1 (%2) - - - - unknown problem. - 未知错误 - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>连接到 %1 失败：<tt>%2</tt></p> - - - + Start 开始 - + Currently - + Completely - + %1 %2 %3 (%4 of %5) - + Completely finished. - + %1 of %2, file %3 of %4 - - %1 of %2 in use. + + Connected to <a href="%1">%2</a> as <i>%3</i>. - + + No connection to %1 at <a href="%1">%2</a>. + + + + Currently there is no storage usage information available. @@ -357,6 +352,11 @@ CSync unspecified error. CSync 未定义错误。 + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -386,166 +386,134 @@ Mirall::ConnectionValidator - - No ownCloud connection configured + + No ownCloud account configured - + The configured server for this client is too old - + Please update to the latest server and restart the client. - + Unable to connect to %1 - + The provided credentials are not correct - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - 钥匙链中未找到密码项。请重新配置。 - - Mirall::Folder - + Unable to create csync-context - + Local folder %1 does not exist. 本地文件夹 %1 不存在。 - + %1 should be a directory but is not. %1 应为目录但并不是。 - + %1 is not readable. %1 不可读。 - + File %1: %2 - + + File %1 - - New file available + + downloaded - - '%1' has been synced to this machine. + + removed - - New files available - - - - - '%1' and %n other file(s) have been synced to this machine. - - - - - File removed + + updated - - '%1' has been removed. + + renamed - - Files removed - - - - - '%1' and %n other file(s) have been removed. - - - - - File updated + + '%1' has been %2. - - '%1' has been updated. + + Files %1 - - Files updated + + '%1' and %2 other files have been %3. - - - '%1' and %n other file(s) have been updated. - - - + Error 错误 - + The CSync thread terminated. CSync线程终止 - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". - + 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 @@ -553,62 +521,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. 同步正在运行。 - + Server is currently not available. - + Last Sync was successful. 最后一次同步成功。 - + Last Sync was successful, but with warnings on individual files. - + Setup Error. 安装失败 - + User Abort. - + %1 (Sync is paused) @@ -645,8 +613,8 @@ documentation for possible fixes. Mirall::FolderWizard - - + + Add Folder 添加目录 @@ -654,42 +622,42 @@ documentation for possible fixes. Mirall::FolderWizardSourcePage - + No local folder selected! 未选择本地文件夹！ - + You have no permission to write to the selected folder! - + The local path %1 is already an upload folder.<br/>Please pick another one! 本地路径 %1 已是一个上传文件夹。<br/>请选择另一个！ - + An already configured folder is contained in the current entry. 当前路径包含一个已配置的文件夹。 - + An already configured folder contains the currently entered directory. 当前文件夹中包含一个已配置的文件夹。 - + The alias can not be empty. Please provide a descriptive alias word. 别名不能为空。请提供一个描述性的别名。 - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>别名 <i>%1</i>已存在。请另选一个。 - + Select the source folder 选择源目录 @@ -697,42 +665,42 @@ documentation for possible fixes. Mirall::FolderWizardTargetPage - + 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.<br/>Please check manually. 在 %1 上创建文件夹失败。<br/>请手动检查。 - + Choose this to sync the entire account - + This directory is already being synced. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. 当同步根文件夹时不能设置其他的同步目录。 @@ -746,8 +714,8 @@ documentation for possible fixes. - General - 常规 + General Setttings + @@ -789,36 +757,36 @@ documentation for possible fixes. 移除 - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. - + Could not open file - + Cannot write changes to '%1'. - - - - Add Ignore Pattern - - + Add Ignore Pattern + + + + + Add a new ignore pattern: - + This entry is provided by the system at '%1' and cannot be modified in this view. @@ -826,52 +794,52 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::LogBrowser - + Log Output 日志输出 - + &Search: &搜索： - + &Find &查找 - + Clear 清除 - + Clear the log display. 清空日志显示。 - + S&ave 保存 - + Save the log file to a file on disk for debugging. 保存日志文件到磁盘以供调试。 - + Error 错误 - + Save log file 保存日志文件 - + Could not write to log file 无法写到日志文件 @@ -993,47 +961,47 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudAdvancedSetupPage - + Connect to %1 - + Setup local folder options - + Connect... - + Your entire account will be synced to the local folder '%1'. - + %1 folder '%2' is synced to local folder '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> - + Local Sync Folder - + Update advanced setup @@ -1041,44 +1009,21 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudHttpCredsPage - + Connect to %1 - + Enter user credentials - + Update user credentials - - Mirall::OwncloudPropagator - - - Aborted - - - - - Could not remove directory %1 - - - - - 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. - - - Mirall::OwncloudSetupPage @@ -1102,7 +1047,7 @@ Checked items will also be deleted if they prevent a directory from being remove 此地址不安全。不应该使用它。 - + Update %1 server @@ -1110,129 +1055,126 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudSetupWizard - + Folder rename failed 文件夹更名失败 - + 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. 不能删除或备份文件夹，因为文件夹或其中的一个文件正在被另一个程序打开。请关闭文件或文件夹然后点击重试，或者取消安装。 - + + <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... - - Trying to connect to %1 at %2 to determine authentication type... - - - - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">成功连接到 %1：%2 版本 %3 (%4)</font><br/><br/> - - Failed to connect to %1:<br/>%2 - 连接到 %1：<br/>%2 失败 - - - + 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 - - The remote folder could not be accessed! - 不能访问远程文件夹！ + + + 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的链接，请稍后重试 @@ -1240,7 +1182,7 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizard - + %1 Connection Wizard %1 链接向导 @@ -1248,27 +1190,27 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizardResultPage - + Open %1 打开 %1 - + Open Local Folder 打开本地文件夹 - + Everything set up! - + Your entire account is synced to the local folder <i>%1</i> 您的整个账户将被同步到本地文件夹<i>%1</i> - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> @@ -1282,8 +1224,8 @@ Checked items will also be deleted if they prevent a directory from being remove - Detailed Sync Protocol - 详细同步协议 + Detailed Sync Status + @@ -1405,8 +1347,8 @@ name - The sync protocol has been copied to the clipboard. - 同步协议已经复制到剪贴板。 + The sync status has been copied to the clipboard. + @@ -1427,31 +1369,55 @@ name 设置 - + %1 - - Protocol + + Status - + General 常规 - + Network - + Account 账户 + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1466,67 +1432,67 @@ name - + SSL Connection SSL链接 - + Warnings about current SSL Connection: 当前 SSL 连接的警告： - + with Certificate %1 使用证书 %1 - - - + + + &lt;not specified&gt; &lt;未指定&gt; - - + + Organization: %1 组织：%1 - - + + Unit: %1 单位：%1 - - + + Country: %1 国家: %1 - + Fingerprint (MD5): <tt>%1</tt> MD5指纹: <tt>%1</tt> - + Fingerprint (SHA1): <tt>%1</tt> SHA1指纹: <tt>%1</tt> - + Effective Date: %1 有效日期：%1 - + Expiry Date: %1 过期日期：%1 - + Issuer: %1 签发人：%1 @@ -1544,17 +1510,17 @@ name <p>新版本的 %1 客户端可用。</p><p><b>%2</b> 已经开放下载。已安装的版本是 %3。<p> - + Skip update 跳过更新 - + Skip this time 本次跳过 - + Get update 获取更新 @@ -1562,169 +1528,116 @@ name Mirall::ownCloudGui - + %1 Sync Started %1 同步已启动 - + Sync started for %n configured sync folder(s). - + 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 在浏览器中打开%1 - + Calculating quota... - + Unknown status - + Settings... - + Details... - + Help 帮助 - + Quit %1 - + Quota n/a - + %1% of %2 in use - + No items synced recently - + %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) - + Up to date 更新 - - Mirall::ownCloudInfo - - - Proxy Refused Connection - 代理连接错误 - - - - The configured proxy has refused the connection. Please check the proxy settings. - 设置代理拒绝连接。请重新检查代理设置。 - - - - Proxy Closed Connection - 代理连接关闭 - - - - The configured proxy has closed the connection. Please check the proxy settings. - 设置代理已经关闭连接。请检查代理设置。 - - - - Proxy Not Found - 未找到代理 - - - - The configured proxy could not be found. Please check the proxy settings. - 设置代理未找到。请检查代理设置。 - - - - Proxy Authentication Error - 代理认证试错误 - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - 设置代理要求登陆但代理认证错误。请检查代理设置 - - - - Proxy Connection Timed Out - 代理转接超时 - - - - The connection to the configured proxy has timed out. - 连接设置代理超时。 - - OwncloudAdvancedSetupPage @@ -1990,6 +1903,35 @@ name 按钮 + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2021,12 +1963,12 @@ name main.cpp - + System Tray not available - + %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. @@ -2069,7 +2011,7 @@ name - + Context @@ -2095,44 +2037,60 @@ name - + deleted 已经删除 - - + + + Move + + + + + downloading - - + + uploading - + inactive - + starting - + finished - + delete 删除 + + + move + + + + + moved + + theme diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts index bbe16dd88..38c1bdae6 100644 --- a/translations/mirall_zh_TW.ts +++ b/translations/mirall_zh_TW.ts @@ -77,11 +77,6 @@ Modify Account 修改帳號 - - - Sync Status - 同步處理狀態 - Connected with <server> as <user> @@ -89,7 +84,7 @@ - + Pause 暫停 @@ -103,6 +98,11 @@ Add Folder... + + + Accounts to Synchronize + + Info... @@ -114,117 +114,112 @@ 空間用途 - + 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> - - Checking %1 connection... - 檢查%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 of %2 (%3%) in use. + + + + Connected to <a href="%1">%2</a>. - - Version: %1 (%2) - 版本: : %1 (%2) - - - - unknown problem. - 未知的問題 - - - - <p>Failed to connect to %1: <tt>%2</tt></p> - <p>連線到 %1: <tt>%2</tt>失敗</p> - - - + Start - + 啟動 - + Currently - + 目前 - + Completely - + 完成 - + %1 %2 %3 (%4 of %5) - + %1 %2 %3 (%4 的 %5) - + Completely finished. - + 完成結束。 - + %1 of %2, file %3 of %4 + %1 的 %2, 檔案 %3 的 %4 + + + + Connected to <a href="%1">%2</a> as <i>%3</i>. - - %1 of %2 in use. + + No connection to %1 at <a href="%1">%2</a>. - + Currently there is no storage usage information available. @@ -357,6 +352,11 @@ CSync unspecified error. CSync 未知的錯誤。 + + + Unable to initialize a sync journal. + + CSync failed to connect to the network. @@ -386,166 +386,134 @@ Mirall::ConnectionValidator - - No ownCloud connection configured + + No ownCloud account configured - + The configured server for this client is too old - + Please update to the latest server and restart the client. - + Unable to connect to %1 - + The provided credentials are not correct - - Mirall::CredentialStore - - - No password entry found in keychain. Please reconfigure. - 在鑰匙圈當中找不到密碼資訊，請重新設定。 - - Mirall::Folder - + Unable to create csync-context - + Local folder %1 does not exist. 本地資料夾 %1 不存在 - + %1 should be a directory but is not. 資料夾不存在, %1 必須是資料夾 - + %1 is not readable. %1 是不可讀的 - + File %1: %2 - + + File %1 - - New file available + + downloaded - - '%1' has been synced to this machine. + + removed - - New files available - - - - - '%1' and %n other file(s) have been synced to this machine. - - - - - File removed + + updated - - '%1' has been removed. + + renamed - - Files removed - - - - - '%1' and %n other file(s) have been removed. - - - - - File updated + + '%1' has been %2. - - '%1' has been updated. + + Files %1 - - Files updated + + '%1' and %2 other files have been %3. - - - '%1' and %n other file(s) have been updated. - - - + Error 錯誤 - + The CSync thread terminated. CSync 執行緒終止 - + This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files". - + 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 @@ -553,62 +521,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. 同步執行中 - + Server is currently not available. - + Last Sync was successful. 最後一次同步成功 - + Last Sync was successful, but with warnings on individual files. - + Setup Error. 安裝失敗 - + User Abort. - + %1 (Sync is paused) @@ -645,8 +613,8 @@ documentation for possible fixes. Mirall::FolderWizard - - + + Add Folder 新增資料夾 @@ -654,42 +622,42 @@ documentation for possible fixes. Mirall::FolderWizardSourcePage - + No local folder selected! 沒有選擇本地資料夾! - + You have no permission to write to the selected folder! 您沒有權限來寫入被選取的資料夾! - + The local path %1 is already an upload folder.<br/>Please pick another one! 本地路徑 %1 已是上傳資料夾，<br/>請選擇其他資料夾！ - + An already configured folder is contained in the current entry. 此項目中包含了已經設定同步的資料夾 - + An already configured folder contains the currently entered directory. 已配置的資料夾包含了目前輸入的資料夾 - + The alias can not be empty. Please provide a descriptive alias word. 別名不能空白, 請提供一個描述性的別名 - + <br/>The alias <i>%1</i> is already in use. Please pick another alias. <br/>別名 <i>%1</i> 重複. 請取別的別名. - + Select the source folder 選擇來源資料夾 @@ -697,42 +665,42 @@ documentation for possible fixes. Mirall::FolderWizardTargetPage - + Add Remote Folder - + Enter the name of the new folder: - + Folder was successfully created on %1. 資料夾成功建立在%1 - + Failed to create the folder on %1.<br/>Please check manually. 在%1建立資料夾失敗<br/>請手動檢查 - + Choose this to sync the entire account - + This directory is already being synced. - + You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>. - + If you sync the root folder, you can <b>not</b> configure another sync directory. 如果您選擇同步根目錄（最上層資料夾），就<b>不能</b>再設定另一個同步資料夾。 @@ -746,8 +714,8 @@ documentation for possible fixes. - General - 一般 + General Setttings + @@ -789,36 +757,36 @@ documentation for possible fixes. 移除 - + Files or directories matching a pattern will not be synchronized. Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data. - + Could not open file - + Cannot write changes to '%1'. - - - - Add Ignore Pattern - - + Add Ignore Pattern + + + + + Add a new ignore pattern: - + This entry is provided by the system at '%1' and cannot be modified in this view. @@ -826,52 +794,52 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::LogBrowser - + Log Output 記錄輸出 - + &Search: &搜尋: - + &Find &尋找: - + Clear 清除 - + Clear the log display. 清除所顯示的記錄 - + S&ave 儲存 - + Save the log file to a file on disk for debugging. 將記錄檔儲存到硬碟用於除錯 - + Error 錯誤 - + Save log file 儲存記錄檔 - + Could not write to log file 無法寫入記錄檔 @@ -993,47 +961,47 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudAdvancedSetupPage - + Connect to %1 - + Setup local folder options - + Connect... - + Your entire account will be synced to the local folder '%1'. - + %1 folder '%2' is synced to local folder '%3' - + <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> - + <p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p> - + Local Sync Folder - + Update advanced setup @@ -1041,44 +1009,21 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudHttpCredsPage - + Connect to %1 - + Enter user credentials - + Update user credentials - - Mirall::OwncloudPropagator - - - Aborted - - - - - Could not remove directory %1 - - - - - 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. - - - Mirall::OwncloudSetupPage @@ -1102,7 +1047,7 @@ Checked items will also be deleted if they prevent a directory from being remove 這個 URL 不安全，您不應該使用它。 - + Update %1 server @@ -1110,129 +1055,126 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudSetupWizard - + Folder rename failed 重新命名資料夾失敗 - + 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. 無法移除與備份此資料夾，因為有其他的程式正在使用其中的資料夾或者檔案。請關閉使用中的資料夾或檔案並重式或者取消設定。 - + + <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 - - Trying to connect to %1 at %2 to determine authentication type... - - - - + <font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/> <font color="green">成功連線到 %1: %2 版本 %3 (%4)</font><br/><br/> - - Failed to connect to %1:<br/>%2 - 無法連線到 %1 ：<br/>%2 - - - + 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 - - The remote folder could not be accessed! - 無法存取遠端資料夾！ + + + 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, 請重新檢查 @@ -1240,7 +1182,7 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizard - + %1 Connection Wizard %1連線精靈 @@ -1248,27 +1190,27 @@ Checked items will also be deleted if they prevent a directory from being remove Mirall::OwncloudWizardResultPage - + Open %1 打開 %1 - + Open Local Folder 打開本地資料夾 - + Everything set up! - + Your entire account is synced to the local folder <i>%1</i> 您整個帳號的資料會與本地資料夾 <i>%1</i> 同步 - + %1 folder <i>%1</i> is synced to local folder <i>%2</i> @@ -1282,8 +1224,8 @@ Checked items will also be deleted if they prevent a directory from being remove - Detailed Sync Protocol - 同步協定細節 + Detailed Sync Status + @@ -1405,8 +1347,8 @@ name - The sync protocol has been copied to the clipboard. - 同步協定已複製至剪貼簿 + The sync status has been copied to the clipboard. + @@ -1427,31 +1369,55 @@ name 設定 - + %1 - - Protocol + + Status - + General 一般 - + Network - + Account 帳號 + + Mirall::ShibbolethWebView + + + %1 - Authenticate + + + + + %1 - %2 + + + + + Error loading IdP login page + + + + + Could not load Shibboleth login page to log you in. +Please ensure that your network connection is working. + + + Mirall::SslErrorDialog @@ -1466,67 +1432,67 @@ name - + SSL Connection SSL連線 - + Warnings about current SSL Connection: 目前的SSL連線的警告 - + with Certificate %1 使用認證%1 - - - + + + &lt;not specified&gt; &lt;未指定&gt; - - + + Organization: %1 組織:%1 - - + + Unit: %1 單位:%1 - - + + Country: %1 國家:%1 - + Fingerprint (MD5): <tt>%1</tt> 指紋 (MD5): &lt;tt&gt;%1&lt;/tt&gt; - + Fingerprint (SHA1): <tt>%1</tt> 指紋 (SHA1): &lt;tt&gt;%1&lt;/tt&gt; - + Effective Date: %1 有效日期:%1 - + Expiry Date: %1 失效日期:%1 - + Issuer: %1 發行者:%1 @@ -1544,17 +1510,17 @@ name <p>%1 客戶端有新版本了。</p><p><b>%2</b> 可供下載，目前安裝的版本是 %3 。<p> - + Skip update 略過更新 - + Skip this time 跳過這次更新 - + Get update 取得更新 @@ -1562,169 +1528,116 @@ name Mirall::ownCloudGui - + %1 Sync Started %1同步已經開始 - + Sync started for %n configured sync folder(s). - + 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 - + Quota n/a - + %1% of %2 in use - + No items synced recently - + %1 (%2, %3) - + Syncing %1 of %2 (%3 of %4) - + Up to date 最新的 - - Mirall::ownCloudInfo - - - Proxy Refused Connection - 代理伺服器拒絕連線 - - - - The configured proxy has refused the connection. Please check the proxy settings. - 所設定的代理伺服器拒絕連線，請檢查代理伺服器設定。 - - - - Proxy Closed Connection - 代理伺服器關閉了連線 - - - - The configured proxy has closed the connection. Please check the proxy settings. - 所設定的代理伺服器關閉了連線，請檢查代理伺服器設定。 - - - - Proxy Not Found - 找不到代理伺服器 - - - - The configured proxy could not be found. Please check the proxy settings. - 找不到所設定的代理伺服器，請檢查代理伺服器設定。 - - - - Proxy Authentication Error - 代理伺服器認證錯誤 - - - - The configured proxy requires login but the proxy credentials are invalid. Please check the proxy settings. - 所設定的代理伺服器帳密無法登入，請檢查代理伺服器設定。 - - - - Proxy Connection Timed Out - 代理伺服器連線逾時 - - - - The connection to the configured proxy has timed out. - 代理伺服器的連線已經逾時。 - - OwncloudAdvancedSetupPage @@ -1990,6 +1903,35 @@ name 按鈕 + + PropagateLocalMkdir + + + could not create directory %1 + + + + + PropagateLocalRemove + + + Could not remove directory %1 + + + + + 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. + + + Utility @@ -2021,12 +1963,12 @@ name main.cpp - + System Tray not available 系統常駐程式無法使用 - + %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需要可運作的系統常駐程式區。若您正在執行XFCE，請參考 <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">這份教學</a>。若非如此則請安裝一個系統常駐的應用程式，如'trayer'，並再度嘗試。 @@ -2069,7 +2011,7 @@ name - + Context @@ -2081,7 +2023,7 @@ name Start - + 啟動 @@ -2095,44 +2037,60 @@ name - + deleted 已刪除 - - + + + Move + + + + + downloading - - + + uploading - + inactive - + starting - + finished - + delete 刪除 + + + move + + + + + moved + + theme From 39e48d3d01f2daed95967f038750cc116df8ca97 Mon Sep 17 00:00:00 2001 From: "Mr. Jenkins" Date: Thu, 21 Nov 2013 20:06:22 -0500 Subject: [PATCH 07/42] [tx-robot] updated from transifex --- translations/mirall_ca.ts | 8 ++--- translations/mirall_cs.ts | 4 +-- translations/mirall_de.ts | 8 ++--- translations/mirall_el.ts | 2 +- translations/mirall_es.ts | 8 ++--- translations/mirall_es_AR.ts | 2 +- translations/mirall_et.ts | 8 ++--- translations/mirall_fa.ts | 2 +- translations/mirall_fi.ts | 2 +- translations/mirall_fr.ts | 8 ++--- translations/mirall_gl.ts | 8 ++--- translations/mirall_it.ts | 8 ++--- translations/mirall_ja.ts | 8 ++--- translations/mirall_nl.ts | 8 ++--- translations/mirall_pl.ts | 4 +-- translations/mirall_pt.ts | 2 +- translations/mirall_pt_BR.ts | 63 ++++++++++++++++++------------------ translations/mirall_ru.ts | 8 ++--- translations/mirall_sk.ts | 8 ++--- translations/mirall_sl.ts | 2 +- translations/mirall_sv.ts | 8 ++--- translations/mirall_uk.ts | 2 +- translations/mirall_zh_CN.ts | 2 +- translations/mirall_zh_TW.ts | 2 +- 24 files changed, 93 insertions(+), 92 deletions(-) diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts index 98af62515..9b0138cb6 100644 --- a/translations/mirall_ca.ts +++ b/translations/mirall_ca.ts @@ -1391,7 +1391,7 @@ original Status - + Estat @@ -1931,7 +1931,7 @@ Please ensure that your network connection is working. Could not remove directory %1 - + No s'ha pogut esborrar la carpeta %1 @@ -1939,12 +1939,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts index cf49188e7..04d3a7bd9 100644 --- a/translations/mirall_cs.ts +++ b/translations/mirall_cs.ts @@ -1391,7 +1391,7 @@ dostupný pod původním názvem Status - + Stav @@ -1931,7 +1931,7 @@ Please ensure that your network connection is working. Could not remove directory %1 - + Nepodařilo se odstranit adresář %1 diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts index 244445ec1..e94655b71 100644 --- a/translations/mirall_de.ts +++ b/translations/mirall_de.ts @@ -1389,7 +1389,7 @@ name Status - + Status @@ -1929,7 +1929,7 @@ Please ensure that your network connection is working. Could not remove directory %1 - + Verzeichnis %1 konnte nicht entfernt werden @@ -1937,12 +1937,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts index f38254122..46a019975 100644 --- a/translations/mirall_el.ts +++ b/translations/mirall_el.ts @@ -1376,7 +1376,7 @@ name Status - + Κατάσταση diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts index f857cd6c3..c76a5593c 100644 --- a/translations/mirall_es.ts +++ b/translations/mirall_es.ts @@ -1391,7 +1391,7 @@ original Status - + Estado @@ -1931,7 +1931,7 @@ Please ensure that your network connection is working. Could not remove directory %1 - + No se pudo eliminar el directorio %1 @@ -1939,12 +1939,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts index c63c29e61..225ebf841 100644 --- a/translations/mirall_es_AR.ts +++ b/translations/mirall_es_AR.ts @@ -1381,7 +1381,7 @@ name Status - + Estado diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts index 04d39a56b..5e74fcbb7 100644 --- a/translations/mirall_et.ts +++ b/translations/mirall_et.ts @@ -1390,7 +1390,7 @@ konflikt-failiks ning serveris asuv fail on saadaval algse nimega. Status - + Staatus @@ -1930,7 +1930,7 @@ Please ensure that your network connection is working. Could not remove directory %1 - + Kausta %1 ei saa eemaldada @@ -1938,12 +1938,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts index eb3fe8128..c708ae884 100644 --- a/translations/mirall_fa.ts +++ b/translations/mirall_fa.ts @@ -1376,7 +1376,7 @@ name Status - + وضعیت diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts index 3e0f628df..da3745159 100644 --- a/translations/mirall_fi.ts +++ b/translations/mirall_fi.ts @@ -1376,7 +1376,7 @@ name Status - + Tila diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts index dd45ab0e1..8f137ff37 100644 --- a/translations/mirall_fr.ts +++ b/translations/mirall_fr.ts @@ -1390,7 +1390,7 @@ conflits et le fichier côté serveur est disponible sous son nom original. Status - + État @@ -1930,7 +1930,7 @@ Please ensure that your network connection is working. Could not remove directory %1 - + Impossible de supprimer le dossier %1 @@ -1938,12 +1938,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts index 2029864fd..cb9fd1c2b 100644 --- a/translations/mirall_gl.ts +++ b/translations/mirall_gl.ts @@ -1391,7 +1391,7 @@ o nome orixinal Status - + Estado @@ -1931,7 +1931,7 @@ Please ensure that your network connection is working. Could not remove directory %1 - + Non foi posíbel retirar o directorio %1 @@ -1939,12 +1939,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts index 6dedd4d22..84f669a7e 100644 --- a/translations/mirall_it.ts +++ b/translations/mirall_it.ts @@ -1390,7 +1390,7 @@ conflitto, mentre il file sul server è disponibile con il nome originale Status - + Stato @@ -1930,7 +1930,7 @@ Please ensure that your network connection is working. Could not remove directory %1 - + Impossibile rimuovere la cartella %1 @@ -1938,12 +1938,12 @@ Please ensure that your network connection is working. This folder must not be renamed. It is renamed back to its original name. - + Questa cartella non può essere rinominato. 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. diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts index 9a78a40b7..ad8e648f4 100644 --- a/translations/mirall_ja.ts +++ b/translations/mirall_ja.ts @@ -1386,7 +1386,7 @@ name Status - + 状態 @@ -1926,7 +1926,7 @@ Please ensure that your network connection is working. Could not remove directory %1 - + ディレクトリ %1 を削除できません @@ -1934,12 +1934,12 @@ Please ensure that your network connection is working. 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 に戻してください。 diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts index 2acc536c7..7559f62cf 100644 --- a/translations/mirall_nl.ts +++ b/translations/mirall_nl.ts @@ -1392,7 +1392,7 @@ op de server staat beschikbaar blijft met de originele naam. Status - + Status @@ -1932,7 +1932,7 @@ Please ensure that your network connection is working. Could not remove directory %1 - + Kon map %1 niet verwijderen @@ -1940,12 +1940,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts index 63f60b626..2a6d48ff6 100644 --- a/translations/mirall_pl.ts +++ b/translations/mirall_pl.ts @@ -1376,7 +1376,7 @@ name Status - + Status @@ -1917,7 +1917,7 @@ Kliknij Could not remove directory %1 - + Nie mogę usunąć katalogu %1 diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts index d539bbc4b..1a8bc11c2 100644 --- a/translations/mirall_pt.ts +++ b/translations/mirall_pt.ts @@ -1377,7 +1377,7 @@ name Status - + Estado diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts index fce50eabc..0fbcc8c42 100644 --- a/translations/mirall_pt_BR.ts +++ b/translations/mirall_pt_BR.ts @@ -101,7 +101,7 @@ Accounts to Synchronize - + Conta para Sincronizar @@ -161,7 +161,7 @@ No account configured. - + Nenhuma conta configurada. @@ -171,7 +171,7 @@ %1 of %2 (%3%) in use. - + %1 de %2 (%3%) em uso. @@ -211,12 +211,12 @@ Connected to <a href="%1">%2</a> as <i>%3</i>. - + Conectado a <a href="%1">%2</a> como <i>%3</i>. No connection to %1 at <a href="%1">%2</a>. - + Nenhuma conexão para %1 at <a href="%1">%2</a>. @@ -355,7 +355,7 @@ Unable to initialize a sync journal. - + Impossibilitado de iniciar a sincronização. @@ -388,7 +388,7 @@ No ownCloud account configured - + Nenhuma conta ownCloud configurada @@ -447,37 +447,37 @@ downloaded - + baixado removed - + removido updated - + atualizado renamed - + renomeado '%1' has been %2. - + '%1' foi %2. Files %1 - + Arquivos %1 '%1' and %2 other files have been %3. - + '%1' e %2 outros arquivos foram %3. @@ -720,7 +720,7 @@ documentação por possíveis correções. General Setttings - + Configurações Gerais @@ -1120,12 +1120,12 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u 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! @@ -1231,7 +1231,7 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u Detailed Sync Status - + Detalhe do Status de Sincronização @@ -1361,7 +1361,7 @@ enquanto o arquivo do lado do servidor está disponível sob o nome original The sync status has been copied to the clipboard. - + O estado de sincronização foi copiado para o clipboard. @@ -1389,7 +1389,7 @@ enquanto o arquivo do lado do servidor está disponível sob o nome original Status - + Status @@ -1412,23 +1412,24 @@ enquanto o arquivo do lado do servidor está disponível sob o nome original %1 - Authenticate - + %1 - Autenticar %1 - %2 - + %1 - %2 Error loading IdP login page - + Erro ao carregar página de login IdP Could not load Shibboleth login page to log you in. Please ensure that your network connection is working. - + Não foi possível carregar a página de login Shibboleth para conectá-lo +Certifique-se que sua conexão de rede está funcionando. @@ -1921,7 +1922,7 @@ Please ensure that your network connection is working. could not create directory %1 - + Não foi possível criar diretório %1 @@ -1929,7 +1930,7 @@ Please ensure that your network connection is working. Could not remove directory %1 - + O diretório %1 não pode ser removido @@ -1937,12 +1938,12 @@ Please ensure that your network connection is working. This folder must not be renamed. It is renamed back to its original name. - + Esta pasta não pode ser renomeada. Ele 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. @@ -2058,7 +2059,7 @@ Please ensure that your network connection is working. Move - + Mover @@ -2097,12 +2098,12 @@ Please ensure that your network connection is working. move - + mover moved - + movido diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts index 2d9f5cc03..3202b7d9a 100644 --- a/translations/mirall_ru.ts +++ b/translations/mirall_ru.ts @@ -1392,7 +1392,7 @@ name Status - + Статус @@ -1932,7 +1932,7 @@ Please ensure that your network connection is working. Could not remove directory %1 - + Невозможно удалить директорию %1 @@ -1940,12 +1940,12 @@ Please ensure that your network connection is working. 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 diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts index 82354969d..10fdea2a2 100644 --- a/translations/mirall_sk.ts +++ b/translations/mirall_sk.ts @@ -1390,7 +1390,7 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvom Status - + Stav @@ -1930,7 +1930,7 @@ Please ensure that your network connection is working. Could not remove directory %1 - + Nemožno odstrániť priečinok %1 @@ -1938,12 +1938,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts index 6e01cc9e1..140853e69 100644 --- a/translations/mirall_sl.ts +++ b/translations/mirall_sl.ts @@ -1376,7 +1376,7 @@ name Status - + Stanje diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts index ac4c4b510..fc35abfd2 100644 --- a/translations/mirall_sv.ts +++ b/translations/mirall_sv.ts @@ -1389,7 +1389,7 @@ medan filen från serversidan är tillgänglig under originalnamnet Status - + Status @@ -1929,7 +1929,7 @@ Please ensure that your network connection is working. Could not remove directory %1 - + Kunde ej ta bort mappen %1 @@ -1937,12 +1937,12 @@ Please ensure that your network connection is working. This folder must not be renamed. It is renamed back to its original name. - + Denna katalog får inte byta namn. Den kommer att döpas om till sitt original namn. This folder must not be renamed. Please name it back to Shared. - + Denna katalog får ej döpas om. Snälla döp den till Delad diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts index f2b6b9260..d0047a386 100644 --- a/translations/mirall_uk.ts +++ b/translations/mirall_uk.ts @@ -1376,7 +1376,7 @@ name Status - + Статус diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts index c3043e596..39049f963 100644 --- a/translations/mirall_zh_CN.ts +++ b/translations/mirall_zh_CN.ts @@ -1376,7 +1376,7 @@ name Status - + 状态 diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts index 38c1bdae6..7eaf45dca 100644 --- a/translations/mirall_zh_TW.ts +++ b/translations/mirall_zh_TW.ts @@ -1376,7 +1376,7 @@ name Status - + 狀態 From 65bd4be16e0224f8a892107e2ad4691ef9f1c633 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Fri, 22 Nov 2013 15:37:35 +0100 Subject: [PATCH 08/42] Make sure all queries are initialized on our database object. Since we use a database with the non default name, we need to do that, otherwise the query is initialized on the default db which is not open in our case. --- src/mirall/syncjournaldb.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mirall/syncjournaldb.cpp b/src/mirall/syncjournaldb.cpp index 8251cf820..6fad9e84d 100644 --- a/src/mirall/syncjournaldb.cpp +++ b/src/mirall/syncjournaldb.cpp @@ -684,7 +684,7 @@ void SyncJournalDb::wipeBlacklistEntry( const QString& file ) { QMutexLocker locker(&_mutex); if( checkConnect() ) { - QSqlQuery query; + QSqlQuery query(_db); query.prepare("DELETE FROM blacklist WHERE path=:path"); query.bindValue(":path", file); @@ -697,7 +697,7 @@ void SyncJournalDb::wipeBlacklistEntry( const QString& file ) void SyncJournalDb::updateBlacklistEntry( const SyncJournalBlacklistRecord& item ) { QMutexLocker locker(&_mutex); - QSqlQuery query; + QSqlQuery query(_db); if( !checkConnect() ) { return; @@ -711,7 +711,7 @@ void SyncJournalDb::updateBlacklistEntry( const SyncJournalBlacklistRecord& item return; } - QSqlQuery iQuery; + QSqlQuery iQuery(_db); if( query.next() ) { int retries = query.value(0).toInt(); retries--; From ecb244492364a85b4c8fe829eb7d285b7a65491e Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Fri, 22 Nov 2013 19:45:26 +0100 Subject: [PATCH 09/42] Handle changing source file in upload correctly. Delete the file on the server if the source file is new, but the source did not arrive completely within a timespan. --- src/mirall/csyncthread.cpp | 2 +- src/mirall/owncloudpropagator.cpp | 27 +++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/mirall/csyncthread.cpp b/src/mirall/csyncthread.cpp index 3869fab20..daf314527 100644 --- a/src/mirall/csyncthread.cpp +++ b/src/mirall/csyncthread.cpp @@ -601,7 +601,7 @@ void CSyncThread::slotProgress(Progress::Kind kind, const QString &file, quint64 pInfo.timestamp = QDateTime::currentDateTime(); // Connect to something in folder! - transmissionProgress( pInfo ); + emit transmissionProgress( pInfo ); } /* Given a path on the remote, give the path as it is when the rename is done */ diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp index 05afb25d4..be3ca71ab 100644 --- a/src/mirall/owncloudpropagator.cpp +++ b/src/mirall/owncloudpropagator.cpp @@ -299,6 +299,8 @@ void PropagateUploadFile::start() * If the file has changed, retry. */ qDebug() << "** PUT request to" << uri.data(); + const SyncJournalDb::UploadInfo progressInfo = _propagator->_journal->getUploadInfo(_item._file); + do { Hbf_State state = HBF_SUCCESS; QScopedPointer trans(hbf_init_transfer(uri.data())); @@ -309,7 +311,6 @@ void PropagateUploadFile::start() Q_ASSERT(trans); state = hbf_splitlist(trans.data(), file.handle()); - const SyncJournalDb::UploadInfo progressInfo = _propagator->_journal->getUploadInfo(_item._file); if (progressInfo._valid) { if (progressInfo._modtime.toTime_t() == _item._modtime) { trans->start_id = progressInfo._chunk; @@ -342,8 +343,6 @@ void PropagateUploadFile::start() if( !fid.isEmpty() ) { if( !_item._fileId.isEmpty() && _item._fileId != fid ) { qDebug() << "WARN: File ID changed!" << _item._fileId << fid; - } else { - qDebug() << "FileID is" << fid; } _item._fileId = fid; } @@ -353,15 +352,35 @@ void PropagateUploadFile::start() /* If the source file changed during submission, lets try again */ if( state == HBF_SOURCE_FILE_CHANGE ) { - if( attempts++ < 30 ) { /* FIXME: How often do we want to try? */ + if( attempts++ < 20 ) { /* FIXME: How often do we want to try? */ qDebug("SOURCE file has changed during upload, retry #%d in two seconds!", attempts); sleep(2); continue; } + // Still the file change error, but we tried a couple of times. + // Ignore this file for now. + // Lets remove the file from the server (at least if it is new) as it is different + // from our file here. + if( _item._instruction == CSYNC_INSTRUCTION_NEW ) { + QScopedPointer uri( + ne_path_escape((_propagator->_remoteDir + _item._file).toUtf8())); + + int rc = ne_delete(_propagator->_session, uri.data()); + qDebug() << "Remove the invalid file from server:" << rc; + } + + const QString errMsg = tr("Local file changed during sync, syncing once it arrived completely"); + done( SyncFileItem::SoftError, errMsg ); + emit progress(Progress::Error, _item._file, 0, + (quint64) errMsg.constData() ); + + return; } // FIXME: find out the error class. _item._httpErrorCode = hbf_fail_http_code(trans.data()); done(SyncFileItem::NormalError, hbf_error_string(trans.data(), state)); + emit progress(Progress::EndUpload, _item._file, 0, _item._size); + return; } From 3a1c6429ab16abaca030c1b9a3e6ed72f813f098 Mon Sep 17 00:00:00 2001 From: "Mr. Jenkins" Date: Sat, 23 Nov 2013 23:14:03 -0500 Subject: [PATCH 10/42] [tx-robot] updated from transifex --- translations/mirall_ca.ts | 12 +++++-- translations/mirall_cs.ts | 12 +++++-- translations/mirall_de.ts | 67 ++++++++++++++++++++---------------- translations/mirall_el.ts | 12 +++++-- translations/mirall_en.ts | 12 +++++-- translations/mirall_es.ts | 12 +++++-- translations/mirall_es_AR.ts | 12 +++++-- translations/mirall_et.ts | 67 ++++++++++++++++++++---------------- translations/mirall_eu.ts | 12 +++++-- translations/mirall_fa.ts | 12 +++++-- translations/mirall_fi.ts | 12 +++++-- translations/mirall_fr.ts | 12 +++++-- translations/mirall_gl.ts | 67 ++++++++++++++++++++---------------- translations/mirall_hu.ts | 12 +++++-- translations/mirall_it.ts | 58 +++++++++++++++++-------------- translations/mirall_ja.ts | 12 +++++-- translations/mirall_nl.ts | 12 +++++-- translations/mirall_pl.ts | 12 +++++-- translations/mirall_pt.ts | 12 +++++-- translations/mirall_pt_BR.ts | 12 +++++-- translations/mirall_ru.ts | 12 +++++-- translations/mirall_sk.ts | 12 +++++-- translations/mirall_sl.ts | 12 +++++-- translations/mirall_sv.ts | 12 +++++-- translations/mirall_th.ts | 12 +++++-- translations/mirall_uk.ts | 12 +++++-- translations/mirall_zh_CN.ts | 12 +++++-- translations/mirall_zh_TW.ts | 12 +++++-- 28 files changed, 387 insertions(+), 160 deletions(-) diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts index 9b0138cb6..57d2f7193 100644 --- a/translations/mirall_ca.ts +++ b/translations/mirall_ca.ts @@ -1222,6 +1222,14 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a %1 carpeta <i>%1</i> està sincronitzat amb la carpeta local <i>%2</i> + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1937,12 +1945,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts index 04d3a7bd9..c7be2fdbb 100644 --- a/translations/mirall_cs.ts +++ b/translations/mirall_cs.ts @@ -1222,6 +1222,14 @@ Zvolené položky budou smazány také v případě, že brání smazání adres Složka %1 <i>%1</i> je synchronizována do místní složky <i>%2</i> + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1937,12 +1945,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts index e94655b71..7c3246f1f 100644 --- a/translations/mirall_de.ts +++ b/translations/mirall_de.ts @@ -101,7 +101,7 @@ Accounts to Synchronize - + Konten zum Synchronisieren @@ -162,7 +162,7 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf No account configured. - + Kein Konto konfiguriert. @@ -172,7 +172,7 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf %1 of %2 (%3%) in use. - + %1 von %2 (%3%) benutzt. @@ -212,12 +212,12 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf Connected to <a href="%1">%2</a> as <i>%3</i>. - + Verbunden mit <a href="%1">%2</a> als <i>%3</i>. No connection to %1 at <a href="%1">%2</a>. - + Keine Verbindung mit %1 zu <a href="%1">%2</a>. @@ -356,7 +356,7 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf Unable to initialize a sync journal. - + Synchronisationsbericht konnte nicht initialisiert werden. @@ -389,7 +389,7 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf No ownCloud account configured - + Kein ownCloud-Konto konfiguriert @@ -448,37 +448,37 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf downloaded - + Heruntergeladen removed - + Entfernt updated - + Aktualisiert renamed - + Umbenannt '%1' has been %2. - + '%1' wurde %2. Files %1 - + Dateien %1 '%1' and %2 other files have been %3. - + '%1' und %2 andere Dateien wurden %3. @@ -721,7 +721,7 @@ Dokumentation für mögliche Lösungen. General Setttings - + Allgemeine Einstellungen @@ -1122,12 +1122,12 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve 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! @@ -1223,6 +1223,14 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve %1 Ordner <i>%1</i> ist mit einem lokalen Ordner synchronisiert <i>%2</i> + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1233,7 +1241,7 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve Detailed Sync Status - + Detaillierter Synchronisationsstatus @@ -1361,7 +1369,7 @@ name The sync status has been copied to the clipboard. - + Der Synchronisationsstatus wurde in die Zwischenablage kopiert. @@ -1412,23 +1420,24 @@ name %1 - Authenticate - + %1 - Authentifikation %1 - %2 - + %1 - %2 Error loading IdP login page - + Fehler beim laden der IdP-Anmeldeseite Could not load Shibboleth login page to log you in. Please ensure that your network connection is working. - + Shibboleth-Anmeldeseite konnte nicht geladen werden. +Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert. @@ -1921,7 +1930,7 @@ Please ensure that your network connection is working. could not create directory %1 - + Verzeichnis %1 konnte nicht erstellt werden @@ -1935,12 +1944,12 @@ Please ensure that your network connection is working. 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. @@ -2058,7 +2067,7 @@ Please ensure that your network connection is working. Move - + Verschieben @@ -2097,12 +2106,12 @@ Please ensure that your network connection is working. move - + verschiebe moved - + verschoben diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts index 46a019975..5d0c74545 100644 --- a/translations/mirall_el.ts +++ b/translations/mirall_el.ts @@ -1215,6 +1215,14 @@ Checked items will also be deleted if they prevent a directory from being remove + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1922,12 +1930,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts index faf43033d..51490b39f 100644 --- a/translations/mirall_en.ts +++ b/translations/mirall_en.ts @@ -1217,6 +1217,14 @@ Checked items will also be deleted if they prevent a directory from being remove + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1927,12 +1935,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts index c76a5593c..bce0a3696 100644 --- a/translations/mirall_es.ts +++ b/translations/mirall_es.ts @@ -1222,6 +1222,14 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg %1 La carpeta <i>%1</i> ha sido sincronizada con la carpeta local<i>%2</i> + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1937,12 +1945,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts index 225ebf841..f38fd9049 100644 --- a/translations/mirall_es_AR.ts +++ b/translations/mirall_es_AR.ts @@ -1220,6 +1220,14 @@ Los elementos marcados también se borrarán si impiden la eliminación de algú + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1928,12 +1936,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts index 5e74fcbb7..4d3d3d844 100644 --- a/translations/mirall_et.ts +++ b/translations/mirall_et.ts @@ -101,7 +101,7 @@ Accounts to Synchronize - + Sünkroniseeritavad kontod @@ -161,7 +161,7 @@ No account configured. - + Ühtegi kontot pole seadistatud @@ -171,7 +171,7 @@ %1 of %2 (%3%) in use. - + Kasutusel %1 / %2 (%3%) @@ -211,12 +211,12 @@ Connected to <a href="%1">%2</a> as <i>%3</i>. - + Ühendatud <a href="%1">%2</a> kui <i>%3</i>. No connection to %1 at <a href="%1">%2</a>. - + Ühendus puudub %1 at <a href="%1">%2</a>. @@ -355,7 +355,7 @@ Unable to initialize a sync journal. - + Ei suuda lähtestada sünkroniseeringu zurnaali. @@ -388,7 +388,7 @@ No ownCloud account configured - + Ühtegi ownCloud kontot pole seadistatud @@ -447,37 +447,37 @@ downloaded - + allalaaditud removed - + eemaldatud updated - + uuendatud renamed - + ümber nimetatud '%1' has been %2. - + '%1' on olnud %2. Files %1 - + Failid %1 '%1' and %2 other files have been %3. - + '%1' ja %2 teist faili on olnud %3. @@ -720,7 +720,7 @@ dokumentatsioonist võimalikke lahendusi. General Setttings - + Üldised seaded @@ -1121,12 +1121,12 @@ Checked items will also be deleted if they prevent a directory from being remove 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! @@ -1222,6 +1222,14 @@ Checked items will also be deleted if they prevent a directory from being remove %1 kaust <i>%1</i> on sünkroniseeritud kohaliku kaustaga <i>%2</i> + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1232,7 +1240,7 @@ Checked items will also be deleted if they prevent a directory from being remove Detailed Sync Status - + Täpsem sünkroniseeringu staatus @@ -1362,7 +1370,7 @@ konflikt-failiks ning serveris asuv fail on saadaval algse nimega. The sync status has been copied to the clipboard. - + Sünkroniseeringu staatus on kopeeritud lõikepuhvrisse. @@ -1413,23 +1421,24 @@ konflikt-failiks ning serveris asuv fail on saadaval algse nimega. %1 - Authenticate - + %1 - autentimine %1 - %2 - + %1 - %2 Error loading IdP login page - + Viga IdP sisselogimislehe laadimisel Could not load Shibboleth login page to log you in. Please ensure that your network connection is working. - + Ei suuda laadida Shibboleth sisselogimislehte. +Palun veendu, et võrguühendus toimib. @@ -1922,7 +1931,7 @@ Please ensure that your network connection is working. could not create directory %1 - + ei suuda luua kataloogi %1 @@ -1936,12 +1945,12 @@ Please ensure that your network connection is working. 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. @@ -2059,7 +2068,7 @@ Please ensure that your network connection is working. Move - + Tõsta ümber @@ -2098,12 +2107,12 @@ Please ensure that your network connection is working. move - + tõsta ümber moved - + ümber tõstetud diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts index 13da28419..7c6b17a96 100644 --- a/translations/mirall_eu.ts +++ b/translations/mirall_eu.ts @@ -1215,6 +1215,14 @@ Checked items will also be deleted if they prevent a directory from being remove + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1922,12 +1930,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts index c708ae884..3ea028705 100644 --- a/translations/mirall_fa.ts +++ b/translations/mirall_fa.ts @@ -1215,6 +1215,14 @@ Checked items will also be deleted if they prevent a directory from being remove + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1922,12 +1930,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts index da3745159..48a82758f 100644 --- a/translations/mirall_fi.ts +++ b/translations/mirall_fi.ts @@ -1215,6 +1215,14 @@ Checked items will also be deleted if they prevent a directory from being remove + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1922,12 +1930,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts index 8f137ff37..362509505 100644 --- a/translations/mirall_fr.ts +++ b/translations/mirall_fr.ts @@ -1222,6 +1222,14 @@ Les items cochés seront également supprimés s'ils empêchent la suppress %1 le dossier <i>%1</i> est synchronisé au dossier local <i>%2</i> + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1936,12 +1944,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts index cb9fd1c2b..1db1c7b28 100644 --- a/translations/mirall_gl.ts +++ b/translations/mirall_gl.ts @@ -101,7 +101,7 @@ Accounts to Synchronize - + Contas para sincronizar @@ -161,7 +161,7 @@ No account configured. - + Non hai contas configuradas. @@ -171,7 +171,7 @@ %1 of %2 (%3%) in use. - + Usado %1 de %2 (%3%). @@ -211,12 +211,12 @@ Connected to <a href="%1">%2</a> as <i>%3</i>. - + Conectado a <a href="%1">%2</a> como <i>%3</i>. No connection to %1 at <a href="%1">%2</a>. - + Sen conexión con %1 en <a href="%1">%2</a>. @@ -355,7 +355,7 @@ Unable to initialize a sync journal. - + Non é posíbel iniciar un rexistro de sincronización. @@ -388,7 +388,7 @@ No ownCloud account configured - + Non hai configurada ningunha conta ownCloud @@ -447,37 +447,37 @@ downloaded - + descargado removed - + Retirado updated - + actualizado renamed - + renomeado '%1' has been %2. - + «%1» foi %2. Files %1 - + Ficheiros %1 '%1' and %2 other files have been %3. - + «%1» e outros %2 ficheiros foron %3. @@ -720,7 +720,7 @@ fiábel. Revise a documentación para posíbeis arranxos. General Setttings - + Axustes xerais @@ -1121,12 +1121,12 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is 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! @@ -1222,6 +1222,14 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is O cartafol %1 <i>%1</i> está sincronizado co cartafol local <i>%2</i> + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1232,7 +1240,7 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is Detailed Sync Status - + Estado detallado da sincronización @@ -1363,7 +1371,7 @@ o nome orixinal The sync status has been copied to the clipboard. - + O estado de sincronización foi copiado no portapapeis. @@ -1414,23 +1422,24 @@ o nome orixinal %1 - Authenticate - + %1 - Autenticado %1 - %2 - + %1 - %2 Error loading IdP login page - + Produciuse un erro ao cargar a páxina de acceso IdP Could not load Shibboleth login page to log you in. Please ensure that your network connection is working. - + Non foi posíbel cargar a páxina de acceso Shibboleth. +Asegúrese de que a súa conexión de rede está a funcionar. @@ -1923,7 +1932,7 @@ Please ensure that your network connection is working. could not create directory %1 - + non foi posíbel crear o directorio %1 @@ -1937,12 +1946,12 @@ Please ensure that your network connection is working. 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. @@ -2060,7 +2069,7 @@ Please ensure that your network connection is working. Move - + Mover @@ -2099,12 +2108,12 @@ Please ensure that your network connection is working. move - + mover moved - + movido diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts index 4ddf982b4..125808f06 100644 --- a/translations/mirall_hu.ts +++ b/translations/mirall_hu.ts @@ -1215,6 +1215,14 @@ Checked items will also be deleted if they prevent a directory from being remove + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1922,12 +1930,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts index 84f669a7e..53fa12d4b 100644 --- a/translations/mirall_it.ts +++ b/translations/mirall_it.ts @@ -101,7 +101,7 @@ Accounts to Synchronize - + Account da sincronizzare @@ -161,7 +161,7 @@ No account configured. - + Nessun account configurato. @@ -171,7 +171,7 @@ %1 of %2 (%3%) in use. - + %1 di %2 (%3%) utilizzati. @@ -211,12 +211,12 @@ Connected to <a href="%1">%2</a> as <i>%3</i>. - + Connesso a <a href="%1">%2</a> come <i>%3</i>. No connection to %1 at <a href="%1">%2</a>. - + Nessuna connessione a <a href="%1">%2</a>. @@ -388,7 +388,7 @@ No ownCloud account configured - + Nessun account ownCloud configurato. @@ -447,37 +447,37 @@ downloaded - + scaricato removed - + rimosso updated - + aggiornato renamed - + rinominato '%1' has been %2. - + '%1' è stato %2. Files %1 - + File %1 '%1' and %2 other files have been %3. - + '%1' e %2 altri file sono stati %3. @@ -720,7 +720,7 @@ documentazione per trovare possibili soluzioni. General Setttings - + Impostazioni generali @@ -1121,12 +1121,12 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un Failed to connect to %1 at %2:<br/>%3 - + Connessione a %1 su %2:<br/>%3 No remote folder specified! - + Nessuna cartella remota specificata! @@ -1222,6 +1222,14 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un La cartella <i>%1</i> è sincronizzata con la cartella locale <i>%2</i> + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1362,7 +1370,7 @@ conflitto, mentre il file sul server è disponibile con il nome originale The sync status has been copied to the clipboard. - + Lo stato di sincronizzazione è stato copiato negli appunti. @@ -1413,12 +1421,12 @@ conflitto, mentre il file sul server è disponibile con il nome originale %1 - Authenticate - + %1 - Autenticazione %1 - %2 - + %1 - %2 @@ -1922,7 +1930,7 @@ Please ensure that your network connection is working. could not create directory %1 - + impossibile creare la cartella %1 @@ -1936,12 +1944,12 @@ Please ensure that your network connection is working. PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Questa cartella non può essere rinominato. 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. @@ -2059,7 +2067,7 @@ Please ensure that your network connection is working. Move - + Sposta @@ -2098,12 +2106,12 @@ Please ensure that your network connection is working. move - + sposta moved - + spostato diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts index ad8e648f4..f2c85523a 100644 --- a/translations/mirall_ja.ts +++ b/translations/mirall_ja.ts @@ -1223,6 +1223,14 @@ Checked items will also be deleted if they prevent a directory from being remove %1 フォルダ<i>%1</i> はローカルフォルダ <i>%2</i> と同期しています + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1932,12 +1940,12 @@ Please ensure that your network connection is working. 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 に戻してください。 diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts index 7559f62cf..a76754cfc 100644 --- a/translations/mirall_nl.ts +++ b/translations/mirall_nl.ts @@ -1222,6 +1222,14 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee %1 map <i>%1</i> is gesynchroniseerd met lokale map <i>%2</i> + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1938,12 +1946,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts index 2a6d48ff6..effe85413 100644 --- a/translations/mirall_pl.ts +++ b/translations/mirall_pl.ts @@ -1215,6 +1215,14 @@ Checked items will also be deleted if they prevent a directory from being remove + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1923,12 +1931,12 @@ Kliknij 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. diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts index 1a8bc11c2..7d135cb71 100644 --- a/translations/mirall_pt.ts +++ b/translations/mirall_pt.ts @@ -1216,6 +1216,14 @@ Checked items will also be deleted if they prevent a directory from being remove + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1923,12 +1931,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts index 0fbcc8c42..a37ac9378 100644 --- a/translations/mirall_pt_BR.ts +++ b/translations/mirall_pt_BR.ts @@ -1221,6 +1221,14 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u %1 pasta <i>%1</i> está sincronizada com a pasta local <i>%2</i> + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1936,12 +1944,12 @@ Certifique-se que sua conexão de rede está funcionando. PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Esta pasta não pode ser renomeada. Ele 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. diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts index 3202b7d9a..23446b8ef 100644 --- a/translations/mirall_ru.ts +++ b/translations/mirall_ru.ts @@ -1222,6 +1222,14 @@ Checked items will also be deleted if they prevent a directory from being remove %1 папка <i>%1</i> синхронищирована с локальной папкой <i>%2</i> + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1938,12 +1946,12 @@ Please ensure that your network connection is working. 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 diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts index 10fdea2a2..7ebdaed49 100644 --- a/translations/mirall_sk.ts +++ b/translations/mirall_sk.ts @@ -1222,6 +1222,14 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods Priečinok %1 <i>%1</i> je synchronizovaný do lokálneho priečinka <i>%2</i> + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1936,12 +1944,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts index 140853e69..4884d4efe 100644 --- a/translations/mirall_sl.ts +++ b/translations/mirall_sl.ts @@ -1215,6 +1215,14 @@ Checked items will also be deleted if they prevent a directory from being remove + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1922,12 +1930,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts index fc35abfd2..3733f3440 100644 --- a/translations/mirall_sv.ts +++ b/translations/mirall_sv.ts @@ -1221,6 +1221,14 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort %1 mapp <i>%1</i> är synkroniserad mot lokal mapp <i>%2</i> + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1935,12 +1943,12 @@ Please ensure that your network connection is working. PropagateRemoteRename - + This folder must not be renamed. It is renamed back to its original name. Denna katalog får inte byta namn. Den kommer att döpas om till sitt original namn. - + This folder must not be renamed. Please name it back to Shared. Denna katalog får ej döpas om. Snälla döp den till Delad diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts index 33287ffd5..e122c89ff 100644 --- a/translations/mirall_th.ts +++ b/translations/mirall_th.ts @@ -1215,6 +1215,14 @@ Checked items will also be deleted if they prevent a directory from being remove + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1922,12 +1930,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts index d0047a386..becf4700e 100644 --- a/translations/mirall_uk.ts +++ b/translations/mirall_uk.ts @@ -1215,6 +1215,14 @@ Checked items will also be deleted if they prevent a directory from being remove + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1922,12 +1930,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts index 39049f963..8428efb87 100644 --- a/translations/mirall_zh_CN.ts +++ b/translations/mirall_zh_CN.ts @@ -1215,6 +1215,14 @@ Checked items will also be deleted if they prevent a directory from being remove + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1922,12 +1930,12 @@ Please ensure that your network connection is working. 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. diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts index 7eaf45dca..3e8c330df 100644 --- a/translations/mirall_zh_TW.ts +++ b/translations/mirall_zh_TW.ts @@ -1215,6 +1215,14 @@ Checked items will also be deleted if they prevent a directory from being remove + + Mirall::PropagateUploadFile + + + Local file changed during sync, syncing once it arrived completely + + + Mirall::ProtocolWidget @@ -1922,12 +1930,12 @@ Please ensure that your network connection is working. 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. From 11acfde55a02d630cb66fadba527f7069f3c001e Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Sun, 24 Nov 2013 22:20:43 +0100 Subject: [PATCH 11/42] Refresh the Protocol widget when the dialog is raised. --- src/mirall/owncloudgui.cpp | 1 + src/mirall/settingsdialog.cpp | 9 +++++++-- src/mirall/settingsdialog.h | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp index 063376cfc..dfdb28ffb 100644 --- a/src/mirall/owncloudgui.cpp +++ b/src/mirall/owncloudgui.cpp @@ -451,6 +451,7 @@ void ownCloudGui::slotSettings() _settingsDialog->setGeneralErrors( _startupFails ); Utility::raiseDialog(_settingsDialog.data()); + _settingsDialog->slotRefreshResultList(); } // open sync protocol widget diff --git a/src/mirall/settingsdialog.cpp b/src/mirall/settingsdialog.cpp index 712b92627..c1e8c6501 100644 --- a/src/mirall/settingsdialog.cpp +++ b/src/mirall/settingsdialog.cpp @@ -57,8 +57,8 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) : QListWidgetItem *protocol= new QListWidgetItem(protocolIcon, tr("Status"), _ui->labelWidget); protocol->setSizeHint(QSize(0, 32)); _ui->labelWidget->addItem(protocol); - ProtocolWidget *protocolWidget = new ProtocolWidget; - _protocolIdx = _ui->stack->addWidget(protocolWidget); + _protocolWidget = new ProtocolWidget; + _protocolIdx = _ui->stack->addWidget(_protocolWidget); QIcon generalIcon(QLatin1String(":/mirall/resources/settings.png")); QListWidgetItem *general = new QListWidgetItem(generalIcon, tr("General"), _ui->labelWidget); @@ -179,4 +179,9 @@ void SettingsDialog::accept() { QDialog::accept(); } +void SettingsDialog::slotRefreshResultList() { + if( _protocolWidget ) { + _protocolWidget->setupList(); + } +} } // namespace Mirall diff --git a/src/mirall/settingsdialog.h b/src/mirall/settingsdialog.h index ff57867c8..05fc0d862 100644 --- a/src/mirall/settingsdialog.h +++ b/src/mirall/settingsdialog.h @@ -28,6 +28,7 @@ namespace Ui { class SettingsDialog; } class AccountSettings; +class ProtocolWidget; class Application; class FolderMan; class ownCloudGui; @@ -46,6 +47,7 @@ public: public slots: void slotSyncStateChange(const QString& alias); void slotShowProtocol(); + void slotRefreshResultList(); protected: void reject(); @@ -55,6 +57,7 @@ private: Ui::SettingsDialog *_ui; AccountSettings *_accountSettings; QListWidgetItem *_accountItem; + ProtocolWidget *_protocolWidget; int _protocolIdx; }; From 1964e60eb00d6a3bc48c24d77dee12e7d3770e0e Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Sun, 24 Nov 2013 22:21:29 +0100 Subject: [PATCH 12/42] Do not show an error message if user aborted. Also CSYNC_STATUS fixes. --- src/mirall/csyncthread.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/mirall/csyncthread.cpp b/src/mirall/csyncthread.cpp index daf314527..f1c974924 100644 --- a/src/mirall/csyncthread.cpp +++ b/src/mirall/csyncthread.cpp @@ -349,7 +349,7 @@ int CSyncThread::treewalkFile( TREE_WALK_FILE *file, bool remote ) } void CSyncThread::handleSyncError(CSYNC *ctx, const char *state) { - CSYNC_STATUS err = CSYNC_STATUS(csync_get_status( ctx )); + CSYNC_STATUS err = csync_get_status( ctx ); const char *errMsg = csync_get_status_string( ctx ); QString errStr = csyncErrorToString(err); if( errMsg ) { @@ -357,7 +357,9 @@ void CSyncThread::handleSyncError(CSYNC *ctx, const char *state) { } qDebug() << " #### ERROR during "<< state << ": " << errStr; - if( CSYNC_STATUS_IS_EQUAL( err, CSYNC_STATUS_SERVICE_UNAVAILABLE ) || + if( CSYNC_STATUS_IS_EQUAL( err, CSYNC_STATUS_ABORTED) ) { + qDebug() << "Update phase was aborted by user!"; + } else if( CSYNC_STATUS_IS_EQUAL( err, CSYNC_STATUS_SERVICE_UNAVAILABLE ) || CSYNC_STATUS_IS_EQUAL( err, CSYNC_STATUS_CONNECT_ERROR )) { emit csyncUnavailable(); } else { @@ -549,6 +551,9 @@ void CSyncThread::transferCompleted(const SyncFileItem &item) _syncedItems[idx]._instruction = item._instruction; _syncedItems[idx]._errorString = item._errorString; _syncedItems[idx]._status = item._status; + + } else { + qWarning() << Q_FUNC_INFO << "Could not find index in synced items!"; } if (item._status == SyncFileItem::FatalError) { From 055a8d7e748ea5ece40f972bf94231355f9035bd Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Sun, 24 Nov 2013 22:26:50 +0100 Subject: [PATCH 13/42] Do not display error messages if user aborts the sync run. --- src/mirall/folder.cpp | 8 +++++--- src/mirall/owncloudpropagator.cpp | 17 +++++++++++------ src/mirall/owncloudpropagator.h | 1 + 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp index 297ef2e4e..65d05936b 100644 --- a/src/mirall/folder.cpp +++ b/src/mirall/folder.cpp @@ -452,8 +452,10 @@ void Folder::slotTerminateSync(bool block) if( _thread && _csync ) { _csync->abort(); - _errors.append( tr("The CSync thread terminated.") ); - _csyncError = true; + + // Do not display an error message, user knows his own actions. + // _errors.append( tr("The CSync thread terminated.") ); + // _csyncError = true; if (!block) { setSyncState(SyncResult::SyncAbortRequested); return; @@ -657,7 +659,7 @@ void Folder::slotCsyncUnavailable() void Folder::slotCSyncFinished() { - qDebug() << "-> CSync Finished slot with error " << _csyncError; + qDebug() << "-> CSync Finished slot with error " << _csyncError << "warn count" << _syncResult.warnCount(); _watcher->setEventsEnabledDelayed(2000); _pollTimer.start(); _timeSinceLastSync.restart(); diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp index be3ca71ab..44d109589 100644 --- a/src/mirall/owncloudpropagator.cpp +++ b/src/mirall/owncloudpropagator.cpp @@ -372,15 +372,20 @@ void PropagateUploadFile::start() const QString errMsg = tr("Local file changed during sync, syncing once it arrived completely"); done( SyncFileItem::SoftError, errMsg ); emit progress(Progress::Error, _item._file, 0, - (quint64) errMsg.constData() ); + (quint64) "Local file changed during sync, syncing once it arrived completely"); // FIXME: Use errMsg return; + } else if( state == HBF_USER_ABORTED ) { + const QString errMsg = tr("Sync was aborted by user."); + done( SyncFileItem::SoftError, errMsg); + emit progress(Progress::Error, _item._file, 0, + (quint64) "User terminated sync process!" ); // FIXME: Use errMsg + } else { + // FIXME: find out the error class. + _item._httpErrorCode = hbf_fail_http_code(trans.data()); + done(SyncFileItem::NormalError, hbf_error_string(trans.data(), state)); + emit progress(Progress::EndUpload, _item._file, 0, _item._size); } - // FIXME: find out the error class. - _item._httpErrorCode = hbf_fail_http_code(trans.data()); - done(SyncFileItem::NormalError, hbf_error_string(trans.data(), state)); - emit progress(Progress::EndUpload, _item._file, 0, _item._size); - return; } diff --git a/src/mirall/owncloudpropagator.h b/src/mirall/owncloudpropagator.h index 6a2e89482..11c31aece 100644 --- a/src/mirall/owncloudpropagator.h +++ b/src/mirall/owncloudpropagator.h @@ -172,6 +172,7 @@ signals: void completed(const SyncFileItem &); void progress(Progress::Kind, const QString &filename, quint64 bytes, quint64 total); void finished(); + }; } From fd1552f7a0a9a6759700c6be988e14198ec59ac3 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Sun, 24 Nov 2013 22:27:11 +0100 Subject: [PATCH 14/42] Handle SoftError and show blacklisted files. --- src/mirall/protocolwidget.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/mirall/protocolwidget.cpp b/src/mirall/protocolwidget.cpp index bd9155136..f88e5d7ba 100644 --- a/src/mirall/protocolwidget.cpp +++ b/src/mirall/protocolwidget.cpp @@ -111,7 +111,8 @@ void ProtocolWidget::setSyncResult( const SyncResult& result ) // handle ignored files here. if( item._status == SyncFileItem::FileIgnored - || item._status == SyncFileItem::Conflict ) { + || item._status == SyncFileItem::Conflict + || item._status == SyncFileItem::SoftError ) { QStringList columns; QString timeStr = timeString(dt); QString longTimeStr = timeString(dt, QLocale::LongFormat); @@ -120,7 +121,10 @@ void ProtocolWidget::setSyncResult( const SyncResult& result ) columns << item._file; columns << folder; if( item._status == SyncFileItem::FileIgnored ) { - if( item._type == SyncFileItem::SoftLink ) { + if( item._blacklistedInDb ) { + errMsg = tr("Blacklisted"); + tooltip = tr("The file is blacklisted because of previous error conditions."); + }else if( item._type == SyncFileItem::SoftLink ) { errMsg = tr("Soft Link ignored"); tooltip = tr("Softlinks break the semantics of synchronization.\nPlease do not " "use them in synced directories"); @@ -149,6 +153,8 @@ void ProtocolWidget::setSyncResult( const SyncResult& result ) "created a so called conflict. The local change is copied to the conflict\n" "file while the file from the server side is available under the original\n" "name"); + } else if( item._status == SyncFileItem::SoftError ) { + errMsg = item._errorString; } else { Q_ASSERT(!"unhandled instruction."); } @@ -181,7 +187,6 @@ void ProtocolWidget::setupList() haveSyncResult = true; } - if( haveSyncResult ) { setSyncResult(lastResult); } From 37d6f6eeab4ac00b9bba8f260c35ed9ebf4862ba Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 25 Nov 2013 10:54:18 +0100 Subject: [PATCH 15/42] Build on OS X --- src/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b6f25b113..34f8ac49c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -343,7 +343,6 @@ else() install(FILES ${qt_I18N} DESTINATION ${QM_DIR}) file(GLOB qtkeychain_I18N ${QT_TRANSLATIONS_DIR}/qtkeychain*.qm) install(FILES ${qtkeychain_I18N} DESTINATION ${QM_DIR}) - list(APPEND dirs "/usr/local/lib") endif() @@ -365,7 +364,7 @@ install(TARGETS ${APPLICATION_EXECUTABLE} # currently it needs to be done because the code right above needs to be executed no matter # if building a bundle or not and the install_qt4_executable needs to be called afterwards if(BUILD_OWNCLOUD_OSX_BUNDLE) - install_qt_executable(${OWNCLOUD_OSX_BUNDLE} "qsqlite" "" ${dirs}) + install_qt_executable(${OWNCLOUD_OSX_BUNDLE} "qsqlite") endif() find_program(KRAZY2_EXECUTABLE krazy2) From ca3885de2a2dde8965a5df670e360bce2d887bc0 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 25 Nov 2013 15:07:58 +0100 Subject: [PATCH 16/42] Fix some SQL error and warning Such as: Error opening the db: "Driver not loaded Driver not loaded" or QSqlDatabasePrivate::removeDatabase: connection '...' is still in use, all queries will cease to wor We need to clear the QSqlDatabase _db handle before calling removeDatabase. And we also need to give a different name to different folder database, just to be sure --- src/mirall/syncjournaldb.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/mirall/syncjournaldb.cpp b/src/mirall/syncjournaldb.cpp index 6fad9e84d..dff57ec80 100644 --- a/src/mirall/syncjournaldb.cpp +++ b/src/mirall/syncjournaldb.cpp @@ -24,7 +24,6 @@ #include "syncjournalfilerecord.h" #define QSQLITE "QSQLITE" -#define SYNCJOURNALDB_CONNECTION_NAME "SyncJournalDbConnection" namespace Mirall { @@ -105,9 +104,7 @@ bool SyncJournalDb::checkConnect() } // Add the connection - if (!QSqlDatabase::connectionNames().contains(SYNCJOURNALDB_CONNECTION_NAME)) { - _db = QSqlDatabase::addDatabase( QSQLITE, SYNCJOURNALDB_CONNECTION_NAME ); - } + _db = QSqlDatabase::addDatabase( QSQLITE, _dbFile); // Open the file _db.setDatabaseName(_dbFile); @@ -261,9 +258,9 @@ void SyncJournalDb::close() _deleteFileRecordRecursively.reset(0); _blacklistQuery.reset(0); - _db.removeDatabase(SYNCJOURNALDB_CONNECTION_NAME); - _db.setDatabaseName(QString()); _db.close(); + _db = QSqlDatabase(); // avoid the warning QSqlDatabasePrivate::removeDatabase: connection [...] still in use + QSqlDatabase::removeDatabase(_dbFile); } @@ -752,7 +749,7 @@ void SyncJournalDb::commit(const QString& context, bool startTrans ) SyncJournalDb::~SyncJournalDb() { - commitTransaction(); + close(); } From 6f17131e3c9241eaaa3c616f3b446894f4581a2c Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 25 Nov 2013 15:11:37 +0100 Subject: [PATCH 17/42] Fix mutex usage in the journal All public function must lock the mutex. And therefore none of the journal function may call public function because the mutex is already locked. So have a public commit that lock the mutex, and a private commitInternal that assume the mutex is locked --- src/mirall/syncjournaldb.cpp | 14 +++++++++++--- src/mirall/syncjournaldb.h | 7 ++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/mirall/syncjournaldb.cpp b/src/mirall/syncjournaldb.cpp index dff57ec80..ca88b8ce7 100644 --- a/src/mirall/syncjournaldb.cpp +++ b/src/mirall/syncjournaldb.cpp @@ -189,7 +189,7 @@ bool SyncJournalDb::checkConnect() return sqlFail("Create table blacklist", createQuery); } - commit("checkConnect"); + commitInternal("checkConnect"); bool rc = updateDatabaseStructure(); if( rc ) { @@ -282,7 +282,7 @@ bool SyncJournalDb::updateDatabaseStructure() query.prepare("CREATE INDEX metadata_file_id ON metadata(fileid);"); re = re && query.exec(); - commit("update database structure"); + commitInternal("update database structure"); } return re; @@ -735,9 +735,17 @@ void SyncJournalDb::updateBlacklistEntry( const SyncJournalBlacklistRecord& item if( !iQuery.exec() ) { qDebug() << "SQL exec blacklistitem insert/update failed: "<< iQuery.lastError().text(); } + } -void SyncJournalDb::commit(const QString& context, bool startTrans ) +void SyncJournalDb::commit(const QString& context, bool startTrans) +{ + QMutexLocker lock(&_mutex); + commitInternal(context, startTrans); +} + + +void SyncJournalDb::commitInternal(const QString& context, bool startTrans ) { qDebug() << "Transaction Start " << context; commitTransaction(); diff --git a/src/mirall/syncjournaldb.h b/src/mirall/syncjournaldb.h index e6f0b4b2a..fbc3f6221 100644 --- a/src/mirall/syncjournaldb.h +++ b/src/mirall/syncjournaldb.h @@ -36,7 +36,6 @@ public: bool deleteFileRecord( const QString& filename, bool recursively = false ); int getFileRecordCount(); bool exists(); - QStringList tableColumns( const QString& table ); void updateBlacklistEntry( const SyncJournalBlacklistRecord& item ); void wipeBlacklistEntry(const QString& file); @@ -72,8 +71,6 @@ public: void close(); - void startTransaction(); - void commitTransaction(); signals: @@ -83,6 +80,10 @@ private: qint64 getPHash(const QString& ) const; bool updateDatabaseStructure(); bool sqlFail(const QString& log, const QSqlQuery &query ); + void commitInternal(const QString &context, bool startTrans = true); + void startTransaction(); + void commitTransaction(); + QStringList tableColumns( const QString& table ); bool checkConnect(); QSqlDatabase _db; From 0a2861a7318e354ad126e358c490134719ec3b40 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Thu, 21 Nov 2013 15:33:37 +0100 Subject: [PATCH 18/42] Disable quota polling when default account does not exist or is offline --- src/mirall/quotainfo.cpp | 12 +++++++++++- src/mirall/quotainfo.h | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/mirall/quotainfo.cpp b/src/mirall/quotainfo.cpp index 2c2b70d48..3a9994ec9 100644 --- a/src/mirall/quotainfo.cpp +++ b/src/mirall/quotainfo.cpp @@ -41,8 +41,18 @@ QuotaInfo::QuotaInfo(QObject *parent) void QuotaInfo::slotAccountChanged(Account *newAccount, Account *oldAccount) { - Q_UNUSED(oldAccount); _account = newAccount; + disconnect(oldAccount, SIGNAL(onlineStateChanged(bool)), this, SLOT(slotOnlineStateChanged(bool))); + connect(newAccount, SIGNAL(onlineStateChanged(bool)), this, SLOT(slotOnlineStateChanged(bool))); +} + +void QuotaInfo::slotOnlineStateChanged(bool online) +{ + if (online) { + _refreshTimer->start(); + } else { + _refreshTimer->stop(); + } } void QuotaInfo::slotCheckQuota() diff --git a/src/mirall/quotainfo.h b/src/mirall/quotainfo.h index a8dd04d24..294a3928c 100644 --- a/src/mirall/quotainfo.h +++ b/src/mirall/quotainfo.h @@ -34,6 +34,7 @@ public Q_SLOTS: private Q_SLOTS: void slotAccountChanged(Account *newAccount, Account *oldAccount); + void slotOnlineStateChanged(bool online); Q_SIGNALS: void quotaUpdated(qint64 total, qint64 used); From ea2b5fb29cfe511bff8d5a7ae6e0bfa4c55738ea Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Fri, 22 Nov 2013 14:01:11 +0100 Subject: [PATCH 19/42] Query credentials when needed. Put the account offline if user aborts. This is only implemented for HTTP auth. Shibboleth still does its own thing. --- src/creds/abstractcredentials.h | 3 + src/creds/dummycredentials.cpp | 12 ++++ src/creds/dummycredentials.h | 2 + src/creds/httpcredentials.cpp | 39 +++++++++++ src/creds/httpcredentials.h | 3 + src/creds/shibboleth/shibbolethrefresher.cpp | 7 +- src/creds/shibboleth/shibbolethrefresher.h | 4 +- src/creds/shibbolethcredentials.cpp | 21 ++++-- src/creds/shibbolethcredentials.h | 4 +- src/mirall/connectionvalidator.cpp | 12 ++-- src/mirall/networkjobs.cpp | 71 ++++++++++++++------ src/mirall/networkjobs.h | 25 ++++--- src/mirall/owncloudsetupwizard.cpp | 8 +-- src/mirall/owncloudsetupwizard.h | 4 +- 14 files changed, 165 insertions(+), 50 deletions(-) diff --git a/src/creds/abstractcredentials.h b/src/creds/abstractcredentials.h index 871ec0b3a..4abae9670 100644 --- a/src/creds/abstractcredentials.h +++ b/src/creds/abstractcredentials.h @@ -19,6 +19,7 @@ #include class QNetworkAccessManager; +class QNetworkReply; namespace Mirall { class Account; @@ -37,6 +38,8 @@ public: virtual QNetworkAccessManager* getQNAM() const = 0; virtual bool ready() const = 0; virtual void fetch(Account *account) = 0; + virtual bool stillValid(QNetworkReply *reply) = 0; + virtual bool fetchFromUser(Account *account) = 0; virtual void persist(Account *account) = 0; diff --git a/src/creds/dummycredentials.cpp b/src/creds/dummycredentials.cpp index b92bb5838..478020fe5 100644 --- a/src/creds/dummycredentials.cpp +++ b/src/creds/dummycredentials.cpp @@ -50,6 +50,18 @@ bool DummyCredentials::ready() const return true; } +bool DummyCredentials::stillValid(QNetworkReply *reply) +{ + Q_UNUSED(reply) + return true; +} + +bool DummyCredentials::fetchFromUser(Account *account) +{ + Q_UNUSED(account) + return false; +} + void DummyCredentials::fetch(Account*) { Q_EMIT(fetched()); diff --git a/src/creds/dummycredentials.h b/src/creds/dummycredentials.h index b06f053c5..59df8615d 100644 --- a/src/creds/dummycredentials.h +++ b/src/creds/dummycredentials.h @@ -31,6 +31,8 @@ public: QString user() const; QNetworkAccessManager* getQNAM() const; bool ready() const; + bool stillValid(QNetworkReply *reply); + bool fetchFromUser(Account *account); void fetch(Account*); void persist(Account*); }; diff --git a/src/creds/httpcredentials.cpp b/src/creds/httpcredentials.cpp index 98892fedc..12208bbb7 100644 --- a/src/creds/httpcredentials.cpp +++ b/src/creds/httpcredentials.cpp @@ -17,6 +17,7 @@ #include #include #include +#include #include @@ -83,6 +84,7 @@ protected: QByteArray credHash = QByteArray(_cred->user().toUtf8()+":"+_cred->password().toUtf8()).toBase64(); QNetworkRequest req(request); req.setRawHeader(QByteArray("Authorization"), QByteArray("Basic ") + credHash); + qDebug() << "Request for " << req.url() << "with authorization" << QByteArray::fromBase64(credHash); return MirallAccessManager::createRequest(op, req, outgoingData); } private: @@ -183,6 +185,22 @@ void HttpCredentials::fetch(Account *account) job->start(); } } +bool HttpCredentials::stillValid(QNetworkReply *reply) +{ + return (reply->error() != QNetworkReply::AuthenticationRequiredError); +} + +bool HttpCredentials::fetchFromUser(Account *account) +{ + bool ok = false; + QString password = queryPassword(&ok); + if (ok) { + _password = password; + _ready = true; + persist(account); + } + return ok; +} void HttpCredentials::slotReadJobDone(QKeychain::Job *job) { @@ -196,9 +214,30 @@ void HttpCredentials::slotReadJobDone(QKeychain::Job *job) Q_EMIT fetched(); break; default: + if (!_user.isEmpty()) { + bool ok; + QString pwd = queryPassword(&ok); + if (ok) { + _password = pwd; + _ready = true; + Q_EMIT fetched(); + break; + } + } qDebug() << "Error while reading password" << job->errorString(); } +} +QString HttpCredentials::queryPassword(bool *ok) +{ + if (ok) { + return QInputDialog::getText(0, tr("Enter Password"), + tr("Please enter %1 password for user '%2':") + .arg(Theme::instance()->appNameGUI(), _user), + QLineEdit::Password, QString(), ok); + } else { + return QString(); + } } void HttpCredentials::persist(Account *account) diff --git a/src/creds/httpcredentials.h b/src/creds/httpcredentials.h index 99ccb65b0..4d06b4733 100644 --- a/src/creds/httpcredentials.h +++ b/src/creds/httpcredentials.h @@ -45,9 +45,12 @@ public: QNetworkAccessManager* getQNAM() const; bool ready() const; void fetch(Account *account); + bool stillValid(QNetworkReply *reply); + bool fetchFromUser(Account *account); void persist(Account *account); QString user() const; QString password() const; + QString queryPassword(bool *ok); private Q_SLOTS: void slotAuthentication(QNetworkReply*, QAuthenticator*); diff --git a/src/creds/shibboleth/shibbolethrefresher.cpp b/src/creds/shibboleth/shibbolethrefresher.cpp index 3f5e00466..a301330e8 100644 --- a/src/creds/shibboleth/shibbolethrefresher.cpp +++ b/src/creds/shibboleth/shibbolethrefresher.cpp @@ -13,14 +13,16 @@ #include +#include "mirall/account.h" #include "creds/shibboleth/shibbolethrefresher.h" #include "creds/shibbolethcredentials.h" namespace Mirall { -ShibbolethRefresher::ShibbolethRefresher(ShibbolethCredentials* creds, CSYNC* csync_ctx, QObject* parent) +ShibbolethRefresher::ShibbolethRefresher(Account *account, ShibbolethCredentials* creds, CSYNC* csync_ctx, QObject* parent) : QObject(parent), + _account(account), _creds(creds), _csync_ctx(csync_ctx) {} @@ -33,7 +35,8 @@ void ShibbolethRefresher::refresh() this, SLOT(onInvalidatedAndFetched(QByteArray))); connect(_creds, SIGNAL(invalidatedAndFetched(QByteArray)), &loop, SLOT(quit())); - QMetaObject::invokeMethod(_creds, "invalidateAndFetch", Qt::QueuedConnection); + QMetaObject::invokeMethod(_creds, "invalidateAndFetch",Qt::QueuedConnection, + Q_ARG(Account*, _account)); loop.exec(); disconnect(_creds, SIGNAL(invalidatedAndFetched(QByteArray)), &loop, SLOT(quit())); diff --git a/src/creds/shibboleth/shibbolethrefresher.h b/src/creds/shibboleth/shibbolethrefresher.h index 39d2ef55c..242a5229a 100644 --- a/src/creds/shibboleth/shibbolethrefresher.h +++ b/src/creds/shibboleth/shibbolethrefresher.h @@ -23,6 +23,7 @@ class QByteArray; namespace Mirall { +class Account; class ShibbolethCredentials; class ShibbolethRefresher : public QObject @@ -30,7 +31,7 @@ class ShibbolethRefresher : public QObject Q_OBJECT public: - ShibbolethRefresher(ShibbolethCredentials* creds, CSYNC* csync_ctx, QObject* parent = 0); + ShibbolethRefresher(Account *account, ShibbolethCredentials* creds, CSYNC* csync_ctx, QObject* parent = 0); void refresh(); @@ -38,6 +39,7 @@ private Q_SLOTS: void onInvalidatedAndFetched(const QByteArray& cookieData); private: + Account* _account; ShibbolethCredentials* _creds; CSYNC* _csync_ctx; }; diff --git a/src/creds/shibbolethcredentials.cpp b/src/creds/shibbolethcredentials.cpp index f7140d905..975d1489b 100644 --- a/src/creds/shibbolethcredentials.cpp +++ b/src/creds/shibbolethcredentials.cpp @@ -46,7 +46,8 @@ int shibboleth_redirect_callback(CSYNC* csync_ctx, QMutex mutex; QMutexLocker locker(&mutex); - ShibbolethCredentials* creds = qobject_cast(AccountManager::instance()->account()->credentials()); + Account *account = AccountManager::instance()->account(); + ShibbolethCredentials* creds = qobject_cast(account->credentials()); if (!creds) { @@ -54,7 +55,7 @@ int shibboleth_redirect_callback(CSYNC* csync_ctx, return 1; } - ShibbolethRefresher refresher(creds, csync_ctx); + ShibbolethRefresher refresher(account, creds, csync_ctx); // blocks refresher.refresh(); @@ -191,6 +192,18 @@ void ShibbolethCredentials::fetch(Account *account) } } +bool ShibbolethCredentials::stillValid(QNetworkReply *reply) +{ + Q_UNUSED(reply) + return true; +} + +bool ShibbolethCredentials::fetchFromUser(Account *account) +{ + Q_UNUSED(account) + return false; +} + void ShibbolethCredentials::persist(Account* /*account*/) { ShibbolethConfigFile cfg; @@ -226,7 +239,7 @@ void ShibbolethCredentials::slotBrowserHidden() Q_EMIT fetched(); } -void ShibbolethCredentials::invalidateAndFetch() +void ShibbolethCredentials::invalidateAndFetch(Account* account) { _ready = false; connect (this, SIGNAL(fetched()), @@ -234,7 +247,7 @@ void ShibbolethCredentials::invalidateAndFetch() // small hack to support the ShibbolethRefresher hack // we already rand fetch() with a valid account object, // and hence know the url on refresh - fetch(0); + fetch(account); } void ShibbolethCredentials::onFetched() diff --git a/src/creds/shibbolethcredentials.h b/src/creds/shibbolethcredentials.h index e77891f78..e7f9a4033 100644 --- a/src/creds/shibbolethcredentials.h +++ b/src/creds/shibbolethcredentials.h @@ -42,12 +42,14 @@ public: QNetworkAccessManager* getQNAM() const; bool ready() const; void fetch(Account *account); + bool stillValid(QNetworkReply *reply); + virtual bool fetchFromUser(Account *account); void persist(Account *account); QNetworkCookie cookie() const; public Q_SLOTS: - void invalidateAndFetch(); + void invalidateAndFetch(Account *account); private Q_SLOTS: void onShibbolethCookieReceived(const QNetworkCookie& cookie); diff --git a/src/mirall/connectionvalidator.cpp b/src/mirall/connectionvalidator.cpp index 5bc06f16f..6d6533d4a 100644 --- a/src/mirall/connectionvalidator.cpp +++ b/src/mirall/connectionvalidator.cpp @@ -82,6 +82,7 @@ void ConnectionValidator::checkConnection() { if( _account ) { CheckServerJob *checkJob = new CheckServerJob(_account, false, this); + checkJob->setIgnoreCredentialFailure(true); connect(checkJob, SIGNAL(instanceFound(QUrl,QVariantMap)), SLOT(slotStatusFound(QUrl,QVariantMap))); connect(checkJob, SIGNAL(networkError(QNetworkReply*)), SLOT(slotNoStatusFound(QNetworkReply*))); checkJob->start(); @@ -127,11 +128,12 @@ void ConnectionValidator::slotCheckAuthentication() { // simply GET the webdav root, will fail if credentials are wrong. // continue in slotAuthCheck here :-) - PropfindJob *propFind = new PropfindJob(_account, "/", this); - propFind->setProperties(QList() << "getlastmodified"); - connect(propFind, SIGNAL(result(QVariantMap)), SLOT(slotAuthSuccess())); - connect(propFind, SIGNAL(networkError(QNetworkReply*)), SLOT(slotAuthFailed(QNetworkReply*))); - propFind->start(); + PropfindJob *job = new PropfindJob(_account, "/", this); + job->setIgnoreCredentialFailure(true); + job->setProperties(QList() << "getlastmodified"); + connect(job, SIGNAL(result(QVariantMap)), SLOT(slotAuthSuccess())); + connect(job, SIGNAL(networkError(QNetworkReply*)), SLOT(slotAuthFailed(QNetworkReply*))); + job->start(); qDebug() << "# checking for authentication settings."; } diff --git a/src/mirall/networkjobs.cpp b/src/mirall/networkjobs.cpp index ce80caefa..2a29dfcbf 100644 --- a/src/mirall/networkjobs.cpp +++ b/src/mirall/networkjobs.cpp @@ -23,7 +23,7 @@ #include #include #include - +#include #include #include "json.h" @@ -32,11 +32,13 @@ #include "mirall/account.h" #include "creds/credentialsfactory.h" +#include "creds/abstractcredentials.h" namespace Mirall { AbstractNetworkJob::AbstractNetworkJob(Account *account, const QString &path, QObject *parent) : QObject(parent) + , _ignoreCredentialFailure(false) , _reply(0) , _account(account) , _path(path) @@ -70,6 +72,11 @@ void AbstractNetworkJob::resetTimeout() _timer->start(interval); } +void AbstractNetworkJob::setIgnoreCredentialFailure(bool ignore) +{ + _ignoreCredentialFailure = ignore; +} + void AbstractNetworkJob::setAccount(Account *account) { _account = account; @@ -80,14 +87,10 @@ void AbstractNetworkJob::setPath(const QString &path) _path = path; } -void AbstractNetworkJob::slotError(QNetworkReply::NetworkError error) +void AbstractNetworkJob::slotError(QNetworkReply::NetworkError) { - if (error == QNetworkReply::ContentAccessDenied) { - // ### ask for password, retry job, needs refactoring to use start() - } qDebug() << metaObject()->className() << "Error:" << _reply->errorString(); emit networkError(_reply); - deleteLater(); } void AbstractNetworkJob::setupConnections(QNetworkReply *reply) @@ -128,10 +131,37 @@ QNetworkReply *AbstractNetworkJob::headRequest(const QUrl &url) return _account->headRequest(url); } +void AbstractNetworkJob::slotFinished() +{ + static QMutex mutex; + AbstractCredentials *creds = _account->credentials(); + qDebug() << creds->stillValid(_reply) << _ignoreCredentialFailure << _reply->errorString(); + if (creds->stillValid(_reply) || _ignoreCredentialFailure) { + finished(); + } else { + // If other jobs that still were created from before + // the account was put offline by the code below, + // we do want them to fail silently while we + // query the user + if (mutex.tryLock()) { + Account *a = account(); + a->setOnline(false); + a->setOnline(creds->fetchFromUser(a)); + mutex.unlock(); + } + } + deleteLater(); +} + AbstractNetworkJob::~AbstractNetworkJob() { _reply->deleteLater(); } +void AbstractNetworkJob::start() +{ + qDebug() << "!!!" << metaObject()->className() << "created for" << account()->url() << "querying" << path(); +} + /*********************************************************************************************/ RequestEtagJob::RequestEtagJob(Account *account, const QString &path, QObject *parent) @@ -167,9 +197,10 @@ void RequestEtagJob::start() if( reply()->error() != QNetworkReply::NoError ) { qDebug() << "getting etag: request network error: " << reply()->errorString(); } + AbstractNetworkJob::start(); } -void RequestEtagJob::slotFinished() +void RequestEtagJob::finished() { if (reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute) == 207) { // Parse DAV response @@ -188,7 +219,6 @@ void RequestEtagJob::slotFinished() } emit etagRetreived(etag); } - deleteLater(); } /*********************************************************************************************/ @@ -204,12 +234,12 @@ void MkColJob::start() QNetworkReply *reply = davRequest("MKCOL", path()); setReply(reply); setupConnections(reply); + AbstractNetworkJob::start(); } -void MkColJob::slotFinished() +void MkColJob::finished() { emit finished(reply()->error()); - deleteLater(); } /*********************************************************************************************/ @@ -236,9 +266,10 @@ void LsColJob::start() buf->setParent(reply); setReply(reply); setupConnections(reply); + AbstractNetworkJob::start(); } -void LsColJob::slotFinished() +void LsColJob::finished() { if (reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute) == 207) { // Parse DAV response @@ -264,8 +295,6 @@ void LsColJob::slotFinished() } emit directoryListing(folders); } - - deleteLater(); } /*********************************************************************************************/ @@ -281,6 +310,7 @@ void CheckServerJob::start() { setReply(getRequest(path())); setupConnections(reply()); + AbstractNetworkJob::start(); } void CheckServerJob::slotTimeout() @@ -305,7 +335,7 @@ bool CheckServerJob::installed(const QVariantMap &info) return info.value(QLatin1String("installed")).toBool(); } -void CheckServerJob::slotFinished() +void CheckServerJob::finished() { account()->setCertificateChain(reply()->sslConfiguration().peerCertificateChain()); @@ -343,7 +373,6 @@ void CheckServerJob::slotFinished() } else { qDebug() << "No proper answer on " << requestedUrl; } - deleteLater(); } /*********************************************************************************************/ @@ -380,6 +409,7 @@ void PropfindJob::start() setReply(davRequest("PROPFIND", path(), req, buf)); buf->setParent(reply()); setupConnections(reply()); + AbstractNetworkJob::start(); } void PropfindJob::setProperties(QList properties) @@ -392,7 +422,7 @@ QList PropfindJob::properties() const return _properties; } -void PropfindJob::slotFinished() +void PropfindJob::finished() { int http_result_code = reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); @@ -426,8 +456,6 @@ void PropfindJob::slotFinished() } else { qDebug() << "Quota request *not* successful, http result code is " << http_result_code; } - - deleteLater(); } /*********************************************************************************************/ @@ -441,9 +469,10 @@ void EntityExistsJob::start() { setReply(headRequest(path())); setupConnections(reply()); + AbstractNetworkJob::start(); } -void EntityExistsJob::slotFinished() +void EntityExistsJob::finished() { emit exists(reply()); } @@ -473,9 +502,10 @@ void CheckQuotaJob::start() setReply(davRequest("PROPFIND", path(), req, buf)); buf->setParent(reply()); setupConnections(reply()); + AbstractNetworkJob::start(); } -void CheckQuotaJob::slotFinished() +void CheckQuotaJob::finished() { if (reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute) == 207) { // Parse DAV response @@ -498,7 +528,6 @@ void CheckQuotaJob::slotFinished() qint64 total = quotaUsedBytes + quotaAvailableBytes; emit quotaRetrieved(total, quotaUsedBytes); } - deleteLater(); } } // namespace Mirall diff --git a/src/mirall/networkjobs.h b/src/mirall/networkjobs.h index 4b1475fbd..5617f6f30 100644 --- a/src/mirall/networkjobs.h +++ b/src/mirall/networkjobs.h @@ -37,7 +37,7 @@ public: explicit AbstractNetworkJob(Account *account, const QString &path, QObject* parent = 0); virtual ~AbstractNetworkJob(); - virtual void start() = 0; + virtual void start(); void setAccount(Account *account); Account* account() const { return _account; } @@ -50,6 +50,9 @@ public: void setTimeout(qint64 msec); void resetTimeout(); + void setIgnoreCredentialFailure(bool ignore); + bool ignoreCredentialFailure() const { return _ignoreCredentialFailure; } + signals: void networkError(QNetworkReply *reply); protected: @@ -66,13 +69,15 @@ protected: QNetworkReply* headRequest(const QUrl &url); int maxRedirects() const { return 10; } + virtual void finished() = 0; private slots: - virtual void slotFinished() = 0; + void slotFinished(); void slotError(QNetworkReply::NetworkError); virtual void slotTimeout() {} private: + bool _ignoreCredentialFailure; QNetworkReply *_reply; Account *_account; QString _path; @@ -92,7 +97,7 @@ signals: void exists(QNetworkReply*); private slots: - virtual void slotFinished(); + virtual void finished(); }; /** @@ -108,7 +113,7 @@ signals: void directoryListing(const QStringList &items); private slots: - virtual void slotFinished(); + virtual void finished(); }; /** @@ -126,7 +131,7 @@ signals: void result(const QVariantMap &values); private slots: - virtual void slotFinished(); + virtual void finished(); private: QList _properties; @@ -145,11 +150,11 @@ signals: void finished(QNetworkReply::NetworkError); private slots: - virtual void slotFinished(); + virtual void finished(); }; /** - * @brief The CheckOwncloudJob class + * @brief The CheckServerJob class */ class CheckServerJob : public AbstractNetworkJob { Q_OBJECT @@ -166,7 +171,7 @@ signals: void timeout(const QUrl&url); private slots: - virtual void slotFinished(); + virtual void finished(); virtual void slotTimeout(); private: @@ -188,7 +193,7 @@ signals: void etagRetreived(const QString &etag); private slots: - virtual void slotFinished(); + virtual void finished(); }; /** @@ -204,7 +209,7 @@ signals: void quotaRetrieved(qint64 totalBytes, qint64 availableBytes); private slots: - virtual void slotFinished(); + virtual void finished(); }; } // namespace Mirall diff --git a/src/mirall/owncloudsetupwizard.cpp b/src/mirall/owncloudsetupwizard.cpp index 1e613ccd6..808aa3c80 100644 --- a/src/mirall/owncloudsetupwizard.cpp +++ b/src/mirall/owncloudsetupwizard.cpp @@ -430,9 +430,10 @@ void DetermineAuthTypeJob::start() QNetworkReply *reply = getRequest(Account::davPath()); setReply(reply); setupConnections(reply); + AbstractNetworkJob::start(); } -void DetermineAuthTypeJob::slotFinished() +void DetermineAuthTypeJob::finished() { QUrl redirection = reply()->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl(); qDebug() << redirection.toString(); @@ -458,7 +459,6 @@ void DetermineAuthTypeJob::slotFinished() emit authType(WizardCommon::HttpCreds); } } - deleteLater(); } ValidateDavAuthJob::ValidateDavAuthJob(Account *account, QObject *parent) @@ -471,12 +471,12 @@ void ValidateDavAuthJob::start() QNetworkReply *reply = getRequest(Account::davPath()); setReply(reply); setupConnections(reply); + AbstractNetworkJob::start(); } -void ValidateDavAuthJob::slotFinished() +void ValidateDavAuthJob::finished() { emit authResult(reply()); - deleteLater(); } } // ns Mirall diff --git a/src/mirall/owncloudsetupwizard.h b/src/mirall/owncloudsetupwizard.h index d5cfd87c1..ee9f329bf 100644 --- a/src/mirall/owncloudsetupwizard.h +++ b/src/mirall/owncloudsetupwizard.h @@ -39,7 +39,7 @@ public: signals: void authResult(QNetworkReply*); private slots: - void slotFinished(); + void finished(); }; class DetermineAuthTypeJob : public AbstractNetworkJob { @@ -50,7 +50,7 @@ public: signals: void authType(WizardCommon::AuthType); private slots: - void slotFinished(); + void finished(); private: int _redirects; }; From 67132326d2b4733a9926a5f3ae347c21ee8441fe Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Sat, 23 Nov 2013 00:05:50 +0100 Subject: [PATCH 20/42] Prefix tooltips with app name --- src/mirall/systray.cpp | 6 ++++++ src/mirall/systray.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/mirall/systray.cpp b/src/mirall/systray.cpp index 04b79d31e..617d1408b 100644 --- a/src/mirall/systray.cpp +++ b/src/mirall/systray.cpp @@ -13,6 +13,7 @@ */ #include "systray.h" +#include "mirall/theme.h" #ifdef USE_FDO_NOTIFICATIONS #include @@ -43,4 +44,9 @@ void Systray::showMessage(const QString & title, const QString & message, Messag } } +void Systray::setToolTip(const QString &tip) +{ + QSystemTrayIcon::setToolTip(tr("%1: %2").arg(Theme::instance()->appNameGUI(), tip)); +} + } // namespace Mirall diff --git a/src/mirall/systray.h b/src/mirall/systray.h index 4a4a70c17..827f7c020 100644 --- a/src/mirall/systray.h +++ b/src/mirall/systray.h @@ -26,7 +26,7 @@ class Systray : public QSystemTrayIcon Q_OBJECT public: void showMessage(const QString & title, const QString & message, MessageIcon icon = Information, int millisecondsTimeoutHint = 10000); - + void setToolTip(const QString &tip); }; } // namespace Mirall From f554cca3d60f312928008451890d3ac797617e7f Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Sat, 23 Nov 2013 00:06:19 +0100 Subject: [PATCH 21/42] Fix initial state of quota info class. --- src/mirall/quotainfo.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mirall/quotainfo.cpp b/src/mirall/quotainfo.cpp index 3a9994ec9..4b0c5f4f8 100644 --- a/src/mirall/quotainfo.cpp +++ b/src/mirall/quotainfo.cpp @@ -17,6 +17,7 @@ #include "creds/abstractcredentials.h" #include +#include namespace Mirall { @@ -28,6 +29,7 @@ static const int initialTimeT = 1*1000; QuotaInfo::QuotaInfo(QObject *parent) : QObject(parent) + , _account(AccountManager::instance()->account()) , _lastQuotaTotalBytes(0) , _lastQuotaUsedBytes(0) , _refreshTimer(new QTimer(this)) @@ -49,7 +51,7 @@ void QuotaInfo::slotAccountChanged(Account *newAccount, Account *oldAccount) void QuotaInfo::slotOnlineStateChanged(bool online) { if (online) { - _refreshTimer->start(); + slotCheckQuota(); } else { _refreshTimer->stop(); } From 6165c38289482bfd331018f2478bf7d03f0350d3 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Sat, 23 Nov 2013 00:12:53 +0100 Subject: [PATCH 22/42] Fix indentation --- src/creds/abstractcredentials.h | 30 +++++++++++---------- src/creds/dummycredentials.h | 24 ++++++++--------- src/creds/httpcredentials.h | 48 ++++++++++++++++----------------- 3 files changed, 52 insertions(+), 50 deletions(-) diff --git a/src/creds/abstractcredentials.h b/src/creds/abstractcredentials.h index 4abae9670..58612bffb 100644 --- a/src/creds/abstractcredentials.h +++ b/src/creds/abstractcredentials.h @@ -26,25 +26,27 @@ class Account; class AbstractCredentials : public QObject { - Q_OBJECT + Q_OBJECT public: - // No need for virtual destructor - QObject already has one. - virtual void syncContextPreInit(CSYNC* ctx) = 0; - virtual void syncContextPreStart(CSYNC* ctx) = 0; - virtual bool changed(AbstractCredentials* credentials) const = 0; - virtual QString authType() const = 0; - virtual QString user() const = 0; - virtual QNetworkAccessManager* getQNAM() const = 0; - virtual bool ready() const = 0; - virtual void fetch(Account *account) = 0; - virtual bool stillValid(QNetworkReply *reply) = 0; - virtual bool fetchFromUser(Account *account) = 0; - virtual void persist(Account *account) = 0; + // No need for virtual destructor - QObject already has one. + virtual void syncContextPreInit(CSYNC* ctx) = 0; + virtual void syncContextPreStart(CSYNC* ctx) = 0; + virtual bool changed(AbstractCredentials* credentials) const = 0; + virtual QString authType() const = 0; + virtual QString user() const = 0; + virtual QNetworkAccessManager* getQNAM() const = 0; + virtual bool ready() const = 0; + virtual void fetch(Account *account) = 0; + virtual bool stillValid(QNetworkReply *reply) = 0; + virtual bool fetchFromUser(Account *account) = 0; + virtual void persist(Account *account) = 0; + /** Invalidates auth token, or password for basic auth */ + virtual void invalidateToken(Account *account) = 0; Q_SIGNALS: - void fetched(); + void fetched(); }; } // ns Mirall diff --git a/src/creds/dummycredentials.h b/src/creds/dummycredentials.h index 59df8615d..053996eb6 100644 --- a/src/creds/dummycredentials.h +++ b/src/creds/dummycredentials.h @@ -21,20 +21,20 @@ namespace Mirall class DummyCredentials : public AbstractCredentials { - Q_OBJECT + Q_OBJECT public: - void syncContextPreInit(CSYNC* ctx); - void syncContextPreStart(CSYNC* ctx); - bool changed(AbstractCredentials* credentials) const; - QString authType() const; - QString user() const; - QNetworkAccessManager* getQNAM() const; - bool ready() const; - bool stillValid(QNetworkReply *reply); - bool fetchFromUser(Account *account); - void fetch(Account*); - void persist(Account*); + void syncContextPreInit(CSYNC* ctx); + void syncContextPreStart(CSYNC* ctx); + bool changed(AbstractCredentials* credentials) const; + QString authType() const; + QString user() const; + QNetworkAccessManager* getQNAM() const; + bool ready() const; + bool stillValid(QNetworkReply *reply); + bool fetchFromUser(Account *account); + void fetch(Account*); + void persist(Account*); }; } // ns Mirall diff --git a/src/creds/httpcredentials.h b/src/creds/httpcredentials.h index 4d06b4733..4f6fa25ad 100644 --- a/src/creds/httpcredentials.h +++ b/src/creds/httpcredentials.h @@ -24,7 +24,7 @@ class QNetworkReply; class QAuthenticator; namespace QKeychain { - class Job; +class Job; } namespace Mirall @@ -32,36 +32,36 @@ namespace Mirall class HttpCredentials : public AbstractCredentials { - Q_OBJECT + Q_OBJECT public: - HttpCredentials(); - HttpCredentials(const QString& user, const QString& password); + HttpCredentials(); + HttpCredentials(const QString& user, const QString& password); - void syncContextPreInit(CSYNC* ctx); - void syncContextPreStart(CSYNC* ctx); - bool changed(AbstractCredentials* credentials) const; - QString authType() const; - QNetworkAccessManager* getQNAM() const; - bool ready() const; - void fetch(Account *account); - bool stillValid(QNetworkReply *reply); - bool fetchFromUser(Account *account); - void persist(Account *account); - QString user() const; - QString password() const; - QString queryPassword(bool *ok); + void syncContextPreInit(CSYNC* ctx); + void syncContextPreStart(CSYNC* ctx); + bool changed(AbstractCredentials* credentials) const; + QString authType() const; + QNetworkAccessManager* getQNAM() const; + bool ready() const; + void fetch(Account *account); + bool stillValid(QNetworkReply *reply); + bool fetchFromUser(Account *account); + void persist(Account *account); + QString user() const; + QString password() const; + QString queryPassword(bool *ok); private Q_SLOTS: - void slotAuthentication(QNetworkReply*, QAuthenticator*); - void slotReadJobDone(QKeychain::Job*); - void slotWriteJobDone(QKeychain::Job*); + void slotAuthentication(QNetworkReply*, QAuthenticator*); + void slotReadJobDone(QKeychain::Job*); + void slotWriteJobDone(QKeychain::Job*); private: - static QString keychainKey(const QString &url, const QString &user); - QString _user; - QString _password; - bool _ready; + static QString keychainKey(const QString &url, const QString &user); + QString _user; + QString _password; + bool _ready; }; } // ns Mirall From 4e22fff42709bfdf3b1dfd2b749acb79d3f757af Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Sat, 23 Nov 2013 00:14:02 +0100 Subject: [PATCH 23/42] Introduce online/offline state, accessible via GUI --- src/creds/dummycredentials.h | 1 + src/creds/httpcredentials.cpp | 18 ++++++++-- src/creds/httpcredentials.h | 1 + src/creds/shibbolethcredentials.cpp | 8 +++++ src/creds/shibbolethcredentials.h | 1 + src/mirall/account.cpp | 2 +- src/mirall/application.cpp | 40 +++++++++++++++++++++ src/mirall/application.h | 4 +++ src/mirall/connectionvalidator.cpp | 3 +- src/mirall/networkjobs.cpp | 6 ++-- src/mirall/owncloudgui.cpp | 54 ++++++++++++++++++++++------- src/mirall/owncloudgui.h | 4 +++ 12 files changed, 123 insertions(+), 19 deletions(-) diff --git a/src/creds/dummycredentials.h b/src/creds/dummycredentials.h index 053996eb6..7c883ced4 100644 --- a/src/creds/dummycredentials.h +++ b/src/creds/dummycredentials.h @@ -35,6 +35,7 @@ public: bool fetchFromUser(Account *account); void fetch(Account*); void persist(Account*); + void invalidateToken(Account *) {} }; } // ns Mirall diff --git a/src/creds/httpcredentials.cpp b/src/creds/httpcredentials.cpp index 12208bbb7..8fc9cf11b 100644 --- a/src/creds/httpcredentials.cpp +++ b/src/creds/httpcredentials.cpp @@ -187,7 +187,9 @@ void HttpCredentials::fetch(Account *account) } bool HttpCredentials::stillValid(QNetworkReply *reply) { - return (reply->error() != QNetworkReply::AuthenticationRequiredError); + return ((reply->error() != QNetworkReply::AuthenticationRequiredError) + // returned if user or password is incorrect + && (reply->error() != QNetworkReply::OperationCanceledError)); } bool HttpCredentials::fetchFromUser(Account *account) @@ -230,16 +232,28 @@ void HttpCredentials::slotReadJobDone(QKeychain::Job *job) QString HttpCredentials::queryPassword(bool *ok) { + qDebug() << AccountManager::instance()->account()->isOnline(); if (ok) { - return QInputDialog::getText(0, tr("Enter Password"), + QString str = QInputDialog::getText(0, tr("Enter Password"), tr("Please enter %1 password for user '%2':") .arg(Theme::instance()->appNameGUI(), _user), QLineEdit::Password, QString(), ok); + qDebug() << AccountManager::instance()->account()->isOnline(); + return str; } else { return QString(); } } +void HttpCredentials::invalidateToken(Account *account) +{ + _password = QString(); + DeletePasswordJob *job = new DeletePasswordJob(Theme::instance()->appName()); + job->setKey(keychainKey(account->url().toString(), _user)); + job->start(); + _ready = false; +} + void HttpCredentials::persist(Account *account) { account->setCredentialSetting(QLatin1String(userC), _user); diff --git a/src/creds/httpcredentials.h b/src/creds/httpcredentials.h index 4f6fa25ad..3c8b53103 100644 --- a/src/creds/httpcredentials.h +++ b/src/creds/httpcredentials.h @@ -51,6 +51,7 @@ public: QString user() const; QString password() const; QString queryPassword(bool *ok); + void invalidateToken(Account *account); private Q_SLOTS: void slotAuthentication(QNetworkReply*, QAuthenticator*); diff --git a/src/creds/shibbolethcredentials.cpp b/src/creds/shibbolethcredentials.cpp index 975d1489b..051361e00 100644 --- a/src/creds/shibbolethcredentials.cpp +++ b/src/creds/shibbolethcredentials.cpp @@ -211,6 +211,14 @@ void ShibbolethCredentials::persist(Account* /*account*/) cfg.storeCookies(_otherCookies); } +void ShibbolethCredentials::invalidateToken(Account *account) +{ + Q_UNUSED(account) + _shibCookie.setValue(""); + // ### access to ctx missing, but might not be required at all + //csync_set_module_property(ctx, "session_key", ""); +} + void ShibbolethCredentials::disposeBrowser() { disconnect(_browser, SIGNAL(viewHidden()), diff --git a/src/creds/shibbolethcredentials.h b/src/creds/shibbolethcredentials.h index e7f9a4033..6f53925e5 100644 --- a/src/creds/shibbolethcredentials.h +++ b/src/creds/shibbolethcredentials.h @@ -45,6 +45,7 @@ public: bool stillValid(QNetworkReply *reply); virtual bool fetchFromUser(Account *account); void persist(Account *account); + void invalidateToken(Account *account); QNetworkCookie cookie() const; diff --git a/src/mirall/account.cpp b/src/mirall/account.cpp index fb6acf8d0..a469b2d0d 100644 --- a/src/mirall/account.cpp +++ b/src/mirall/account.cpp @@ -293,9 +293,9 @@ bool Account::isOnline() const void Account::setOnline(bool online) { if (_isOnline != online) { + _isOnline = online; emit onlineStateChanged(online); } - _isOnline = online; } void Account::slotHandleErrors(QNetworkReply *reply , QList errors) diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp index e5efde42b..5cccc1439 100644 --- a/src/mirall/application.cpp +++ b/src/mirall/application.cpp @@ -124,6 +124,11 @@ Application::Application(int &argc, char **argv) : _gui->slotToggleLogBrowser(); // _showLogWindow is set in parseOptions. } connect( _gui, SIGNAL(setupProxy()), SLOT(slotSetupProxy())); + if (account) { + connect(account, SIGNAL(onlineStateChanged(bool)), _gui, SLOT(slotOnlineStateChanged())); + } + connect(AccountManager::instance(), SIGNAL(accountChanged(Account*,Account*)), + this, SLOT(slotAccountChanged(Account*,Account*))); // startup procedure. QTimer::singleShot( 0, this, SLOT( slotCheckConnection() )); @@ -135,6 +140,7 @@ Application::Application(int &argc, char **argv) : connect (this, SIGNAL(aboutToQuit()), SLOT(slotCleanup())); _socketApi = new SocketApi(this, cfg.configPathWithAppName().append(QLatin1String("socket"))); + } Application::~Application() @@ -142,6 +148,40 @@ Application::~Application() // qDebug() << "* Mirall shutdown"; } +void Application::slotLogin() +{ + Account *a = AccountManager::instance()->account(); + if (a) { + FolderMan::instance()->setupFolders(); + slotCheckConnection(); + } +} + +void Application::slotLogout() +{ + Account *a = AccountManager::instance()->account(); + if (a) { + // invalidate & forget token/password + a->credentials()->invalidateToken(a); + // terminate all syncs and unload folders + FolderMan *folderMan = FolderMan::instance(); + folderMan->setSyncEnabled(false); + folderMan->terminateSyncProcess(); + folderMan->unloadAllFolders(); + // go offline + a->setOnline(false); + // show result + _gui->slotComputeOverallSyncStatus(); + } +} + +void Application::slotAccountChanged(Account *newAccount, Account *oldAccount) +{ + disconnect(oldAccount, SIGNAL(onlineStateChanged(bool)), _gui, SLOT(slotOnlineStateChanged())); + connect(newAccount, SIGNAL(onlineStateChanged(bool)), _gui, SLOT(slotOnlineStateChanged())); +} + + void Application::slotCleanup() { // explicitly close windows. This is somewhat of a hack to ensure diff --git a/src/mirall/application.h b/src/mirall/application.h index a5a712a18..f64194c44 100644 --- a/src/mirall/application.h +++ b/src/mirall/application.h @@ -73,7 +73,11 @@ protected slots: void slotSetupProxy(); void slotUseMonoIconsChanged( bool ); void slotCredentialsFetched(); + void slotLogin(); + void slotLogout(); void slotCleanup(); + void slotAccountChanged(Account *newAccount, Account *oldAccount); + private: void setHelp(); void runValidator(); diff --git a/src/mirall/connectionvalidator.cpp b/src/mirall/connectionvalidator.cpp index 6d6533d4a..5d02b6de5 100644 --- a/src/mirall/connectionvalidator.cpp +++ b/src/mirall/connectionvalidator.cpp @@ -142,7 +142,8 @@ void ConnectionValidator::slotAuthFailed(QNetworkReply *reply) Status stat = StatusNotFound; if( reply->error() == QNetworkReply::AuthenticationRequiredError || - reply->error() == QNetworkReply::OperationCanceledError ) { // returned if the user is wrong. + reply->error() == QNetworkReply::OperationCanceledError ) { // returned if the user/pwd is wrong. + qDebug() << reply->error() << reply->errorString(); qDebug() << "******** Password is wrong!"; _errors << tr("The provided credentials are not correct"); stat = CredentialsWrong; diff --git a/src/mirall/networkjobs.cpp b/src/mirall/networkjobs.cpp index 2a29dfcbf..f42dde9ad 100644 --- a/src/mirall/networkjobs.cpp +++ b/src/mirall/networkjobs.cpp @@ -135,7 +135,6 @@ void AbstractNetworkJob::slotFinished() { static QMutex mutex; AbstractCredentials *creds = _account->credentials(); - qDebug() << creds->stillValid(_reply) << _ignoreCredentialFailure << _reply->errorString(); if (creds->stillValid(_reply) || _ignoreCredentialFailure) { finished(); } else { @@ -145,8 +144,9 @@ void AbstractNetworkJob::slotFinished() // query the user if (mutex.tryLock()) { Account *a = account(); - a->setOnline(false); - a->setOnline(creds->fetchFromUser(a)); + //a->setOnline(false); + bool fetched = creds->fetchFromUser(a); + a->setOnline(fetched); mutex.unlock(); } } diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp index dfdb28ffb..9df2cd9e6 100644 --- a/src/mirall/owncloudgui.cpp +++ b/src/mirall/owncloudgui.cpp @@ -23,6 +23,7 @@ #include "mirall/logger.h" #include "mirall/logbrowser.h" #include "mirall/account.h" +#include "creds/abstractcredentials.h" #include #include @@ -140,6 +141,11 @@ void ownCloudGui::slotOpenPath(const QString &path) Utility::showInFileManager(path); } +void ownCloudGui::slotOnlineStateChanged() +{ + setupContextMenu(); +} + void ownCloudGui::startupConnected( bool connected, const QStringList& fails ) { FolderMan *folderMan = FolderMan::instance(); @@ -161,6 +167,13 @@ void ownCloudGui::startupConnected( bool connected, const QStringList& fails ) void ownCloudGui::slotComputeOverallSyncStatus() { + if (Account *a = AccountManager::instance()->account()) { + if (!a->isOnline()) { + _tray->setIcon(Theme::instance()->syncStateIcon( SyncResult::Unavailable, true)); + _tray->setToolTip(tr("Please sign in")); + return; + } + } // display the info of the least successful sync (eg. not just display the result of the latest sync QString trayMessage; FolderMan *folderMan = FolderMan::instance(); @@ -208,17 +221,23 @@ void ownCloudGui::setupContextMenu() { FolderMan *folderMan = FolderMan::instance(); - bool isConfigured = (AccountManager::instance()->account() != 0); - _actionOpenoC->setEnabled(isConfigured); + Account *a = AccountManager::instance()->account(); - if( _contextMenu ) { + bool isConfigured = (a != 0); + _actionOpenoC->setEnabled(isConfigured); + bool isOnline = false; + if (isConfigured) { + isOnline = a->isOnline(); + } + + if ( _contextMenu ) { _contextMenu->clear(); _recentActionsMenu->clear(); _recentActionsMenu->addAction(tr("None.")); _recentActionsMenu->addAction(_actionRecent); } else { - _contextMenu = new QMenu(); - _recentActionsMenu = _contextMenu->addMenu(tr("Recent Changes")); + _contextMenu = new QMenu(_contextMenu); + _recentActionsMenu = new QMenu(tr("Recent Changes")); // this must be called only once after creating the context menu, or // it will trigger a bug in Ubuntu's SNI bridge patch (11.10, 12.04). _tray->setContextMenu(_contextMenu); @@ -255,19 +274,25 @@ void ownCloudGui::setupContextMenu() _contextMenu->addAction(action); } } + _contextMenu->addSeparator(); - _contextMenu->addSeparator(); - _contextMenu->addAction(_actionQuota); - _contextMenu->addSeparator(); - _contextMenu->addAction(_actionStatus); - _contextMenu->addMenu(_recentActionsMenu); - _contextMenu->addSeparator(); + if (isConfigured && isOnline) { + _contextMenu->addAction(_actionQuota); + _contextMenu->addSeparator(); + _contextMenu->addAction(_actionStatus); + _contextMenu->addMenu(_recentActionsMenu); + _contextMenu->addSeparator(); + } _contextMenu->addAction(_actionSettings); if (!Theme::instance()->helpUrl().isEmpty()) { _contextMenu->addAction(_actionHelp); } _contextMenu->addSeparator(); - + if (isConfigured && isOnline) { + _contextMenu->addAction(_actionLogout); + } else { + _contextMenu->addAction(_actionLogin); + } _contextMenu->addAction(_actionQuit); // Populate once at start @@ -334,6 +359,11 @@ void ownCloudGui::setupActions() _actionQuit = new QAction(tr("Quit %1").arg(Theme::instance()->appNameGUI()), this); QObject::connect(_actionQuit, SIGNAL(triggered(bool)), _app, SLOT(quit())); + _actionLogin = new QAction(tr("Sign in..."), this); + connect(_actionLogin, SIGNAL(triggered()), _app, SLOT(slotLogin())); + _actionLogout = new QAction(tr("Sign out"), this); + connect(_actionLogout, SIGNAL(triggered()), _app, SLOT(slotLogout())); + _quotaInfo = new QuotaInfo(this); connect(_quotaInfo, SIGNAL(quotaUpdated(qint64,qint64)), SLOT(slotRefreshQuotaDisplay(qint64,qint64))); } diff --git a/src/mirall/owncloudgui.h b/src/mirall/owncloudgui.h index 001707076..f78853e7d 100644 --- a/src/mirall/owncloudgui.h +++ b/src/mirall/owncloudgui.h @@ -67,6 +67,7 @@ public slots: void slotOpenOwnCloud(); void slotHelp(); void slotOpenPath(const QString& path); + void slotOnlineStateChanged(); private slots: void slotDisplayIdle(); @@ -81,6 +82,9 @@ private: QMenu *_contextMenu; QMenu *_recentActionsMenu; + QAction *_actionLogin; + QAction *_actionLogout; + QAction *_actionOpenoC; QAction *_actionSettings; QAction *_actionQuota; From 2a17a2a10224c8b400e49f16ee75ea8dae4e3223 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Sat, 23 Nov 2013 00:29:09 +0100 Subject: [PATCH 24/42] Remove credential-exposing debug output --- src/creds/httpcredentials.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/creds/httpcredentials.cpp b/src/creds/httpcredentials.cpp index 8fc9cf11b..149b06ce5 100644 --- a/src/creds/httpcredentials.cpp +++ b/src/creds/httpcredentials.cpp @@ -84,7 +84,7 @@ protected: QByteArray credHash = QByteArray(_cred->user().toUtf8()+":"+_cred->password().toUtf8()).toBase64(); QNetworkRequest req(request); req.setRawHeader(QByteArray("Authorization"), QByteArray("Basic ") + credHash); - qDebug() << "Request for " << req.url() << "with authorization" << QByteArray::fromBase64(credHash); + //qDebug() << "Request for " << req.url() << "with authorization" << QByteArray::fromBase64(credHash); return MirallAccessManager::createRequest(op, req, outgoingData); } private: From c25c7daca7edcc9a082621ecb85de9a29e78f84e Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 25 Nov 2013 12:50:12 +0100 Subject: [PATCH 25/42] docs: Add infos about installing the sql plugin and module Fixes #1184 --- doc/building.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/building.rst b/doc/building.rst index 3afbe893d..882b28947 100644 --- a/doc/building.rst +++ b/doc/building.rst @@ -70,9 +70,10 @@ Next, install the cross-compiler packages and the cross-compiled dependencies:: zypper install cmake make mingw32-cross-binutils mingw32-cross-cpp mingw32-cross-gcc \ mingw32-cross-gcc-c++ mingw32-cross-pkg-config mingw32-filesystem \ - mingw32-headers mingw32-runtime site-config \ - mingw32-libsqlite-devel mingw32-dlfcn-devel mingw32-libssh2-devel \ - kdewin-png2ico mingw32-libqt4 mingw32-libqt4-devel mingw32-libgcrypt \ + mingw32-headers mingw32-runtime site-config mingw32-libqt4-sql + mingw32-libqt4-sql-sqlite mingw32-libsqlite-devel \ + mingw32-dlfcn-devel mingw32-libssh2-devel kdewin-png2ico \ + mingw32-libqt4 mingw32-libqt4-devel mingw32-libgcrypt \ mingw32-libgnutls mingw32-libneon-openssl mingw32-libneon-devel \ mingw32-libbeecrypt mingw32-libopenssl mingw32-openssl \ mingw32-libpng-devel mingw32-libsqlite mingw32-qtkeychain \ From 685c13dead14945c6674f1192513cbe445836c7c Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 25 Nov 2013 15:33:35 +0100 Subject: [PATCH 26/42] Distiguish "Signed out" from "Disconnected" --- src/creds/httpcredentials.cpp | 8 ++++++-- src/mirall/account.cpp | 14 +++++++------- src/mirall/account.h | 13 +++++++++---- src/mirall/accountsettings.cpp | 10 +++++----- src/mirall/accountsettings.h | 2 +- src/mirall/application.cpp | 9 ++++----- src/mirall/connectionvalidator.cpp | 13 ++++++++++--- src/mirall/folder.cpp | 2 +- src/mirall/networkjobs.cpp | 5 +++-- src/mirall/owncloudgui.cpp | 12 ++++++------ src/mirall/owncloudgui.h | 2 +- src/mirall/quotainfo.cpp | 8 ++++---- src/mirall/quotainfo.h | 2 +- 13 files changed, 58 insertions(+), 42 deletions(-) diff --git a/src/creds/httpcredentials.cpp b/src/creds/httpcredentials.cpp index 149b06ce5..6350c926b 100644 --- a/src/creds/httpcredentials.cpp +++ b/src/creds/httpcredentials.cpp @@ -30,6 +30,8 @@ using namespace QKeychain; +Q_DECLARE_METATYPE(Mirall::Account*) + namespace Mirall { @@ -182,6 +184,7 @@ void HttpCredentials::fetch(Account *account) job->setInsecureFallback(true); job->setKey(keychainKey(account->url().toString(), _user)); connect(job, SIGNAL(finished(QKeychain::Job*)), SLOT(slotReadJobDone(QKeychain::Job*))); + job->setProperty("account", QVariant::fromValue(account)); job->start(); } } @@ -222,6 +225,7 @@ void HttpCredentials::slotReadJobDone(QKeychain::Job *job) if (ok) { _password = pwd; _ready = true; + persist(qvariant_cast(readJob->property("account"))); Q_EMIT fetched(); break; } @@ -232,13 +236,13 @@ void HttpCredentials::slotReadJobDone(QKeychain::Job *job) QString HttpCredentials::queryPassword(bool *ok) { - qDebug() << AccountManager::instance()->account()->isOnline(); + qDebug() << AccountManager::instance()->account()->state(); if (ok) { QString str = QInputDialog::getText(0, tr("Enter Password"), tr("Please enter %1 password for user '%2':") .arg(Theme::instance()->appNameGUI(), _user), QLineEdit::Password, QString(), ok); - qDebug() << AccountManager::instance()->account()->isOnline(); + qDebug() << AccountManager::instance()->account()->state(); return str; } else { return QString(); diff --git a/src/mirall/account.cpp b/src/mirall/account.cpp index a469b2d0d..22c371bb4 100644 --- a/src/mirall/account.cpp +++ b/src/mirall/account.cpp @@ -65,7 +65,7 @@ Account::Account(AbstractSslErrorHandler *sslErrorHandler, QObject *parent) , _am(0) , _credentials(0) , _treatSslErrorsAsFailure(false) - , _isOnline(false) + , _state(Account::Disconnected) { } @@ -285,16 +285,16 @@ void Account::setCredentialSetting(const QString &key, const QVariant &value) } } -bool Account::isOnline() const +int Account::state() const { - return _isOnline; + return _state; } -void Account::setOnline(bool online) +void Account::setState(int state) { - if (_isOnline != online) { - _isOnline = online; - emit onlineStateChanged(online); + if (_state != state) { + _state = state; + emit stateChanged(state); } } diff --git a/src/mirall/account.h b/src/mirall/account.h index 0bbba26ad..de6f1169d 100644 --- a/src/mirall/account.h +++ b/src/mirall/account.h @@ -64,6 +64,11 @@ public: class Account : public QObject { Q_OBJECT public: + enum State { Connected = 0, /// account is online + Disconnected = 1, /// no network connection + SignedOut = 2 /// Disconnected + credential token has been discarded + }; + static QString davPath() { return "remote.php/webdav/"; } Account(AbstractSslErrorHandler *sslErrorHandler = 0, QObject *parent = 0); @@ -133,10 +138,10 @@ public: QVariant credentialSetting(const QString& key) const; void setCredentialSetting(const QString& key, const QVariant &value); - bool isOnline() const; - void setOnline(bool online); + int state() const; + void setState(int state); signals: - void onlineStateChanged(bool online); + void stateChanged(int state); protected Q_SLOTS: void slotHandleErrors(QNetworkReply*,QList); @@ -150,7 +155,7 @@ private: QNetworkAccessManager *_am; AbstractCredentials* _credentials; bool _treatSslErrorsAsFailure; - bool _isOnline; + int _state; static QString _configFileName; }; diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp index b9263002b..f96f079e4 100644 --- a/src/mirall/accountsettings.cpp +++ b/src/mirall/accountsettings.cpp @@ -104,8 +104,8 @@ AccountSettings::AccountSettings(QWidget *parent) : ui->connectLabel->setText(tr("No account configured.")); ui->_buttonAdd->setEnabled(false); if (_account) { - connect(_account, SIGNAL(onlineStateChanged(bool)), SLOT(slotOnlineStateChanged(bool))); - slotOnlineStateChanged(_account->isOnline()); + connect(_account, SIGNAL(stateChanged(int)), SLOT(slotAccountStateChanged(int))); + slotAccountStateChanged(_account->state()); } setFolderList(FolderMan::instance()->map()); @@ -771,13 +771,13 @@ void AccountSettings::slotIgnoreFilesEditor() } } -void AccountSettings::slotOnlineStateChanged(bool online) +void AccountSettings::slotAccountStateChanged(int state) { if (_account) { QUrl safeUrl(_account->url()); safeUrl.setPassword(QString()); // Remove the password from the URL to avoid showing it in the UI - ui->_buttonAdd->setEnabled(online); - if (online) { + ui->_buttonAdd->setEnabled(state == Account::Connected); + if (state == Account::Connected) { QString user; if (AbstractCredentials *cred = _account->credentials()) { user = cred->user(); diff --git a/src/mirall/accountsettings.h b/src/mirall/accountsettings.h index d85ac32ff..0b9b1f65a 100644 --- a/src/mirall/accountsettings.h +++ b/src/mirall/accountsettings.h @@ -68,7 +68,7 @@ public slots: void slotUpdateQuota( qint64,qint64 ); void slotIgnoreFilesEditor(); - void slotOnlineStateChanged(bool online = true); + void slotAccountStateChanged(int state); void setGeneralErrors( const QStringList& errors ); diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp index 5cccc1439..01855e6a9 100644 --- a/src/mirall/application.cpp +++ b/src/mirall/application.cpp @@ -125,7 +125,7 @@ Application::Application(int &argc, char **argv) : } connect( _gui, SIGNAL(setupProxy()), SLOT(slotSetupProxy())); if (account) { - connect(account, SIGNAL(onlineStateChanged(bool)), _gui, SLOT(slotOnlineStateChanged())); + connect(account, SIGNAL(stateChanged(int)), _gui, SLOT(slotAccountStateChanged())); } connect(AccountManager::instance(), SIGNAL(accountChanged(Account*,Account*)), this, SLOT(slotAccountChanged(Account*,Account*))); @@ -168,8 +168,7 @@ void Application::slotLogout() folderMan->setSyncEnabled(false); folderMan->terminateSyncProcess(); folderMan->unloadAllFolders(); - // go offline - a->setOnline(false); + a->setState(Account::SignedOut); // show result _gui->slotComputeOverallSyncStatus(); } @@ -177,8 +176,8 @@ void Application::slotLogout() void Application::slotAccountChanged(Account *newAccount, Account *oldAccount) { - disconnect(oldAccount, SIGNAL(onlineStateChanged(bool)), _gui, SLOT(slotOnlineStateChanged())); - connect(newAccount, SIGNAL(onlineStateChanged(bool)), _gui, SLOT(slotOnlineStateChanged())); + disconnect(oldAccount, SIGNAL(stateChanged(int)), _gui, SLOT(slotOnlineStateChanged())); + connect(newAccount, SIGNAL(stateChanged(int)), _gui, SLOT(slotOnlineStateChanged())); } diff --git a/src/mirall/connectionvalidator.cpp b/src/mirall/connectionvalidator.cpp index 5d02b6de5..f6449c944 100644 --- a/src/mirall/connectionvalidator.cpp +++ b/src/mirall/connectionvalidator.cpp @@ -114,7 +114,7 @@ void ConnectionValidator::slotStatusFound(const QUrl&url, const QVariantMap &inf // status.php could not be loaded. void ConnectionValidator::slotNoStatusFound(QNetworkReply *reply) { - _account->setOnline(false); + _account->setState(false); // ### TODO _errors.append(tr("Unable to connect to %1").arg(_account->url().toString())); @@ -147,7 +147,14 @@ void ConnectionValidator::slotAuthFailed(QNetworkReply *reply) qDebug() << "******** Password is wrong!"; _errors << tr("The provided credentials are not correct"); stat = CredentialsWrong; - _account->setOnline(false); + switch (_account->state()) { + case Account::SignedOut: + _account->setState(Account::SignedOut); + break; + default: + _account->setState(Account::Disconnected); + } + } else if( reply->error() != QNetworkReply::NoError ) { _errors << reply->errorString(); } @@ -157,7 +164,7 @@ void ConnectionValidator::slotAuthFailed(QNetworkReply *reply) void ConnectionValidator::slotAuthSuccess() { - _account->setOnline(true); + _account->setState(Account::Connected); emit connectionResult(Connected); } diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp index 65d05936b..9922b0ab2 100644 --- a/src/mirall/folder.cpp +++ b/src/mirall/folder.cpp @@ -299,7 +299,7 @@ void Folder::etagRetreived(const QString& etag) void Folder::slotNetworkUnavailable() { - AccountManager::instance()->account()->setOnline(false); + AccountManager::instance()->account()->setState(Account::Disconnected); _syncResult.setStatus(SyncResult::Unavailable); emit syncStateChange(); } diff --git a/src/mirall/networkjobs.cpp b/src/mirall/networkjobs.cpp index f42dde9ad..494926114 100644 --- a/src/mirall/networkjobs.cpp +++ b/src/mirall/networkjobs.cpp @@ -144,9 +144,10 @@ void AbstractNetworkJob::slotFinished() // query the user if (mutex.tryLock()) { Account *a = account(); - //a->setOnline(false); bool fetched = creds->fetchFromUser(a); - a->setOnline(fetched); + if (fetched) { + a->setState(Account::Connected); + } mutex.unlock(); } } diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp index 9df2cd9e6..70528b180 100644 --- a/src/mirall/owncloudgui.cpp +++ b/src/mirall/owncloudgui.cpp @@ -141,7 +141,7 @@ void ownCloudGui::slotOpenPath(const QString &path) Utility::showInFileManager(path); } -void ownCloudGui::slotOnlineStateChanged() +void ownCloudGui::slotAccountStateChanged() { setupContextMenu(); } @@ -168,7 +168,7 @@ void ownCloudGui::startupConnected( bool connected, const QStringList& fails ) void ownCloudGui::slotComputeOverallSyncStatus() { if (Account *a = AccountManager::instance()->account()) { - if (!a->isOnline()) { + if (a->state() == Account::SignedOut) { _tray->setIcon(Theme::instance()->syncStateIcon( SyncResult::Unavailable, true)); _tray->setToolTip(tr("Please sign in")); return; @@ -225,9 +225,9 @@ void ownCloudGui::setupContextMenu() bool isConfigured = (a != 0); _actionOpenoC->setEnabled(isConfigured); - bool isOnline = false; + bool isConnected = false; if (isConfigured) { - isOnline = a->isOnline(); + isConnected = (a->state() == Account::Connected); } if ( _contextMenu ) { @@ -276,7 +276,7 @@ void ownCloudGui::setupContextMenu() } _contextMenu->addSeparator(); - if (isConfigured && isOnline) { + if (isConfigured && isConnected) { _contextMenu->addAction(_actionQuota); _contextMenu->addSeparator(); _contextMenu->addAction(_actionStatus); @@ -288,7 +288,7 @@ void ownCloudGui::setupContextMenu() _contextMenu->addAction(_actionHelp); } _contextMenu->addSeparator(); - if (isConfigured && isOnline) { + if (isConfigured && isConnected) { _contextMenu->addAction(_actionLogout); } else { _contextMenu->addAction(_actionLogin); diff --git a/src/mirall/owncloudgui.h b/src/mirall/owncloudgui.h index f78853e7d..af17d3835 100644 --- a/src/mirall/owncloudgui.h +++ b/src/mirall/owncloudgui.h @@ -67,7 +67,7 @@ public slots: void slotOpenOwnCloud(); void slotHelp(); void slotOpenPath(const QString& path); - void slotOnlineStateChanged(); + void slotAccountStateChanged(); private slots: void slotDisplayIdle(); diff --git a/src/mirall/quotainfo.cpp b/src/mirall/quotainfo.cpp index 4b0c5f4f8..edcff759f 100644 --- a/src/mirall/quotainfo.cpp +++ b/src/mirall/quotainfo.cpp @@ -44,13 +44,13 @@ QuotaInfo::QuotaInfo(QObject *parent) void QuotaInfo::slotAccountChanged(Account *newAccount, Account *oldAccount) { _account = newAccount; - disconnect(oldAccount, SIGNAL(onlineStateChanged(bool)), this, SLOT(slotOnlineStateChanged(bool))); - connect(newAccount, SIGNAL(onlineStateChanged(bool)), this, SLOT(slotOnlineStateChanged(bool))); + disconnect(oldAccount, SIGNAL(stateChanged(int)), this, SLOT(slotAccountStateChanged(int))); + connect(newAccount, SIGNAL(stateChanged(int)), this, SLOT(slotAccountStateChanged(int))); } -void QuotaInfo::slotOnlineStateChanged(bool online) +void QuotaInfo::slotAccountStateChanged(int state) { - if (online) { + if (state == Account::Connected) { slotCheckQuota(); } else { _refreshTimer->stop(); diff --git a/src/mirall/quotainfo.h b/src/mirall/quotainfo.h index 294a3928c..8d48e468e 100644 --- a/src/mirall/quotainfo.h +++ b/src/mirall/quotainfo.h @@ -34,7 +34,7 @@ public Q_SLOTS: private Q_SLOTS: void slotAccountChanged(Account *newAccount, Account *oldAccount); - void slotOnlineStateChanged(bool online); + void slotAccountStateChanged(int state); Q_SIGNALS: void quotaUpdated(qint64 total, qint64 used); From 9ddedf81ac997d8ac8c90cb2bade78cd6d012e91 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 25 Nov 2013 15:33:51 +0100 Subject: [PATCH 27/42] Cleanup: "Use QMutexLocker" --- src/mirall/account.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/mirall/account.cpp b/src/mirall/account.cpp index 22c371bb4..d5aa35cd8 100644 --- a/src/mirall/account.cpp +++ b/src/mirall/account.cpp @@ -40,12 +40,10 @@ AccountManager *AccountManager::instance() static QMutex mutex; if (!_instance) { - mutex.lock(); - + QMutexLocker lock(&mutex); if (!_instance) { _instance = new AccountManager; } - mutex.unlock(); } return _instance; From ad6c42b031977f2ff1d16b5fd80919aca43f182c Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 25 Nov 2013 15:50:19 +0100 Subject: [PATCH 28/42] Wizard: let us handle/ignore credential failures --- src/mirall/owncloudsetupwizard.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mirall/owncloudsetupwizard.cpp b/src/mirall/owncloudsetupwizard.cpp index 808aa3c80..d43d0d691 100644 --- a/src/mirall/owncloudsetupwizard.cpp +++ b/src/mirall/owncloudsetupwizard.cpp @@ -125,6 +125,7 @@ void OwncloudSetupWizard::slotDetermineAuthType(const QString &urlString) Account *account = _ocWizard->account(); account->setUrl(url); CheckServerJob *job = new CheckServerJob(_ocWizard->account(), false, this); + job->setIgnoreCredentialFailure(true); connect(job, SIGNAL(instanceFound(QUrl,QVariantMap)), SLOT(slotOwnCloudFoundAuth(QUrl,QVariantMap))); connect(job, SIGNAL(networkError(QNetworkReply*)), SLOT(slotNoOwnCloudFoundAuth(QNetworkReply*))); connect(job, SIGNAL(timeout(const QUrl&)), SLOT(slotNoOwnCloudFoundAuthTimeout(const QUrl&))); @@ -149,6 +150,7 @@ void OwncloudSetupWizard::slotOwnCloudFoundAuth(const QUrl& url, const QVariantM } DetermineAuthTypeJob *job = new DetermineAuthTypeJob(_ocWizard->account(), this); + job->setIgnoreCredentialFailure(true); connect(job, SIGNAL(authType(WizardCommon::AuthType)), _ocWizard, SLOT(setAuthType(WizardCommon::AuthType))); job->start(); @@ -184,6 +186,7 @@ void OwncloudSetupWizard::slotConnectToOCUrl( const QString& url ) void OwncloudSetupWizard::testOwnCloudConnect() { ValidateDavAuthJob *job = new ValidateDavAuthJob(_ocWizard->account(), this); + job->setIgnoreCredentialFailure(true); connect(job, SIGNAL(authResult(QNetworkReply*)), SLOT(slotConnectionCheck(QNetworkReply*))); job->start(); } From 1a3f246c46ea88935a92cf4af82ffb1c555c2998 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Mon, 25 Nov 2013 16:12:25 +0100 Subject: [PATCH 29/42] Add new Error Types to progress: Soft, Normal, Fatal. --- src/mirall/accountsettings.cpp | 4 +++- src/mirall/progressdispatcher.cpp | 9 +++++++++ src/mirall/progressdispatcher.h | 4 +++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp index f96f079e4..f75b885e1 100644 --- a/src/mirall/accountsettings.cpp +++ b/src/mirall/accountsettings.cpp @@ -672,7 +672,9 @@ void AccountSettings::slotSetProgress(const QString& folder, const Progress::Inf case Progress::Download: case Progress::Upload: case Progress::Inactive: - case Progress::Error: + case Progress::SoftError: + case Progress::NormalError: + case Progress::FatalError: break; } diff --git a/src/mirall/progressdispatcher.cpp b/src/mirall/progressdispatcher.cpp index dfae38644..f5a23f6b8 100644 --- a/src/mirall/progressdispatcher.cpp +++ b/src/mirall/progressdispatcher.cpp @@ -124,6 +124,15 @@ QString Progress::asActionString( Kind kind ) return re; } +bool Progress::isErrorKind( Kind kind ) +{ + bool re = false; + if( kind == SoftError || kind == NormalError || kind == FatalError ) { + re = true; + } + return re; +} + ProgressDispatcher* ProgressDispatcher::instance() { if (!_instance) { _instance = new ProgressDispatcher(); diff --git a/src/mirall/progressdispatcher.h b/src/mirall/progressdispatcher.h index 5848556bc..dbeab03f2 100644 --- a/src/mirall/progressdispatcher.h +++ b/src/mirall/progressdispatcher.h @@ -44,7 +44,9 @@ namespace Progress EndDelete, StartRename, EndRename, - Error + SoftError, + NormalError, + FatalError }; struct Info { From 0c6dca25c4b6e424dc542b58bc2ba44b81169272 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Mon, 25 Nov 2013 16:12:47 +0100 Subject: [PATCH 30/42] Register meta type for SyncProblem --- src/mirall/application.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp index 01855e6a9..5454fe133 100644 --- a/src/mirall/application.cpp +++ b/src/mirall/application.cpp @@ -111,6 +111,7 @@ Application::Application(int &argc, char **argv) : qRegisterMetaType("Progress::Kind"); qRegisterMetaType("Progress::Info"); + qRegisterMetaType("Progress::SyncProblem"); MirallConfigFile cfg; _theme->setSystrayUseMonoIcons(cfg.monoIcons()); From dc29046d618dece67c90f5a0b7a993689d95d60c Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Mon, 25 Nov 2013 16:16:33 +0100 Subject: [PATCH 31/42] Add new progressProblem signal and slots. Now the sync problems are handled differently than the sync progress to ease error message handling and stuff. --- src/mirall/csyncthread.cpp | 34 +++++++++--- src/mirall/csyncthread.h | 5 +- src/mirall/folder.cpp | 30 +++++++++-- src/mirall/folder.h | 1 + src/mirall/owncloudpropagator.cpp | 71 +++++++++++++------------ src/mirall/owncloudpropagator.h | 8 +-- src/mirall/progressdispatcher.cpp | 88 +++++++++++++++---------------- src/mirall/progressdispatcher.h | 9 +++- 8 files changed, 150 insertions(+), 96 deletions(-) diff --git a/src/mirall/csyncthread.cpp b/src/mirall/csyncthread.cpp index f1c974924..d894a837d 100644 --- a/src/mirall/csyncthread.cpp +++ b/src/mirall/csyncthread.cpp @@ -225,6 +225,8 @@ bool CSyncThread::checkBlacklisting( SyncFileItem *item ) qDebug() << "Item is on blacklist: " << entry._file << "retries:" << entry._retryCount; item->_blacklistedInDb = true; item->_instruction = CSYNC_INSTRUCTION_IGNORE; + item->_errorString = tr("The item is not synced because it is on the blacklist."); + slotProgressProblem( Progress::SoftError, *item ); } } @@ -316,6 +318,8 @@ int CSyncThread::treewalkFile( TREE_WALK_FILE *file, bool remote ) case CSYNC_INSTRUCTION_CONFLICT: case CSYNC_INSTRUCTION_IGNORE: case CSYNC_INSTRUCTION_ERROR: + // + slotProgressProblem(Progress::SoftError, item ); dir = SyncFileItem::None; break; case CSYNC_INSTRUCTION_EVAL: @@ -474,6 +478,8 @@ void CSyncThread::startSync() return; } + slotProgress(Progress::StartSync, SyncFileItem(), 0, 0); + _progressInfo = Progress::Info(); _hasFiles = false; @@ -518,8 +524,8 @@ void CSyncThread::startSync() _journal, &_abortRequested)); connect(_propagator.data(), SIGNAL(completed(SyncFileItem)), this, SLOT(transferCompleted(SyncFileItem)), Qt::QueuedConnection); - connect(_propagator.data(), SIGNAL(progress(Progress::Kind,QString,quint64,quint64)), - this, SLOT(slotProgress(Progress::Kind,QString,quint64,quint64))); + connect(_propagator.data(), SIGNAL(progress(Progress::Kind,SyncFileItem,quint64,quint64)), + this, SLOT(slotProgress(Progress::Kind,SyncFileItem,quint64,quint64))); connect(_propagator.data(), SIGNAL(finished()), this, SLOT(slotFinished())); int downloadLimit = 0; @@ -537,7 +543,6 @@ void CSyncThread::startSync() } _propagator->_uploadLimit = uploadLimit; - slotProgress(Progress::StartSync, QString(), 0, 0); _propagator->start(_syncedItems); } @@ -573,18 +578,29 @@ void CSyncThread::slotFinished() csync_commit(_csync_ctx); qDebug() << "CSync run took " << _syncTime.elapsed() << " Milliseconds"; - slotProgress(Progress::EndSync,QString(), 0 , 0); + slotProgress(Progress::EndSync,SyncFileItem(), 0 , 0); emit finished(); _propagator.reset(0); _syncMutex.unlock(); thread()->quit(); } - -void CSyncThread::slotProgress(Progress::Kind kind, const QString &file, quint64 curr, quint64 total) +void CSyncThread::slotProgressProblem(Progress::Kind kind, const SyncFileItem& item) { - Progress::Info pInfo = _progressInfo; + Progress::SyncProblem problem; + problem.kind = kind; + problem.current_file = item._file; + problem.error_message = item._errorString; + problem.error_code = item._httpErrorCode; + problem.timestamp = QDateTime::currentDateTime(); + + // connected to something in folder. + emit transmissionProblem( problem ); +} + +void CSyncThread::slotProgress(Progress::Kind kind, const SyncFileItem& item, quint64 curr, quint64 total) +{ if( kind == Progress::StartSync ) { QMutexLocker lock(&_mutex); _currentFileNo = 0; @@ -597,8 +613,10 @@ void CSyncThread::slotProgress(Progress::Kind kind, const QString &file, quint64 _currentFileNo += 1; } + Progress::Info pInfo = _progressInfo; + pInfo.kind = kind; - pInfo.current_file = file; + pInfo.current_file = item._file; pInfo.file_size = total; pInfo.current_file_bytes = curr; pInfo.current_file_no = _currentFileNo; diff --git a/src/mirall/csyncthread.h b/src/mirall/csyncthread.h index 8d76b18c2..b4ea714a6 100644 --- a/src/mirall/csyncthread.h +++ b/src/mirall/csyncthread.h @@ -68,6 +68,8 @@ signals: void treeWalkResult(const SyncFileItemVector&); void transmissionProgress( const Progress::Info& progress ); + void transmissionProblem( const Progress::SyncProblem& problem ); + void csyncStateDbFile( const QString& ); void wipeDb(); @@ -79,7 +81,8 @@ signals: private slots: void transferCompleted(const SyncFileItem& item); void slotFinished(); - void slotProgress(Progress::Kind kind, const QString& file, quint64, quint64); + void slotProgress(Progress::Kind kind, const SyncFileItem &item, quint64, quint64); + void slotProgressProblem(Progress::Kind kind, const SyncFileItem& item); private: void handleSyncError(CSYNC *ctx, const char *state); diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp index 9922b0ab2..a769bfa28 100644 --- a/src/mirall/folder.cpp +++ b/src/mirall/folder.cpp @@ -627,6 +627,7 @@ void Folder::startSync(const QStringList &pathList) connect(_csync, SIGNAL(aboutToRemoveAllFiles(SyncFileItem::Direction,bool*)), SLOT(slotAboutToRemoveAllFiles(SyncFileItem::Direction,bool*)), Qt::BlockingQueuedConnection); connect(_csync, SIGNAL(transmissionProgress(Progress::Info)), this, SLOT(slotTransmissionProgress(Progress::Info))); + connect(_csync, SIGNAL(transmissionProblem(Progress::SyncProblem)), this, SLOT(slotTransmissionProblem(Progress::SyncProblem))); _thread->start(); _thread->setPriority(QThread::LowPriority); @@ -687,6 +688,32 @@ void Folder::slotCSyncFinished() emit syncFinished( _syncResult ); } +// the problem comes without a folder and the valid path set. Add that here +// and hand the result over to the progress dispatcher. +void Folder::slotTransmissionProblem( const Progress::SyncProblem& problem ) +{ + Progress::SyncProblem newProb = problem; + newProb.folder = alias(); + + if(newProb.current_file.startsWith(QLatin1String("ownclouds://")) || + newProb.current_file.startsWith(QLatin1String("owncloud://")) ) { + // rip off the whole ownCloud URL. + newProb.current_file.remove(Utility::toCSyncScheme(remoteUrl().toString())); + } + QString localPath = path(); + if( newProb.current_file.startsWith(localPath) ) { + // remove the local dir. + newProb.current_file = newProb.current_file.right( newProb.current_file.length() - localPath.length()); + } + + // Count all error conditions. + _syncResult.setWarnCount( _syncResult.warnCount()+1 ); + + ProgressDispatcher::instance()->setProgressProblem(alias(), newProb); +} + +// the progress comes without a folder and the valid path set. Add that here +// and hand the result over to the progress dispatcher. void Folder::slotTransmissionProgress(const Progress::Info& progress) { Progress::Info newInfo = progress; @@ -707,9 +734,6 @@ void Folder::slotTransmissionProgress(const Progress::Info& progress) if( newInfo.kind == Progress::StartSync ) { _syncResult.setWarnCount(0); } - if( newInfo.kind == Progress::Error ) { - _syncResult.setWarnCount( _syncResult.warnCount()+1 ); - } ProgressDispatcher::instance()->setProgressInfo(alias(), newInfo); } diff --git a/src/mirall/folder.h b/src/mirall/folder.h index 37a2d46a4..6d30051af 100644 --- a/src/mirall/folder.h +++ b/src/mirall/folder.h @@ -174,6 +174,7 @@ private slots: void slotCSyncFinished(); void slotTransmissionProgress(const Progress::Info& progress); + void slotTransmissionProblem( const Progress::SyncProblem& problem ); void slotPollTimerTimeout(); void etagRetreived(const QString &); diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp index 44d109589..c9152f582 100644 --- a/src/mirall/owncloudpropagator.cpp +++ b/src/mirall/owncloudpropagator.cpp @@ -267,7 +267,7 @@ private: PropagateUploadFile* that = reinterpret_cast(userdata); if (status == ne_status_sending && info->sr.total > 0) { - emit that->progress(Progress::Context, that->_item._file , + emit that->progress(Progress::Context, that->_item, that->_chunked_done + info->sr.progress, that->_chunked_total_size ? that->_chunked_total_size : info->sr.total ); @@ -281,7 +281,7 @@ private: void PropagateUploadFile::start() { - emit progress(Progress::StartUpload, _item._file, 0, _item._size); + emit progress(Progress::StartUpload, _item, 0, _item._size); QFile file(_propagator->_localDir + _item._file); if (!file.open(QIODevice::ReadOnly)) { @@ -352,39 +352,39 @@ void PropagateUploadFile::start() /* If the source file changed during submission, lets try again */ if( state == HBF_SOURCE_FILE_CHANGE ) { - if( attempts++ < 20 ) { /* FIXME: How often do we want to try? */ - qDebug("SOURCE file has changed during upload, retry #%d in two seconds!", attempts); - sleep(2); - continue; - } - // Still the file change error, but we tried a couple of times. - // Ignore this file for now. - // Lets remove the file from the server (at least if it is new) as it is different - // from our file here. - if( _item._instruction == CSYNC_INSTRUCTION_NEW ) { - QScopedPointer uri( - ne_path_escape((_propagator->_remoteDir + _item._file).toUtf8())); + if( attempts++ < 20 ) { /* FIXME: How often do we want to try? */ + qDebug("SOURCE file has changed during upload, retry #%d in two seconds!", attempts); + sleep(2); + continue; + } + // Still the file change error, but we tried a couple of times. + // Ignore this file for now. + // Lets remove the file from the server (at least if it is new) as it is different + // from our file here. + if( _item._instruction == CSYNC_INSTRUCTION_NEW ) { + QScopedPointer uri( + ne_path_escape((_propagator->_remoteDir + _item._file).toUtf8())); - int rc = ne_delete(_propagator->_session, uri.data()); - qDebug() << "Remove the invalid file from server:" << rc; - } + int rc = ne_delete(_propagator->_session, uri.data()); + qDebug() << "Remove the invalid file from server:" << rc; + } - const QString errMsg = tr("Local file changed during sync, syncing once it arrived completely"); - done( SyncFileItem::SoftError, errMsg ); - emit progress(Progress::Error, _item._file, 0, - (quint64) "Local file changed during sync, syncing once it arrived completely"); // FIXME: Use errMsg - - return; + const QString errMsg = tr("Local file changed during sync, syncing once it arrived completely"); + done( SyncFileItem::SoftError, errMsg ); + _item._errorString = errMsg; + emit progressProblem( Progress::SoftError, _item ); + return; } else if( state == HBF_USER_ABORTED ) { const QString errMsg = tr("Sync was aborted by user."); done( SyncFileItem::SoftError, errMsg); - emit progress(Progress::Error, _item._file, 0, - (quint64) "User terminated sync process!" ); // FIXME: Use errMsg + _item._errorString = errMsg; + emit progressProblem( Progress::SoftError, _item ); } else { + // Other HBF error conditions. // FIXME: find out the error class. _item._httpErrorCode = hbf_fail_http_code(trans.data()); done(SyncFileItem::NormalError, hbf_error_string(trans.data(), state)); - emit progress(Progress::EndUpload, _item._file, 0, _item._size); + emit progressProblem(Progress::NormalError, _item); } return; } @@ -401,7 +401,7 @@ void PropagateUploadFile::start() // Remove from the progress database: _propagator->_journal->setUploadInfo(_item._file, SyncJournalDb::UploadInfo()); _propagator->_journal->commit("upload file start"); - emit progress(Progress::EndUpload, _item._file, 0, _item._size); + emit progress(Progress::EndUpload, _item, 0, _item._size); done(SyncFileItem::Success); return; @@ -595,7 +595,7 @@ private: { PropagateDownloadFile* that = reinterpret_cast(userdata); if (status == ne_status_recving && info->sr.total > 0) { - emit that->progress(Progress::Context, that->_item._file, info->sr.progress, info->sr.total ); + emit that->progress(Progress::Context, that->_item, info->sr.progress, info->sr.total ); that->limitBandwidth(info->sr.progress, that->_propagator->_downloadLimit); } } @@ -603,7 +603,7 @@ private: void PropagateDownloadFile::start() { - emit progress(Progress::StartDownload, _item._file, 0, _item._size); + emit progress(Progress::StartDownload, _item, 0, _item._size); QString tmpFileName; const SyncJournalDb::DownloadInfo progressInfo = _propagator->_journal->getDownloadInfo(_item._file); @@ -777,7 +777,7 @@ void PropagateDownloadFile::start() _propagator->_journal->setFileRecord(SyncJournalFileRecord(_item, fn)); _propagator->_journal->setDownloadInfo(_item._file, SyncJournalDb::DownloadInfo()); _propagator->_journal->commit("download file start2"); - emit progress(Progress::EndDownload, _item._file, 0, _item._size); + emit progress(Progress::EndDownload, _item, 0, _item._size); done(isConflict ? SyncFileItem::Conflict : SyncFileItem::Success); } @@ -785,7 +785,7 @@ DECLARE_JOB(PropagateLocalRename) void PropagateLocalRename::start() { - emit progress(Progress::StartRename, _item._file, 0, _item._size); + emit progress(Progress::StartRename, _item, 0, _item._size); if (_item._file != _item._renameTarget) { qDebug() << "MOVE " << _propagator->_localDir + _item._file << " => " << _propagator->_localDir + _item._renameTarget; QFile::rename(_propagator->_localDir + _item._file, _propagator->_localDir + _item._renameTarget); @@ -803,7 +803,7 @@ void PropagateLocalRename::start() _propagator->_journal->setFileRecord(record); _propagator->_journal->commit("localRename"); - emit progress(Progress::EndRename, _item._file, 0, _item._size); + emit progress(Progress::EndRename, _item, 0, _item._size); done(SyncFileItem::Success); } @@ -831,7 +831,7 @@ void PropagateRemoteRename::start() } return; } else { - emit progress(Progress::StartRename, _item._file, 0, _item._size); + emit progress(Progress::StartRename, _item, 0, _item._size); QScopedPointer uri1(ne_path_escape((_propagator->_remoteDir + _item._file).toUtf8())); QScopedPointer uri2(ne_path_escape((_propagator->_remoteDir + _item._renameTarget).toUtf8())); @@ -843,7 +843,7 @@ void PropagateRemoteRename::start() } updateMTimeAndETag(uri2.data(), _item._modtime); - emit progress(Progress::EndRename, _item._file, 0, _item._size); + emit progress(Progress::EndRename, _item, 0, _item._size); } @@ -996,7 +996,8 @@ void OwncloudPropagator::start(const SyncFileItemVector& _syncedItems) } connect(_rootJob.data(), SIGNAL(completed(SyncFileItem)), this, SIGNAL(completed(SyncFileItem))); - connect(_rootJob.data(), SIGNAL(progress(Progress::Kind,QString,quint64,quint64)), this, SIGNAL(progress(Progress::Kind,QString,quint64,quint64))); + connect(_rootJob.data(), SIGNAL(progress(Progress::Kind,SyncFileItem,quint64,quint64)), this, + SIGNAL(progress(Progress::Kind,SyncFileItem,quint64,quint64))); connect(_rootJob.data(), SIGNAL(finished(SyncFileItem::Status)), this, SIGNAL(finished())); _rootJob->start(); diff --git a/src/mirall/owncloudpropagator.h b/src/mirall/owncloudpropagator.h index 11c31aece..fed659533 100644 --- a/src/mirall/owncloudpropagator.h +++ b/src/mirall/owncloudpropagator.h @@ -43,7 +43,8 @@ public slots: signals: void finished(SyncFileItem::Status); void completed(const SyncFileItem &); - void progress(Progress::Kind, const QString &filename, quint64 bytes, quint64 total); + void progress(Progress::Kind, const SyncFileItem& item, quint64 bytes, quint64 total); + void progressProblem( Progress::Kind, const SyncFileItem& ); }; /* @@ -84,7 +85,7 @@ private slots: void startJob(PropagatorJob *next) { connect(next, SIGNAL(finished(SyncFileItem::Status)), this, SLOT(proceedNext(SyncFileItem::Status)), Qt::QueuedConnection); connect(next, SIGNAL(completed(SyncFileItem)), this, SIGNAL(completed(SyncFileItem))); - connect(next, SIGNAL(progress(Progress::Kind,QString,quint64,quint64)), this, SIGNAL(progress(Progress::Kind,QString,quint64,quint64))); + connect(next, SIGNAL(progress(Progress::Kind,SyncFileItem,quint64,quint64)), this, SIGNAL(progress(Progress::Kind,SyncFileItem,quint64,quint64))); next->start(); } @@ -170,7 +171,8 @@ public: signals: void completed(const SyncFileItem &); - void progress(Progress::Kind, const QString &filename, quint64 bytes, quint64 total); + void progress(Progress::Kind kind, const SyncFileItem&, quint64 bytes, quint64 total); + void progressProblem( Progress::Kind, const SyncFileItem& ); void finished(); }; diff --git a/src/mirall/progressdispatcher.cpp b/src/mirall/progressdispatcher.cpp index f5a23f6b8..f7aea4349 100644 --- a/src/mirall/progressdispatcher.cpp +++ b/src/mirall/progressdispatcher.cpp @@ -168,59 +168,57 @@ QList ProgressDispatcher::recentProblems(int count) return _recentProblems; } +void ProgressDispatcher::setProgressProblem(const QString& folder, const Progress::SyncProblem &problem) +{ + Q_ASSERT( Progress::isErrorKind(problem.kind)); + + _recentProblems.prepend( problem ); + if( _recentProblems.size() > _QueueSize ) { + _recentProblems.removeLast(); + } + emit progressSyncProblem( folder, problem ); +} + void ProgressDispatcher::setProgressInfo(const QString& folder, const Progress::Info& progress) { if( folder.isEmpty() ) { return; } - Progress::Info newProgress = progress; + Progress::Info newProgress(progress); - if( newProgress.kind == Progress::Error ) { - Progress::SyncProblem err; - err.folder = folder; - err.current_file = newProgress.current_file; - // its really - err.error_message = QString::fromLocal8Bit( (const char*)newProgress.file_size ); - err.error_code = newProgress.current_file_bytes; - err.timestamp = QDateTime::currentDateTime(); + Q_ASSERT( !Progress::isErrorKind(progress.kind)); - _recentProblems.prepend( err ); - if( _recentProblems.size() > _QueueSize ) { - _recentProblems.removeLast(); - } - emit progressSyncProblem( folder, err ); - } else { - if( newProgress.kind == Progress::StartSync ) { - _recentProblems.clear(); - _timer.start(); - } - if( newProgress.kind == Progress::EndSync ) { - newProgress.overall_current_bytes = newProgress.overall_transmission_size; - newProgress.current_file_no = newProgress.overall_file_count; - _currentAction.remove(newProgress.folder); - qint64 msecs = _timer.elapsed(); - - qDebug()<< "[PROGRESS] progressed " << newProgress.overall_transmission_size - << " bytes in " << newProgress.overall_file_count << " files" - << " in msec " << msecs; - } - if( newProgress.kind == Progress::EndDownload || - newProgress.kind == Progress::EndUpload || - newProgress.kind == Progress::EndDelete || - newProgress.kind == Progress::EndRename ) { - _recentChanges.prepend(newProgress); - if( _recentChanges.size() > _QueueSize ) { - _recentChanges.removeLast(); - } - } - // store the last real action to help clients that start during - // the Context-phase of an upload or download. - if( newProgress.kind != Progress::Context ) { - _currentAction[folder] = newProgress.kind; - } - - emit progressInfo( folder, newProgress ); + if( newProgress.kind == Progress::StartSync ) { + _recentProblems.clear(); + _timer.start(); } + if( newProgress.kind == Progress::EndSync ) { + newProgress.overall_current_bytes = newProgress.overall_transmission_size; + newProgress.current_file_no = newProgress.overall_file_count; + _currentAction.remove(newProgress.folder); + qint64 msecs = _timer.elapsed(); + + qDebug()<< "[PROGRESS] progressed " << newProgress.overall_transmission_size + << " bytes in " << newProgress.overall_file_count << " files" + << " in msec " << msecs; + } + if( newProgress.kind == Progress::EndDownload || + newProgress.kind == Progress::EndUpload || + newProgress.kind == Progress::EndDelete || + newProgress.kind == Progress::EndRename ) { + _recentChanges.prepend(newProgress); + if( _recentChanges.size() > _QueueSize ) { + _recentChanges.removeLast(); + } + } + // store the last real action to help clients that start during + // the Context-phase of an upload or download. + if( newProgress.kind != Progress::Context ) { + _currentAction[folder] = newProgress.kind; + } + + emit progressInfo( folder, newProgress ); + } Progress::Kind ProgressDispatcher::currentFolderContext( const QString& folder ) diff --git a/src/mirall/progressdispatcher.h b/src/mirall/progressdispatcher.h index dbeab03f2..12a2dc123 100644 --- a/src/mirall/progressdispatcher.h +++ b/src/mirall/progressdispatcher.h @@ -69,15 +69,20 @@ namespace Progress }; struct SyncProblem { + Kind kind; QString folder; QString current_file; QString error_message; int error_code; QDateTime timestamp; + + SyncProblem() : kind(Invalid), error_code(0) {} }; QString asActionString( Kind ); QString asResultString( Kind ); + + bool isErrorKind( Kind ); } /** @@ -102,6 +107,7 @@ public: QList recentProblems(int count); Progress::Kind currentFolderContext( const QString& folder ); + signals: /** @brief Signals the progress of data transmission. @@ -115,7 +121,8 @@ signals: void progressSyncProblem( const QString& folder, const Progress::SyncProblem& problem ); protected: - void setProgressInfo(const QString &folder, const Progress::Info& progress); + void setProgressInfo(const QString& folder, const Progress::Info& progress); + void setProgressProblem( const QString& folder, const Progress::SyncProblem& problem); private: ProgressDispatcher(QObject* parent = 0); From 2e4043b49850b793bb7687580f019c65f9b07e7b Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Mon, 25 Nov 2013 16:17:29 +0100 Subject: [PATCH 32/42] Show proper error message and icon according to error class. --- src/mirall/protocolwidget.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mirall/protocolwidget.cpp b/src/mirall/protocolwidget.cpp index f88e5d7ba..532882dbc 100644 --- a/src/mirall/protocolwidget.cpp +++ b/src/mirall/protocolwidget.cpp @@ -290,7 +290,7 @@ void ProtocolWidget::slotProgressProblem( const QString& folder, const Progress: columns << timeStr; columns << problem.current_file; columns << folder; - QString errMsg = tr("Problem: %1").arg(problem.error_message); + QString errMsg = problem.error_message; #if 0 if( problem.error_code == 507 ) { errMsg = tr("No more storage space available on server."); @@ -302,7 +302,11 @@ void ProtocolWidget::slotProgressProblem( const QString& folder, const Progress: item->setData(0, ErrorIndicatorRole, QVariant(true) ); // Maybe we should not set the error icon for all problems but distinguish // by error_code. A quota problem is considered an error, others might not?? - item->setIcon(0, Theme::instance()->syncStateIcon(SyncResult::Error, true)); + if( problem.kind == Progress::SoftError ) { + item->setIcon(0, Theme::instance()->syncStateIcon(SyncResult::Problem, true)); + } else { + item->setIcon(0, Theme::instance()->syncStateIcon(SyncResult::Error, true)); + } item->setToolTip(0, longTimeStr); _ui->_treeWidget->insertTopLevelItem(0, item); Q_UNUSED(item); From 6b7da798b89e2abfad5ea106523cc6df066e4a58 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 25 Nov 2013 16:28:51 +0100 Subject: [PATCH 33/42] Remove -gzip from Etag Fix #1195 --- src/mirall/owncloudpropagator.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp index c9152f582..9b9db208c 100644 --- a/src/mirall/owncloudpropagator.cpp +++ b/src/mirall/owncloudpropagator.cpp @@ -410,11 +410,17 @@ void PropagateUploadFile::start() static QByteArray parseEtag(ne_request *req) { const char *header = ne_get_response_header(req, "etag"); + QByteArray arr; if(header && header [0] == '"' && header[ strlen(header)-1] == '"') { - return QByteArray(header + 1, strlen(header)-2); + arr = QByteArray(header + 1, strlen(header)-2); } else { - return header; + arr = header; } + if (arr.endsWith("-gzip")) { + // https://github.com/owncloud/mirall/issues/1195 + arr.chop(5); + } + return arr; } static QString parseFileId(ne_request *req) { From 72d2ac09e3e14cf8b146e51e82e88ef604099e27 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Mon, 25 Nov 2013 16:37:06 +0100 Subject: [PATCH 34/42] Propagator: Don't ignore error if no HTTP error code --- src/mirall/owncloudpropagator.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp index 9b9db208c..8ae97805d 100644 --- a/src/mirall/owncloudpropagator.cpp +++ b/src/mirall/owncloudpropagator.cpp @@ -903,7 +903,8 @@ bool PropagateItemJob::updateErrorFromSession(int neon_code, ne_request* req, in // Check if we don't need to ignore that error. httpStatusCode = errorString.mid(0, errorString.indexOf(QChar(' '))).toInt(); _item._httpErrorCode = httpStatusCode; - if (httpStatusCode == ignoreHttpCode) + qDebug() << Q_FUNC_INFO << "NE_ERROR" << errorString << httpStatusCode << ignoreHttpCode; + if (ignoreHttpCode && httpStatusCode == ignoreHttpCode) return false; done(SyncFileItem::NormalError, errorString); From d85009a2e91a2221de60d3fe5f5f88bf31879008 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 25 Nov 2013 17:34:20 +0100 Subject: [PATCH 35/42] Account Settings: fix connect error Fixes #1198 --- src/mirall/accountsettings.cpp | 8 ++++---- src/mirall/accountsettings.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp index f75b885e1..b40bb2ba9 100644 --- a/src/mirall/accountsettings.cpp +++ b/src/mirall/accountsettings.cpp @@ -168,7 +168,7 @@ void AccountSettings::slotFolderWizardAccepted() folderMan->slotScheduleAllFolders(); emit folderChanged(); } - buttonsSetEnabled(); + slotButtonsSetEnabled(); } void AccountSettings::slotFolderWizardRejected() @@ -193,12 +193,12 @@ void AccountSettings::slotAddFolder( Folder *folder ) folderToModelItem( item, folder ); _model->appendRow( item ); // in order to update the enabled state of the "Sync now" button - connect(folder, SIGNAL(syncStateChange()), this, SLOT(buttonsSetEnabled()), Qt::UniqueConnection); + connect(folder, SIGNAL(syncStateChange()), this, SLOT(slotButtonsSetEnabled()), Qt::UniqueConnection); } -void AccountSettings::buttonsSetEnabled() +void AccountSettings::slotButtonsSetEnabled() { bool haveFolders = ui->_folderList->model()->rowCount() > 0; @@ -379,7 +379,7 @@ void AccountSettings::setFolderList( const Folder::Map &folders ) if (idx.isValid()) { ui->_folderList->setCurrentIndex(idx); } - buttonsSetEnabled(); + slotButtonsSetEnabled(); } diff --git a/src/mirall/accountsettings.h b/src/mirall/accountsettings.h index 0b9b1f65a..ed9f462f3 100644 --- a/src/mirall/accountsettings.h +++ b/src/mirall/accountsettings.h @@ -49,7 +49,6 @@ public: ~AccountSettings(); void setFolderList( const Folder::Map& ); - void buttonsSetEnabled(); signals: void folderChanged(); @@ -65,6 +64,7 @@ public slots: void slotFolderOpenAction( const QString& ); void slotSetProgress(const QString&, const Progress::Info& progress); void slotProgressProblem(const QString& folder, const Progress::SyncProblem& problem); + void slotButtonsSetEnabled(); void slotUpdateQuota( qint64,qint64 ); void slotIgnoreFilesEditor(); From ca3d8ab1936ebbd7b7cef7e805d683e6ed2bfebb Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 25 Nov 2013 17:43:34 +0100 Subject: [PATCH 36/42] Add one case of missing -gzip removal --- src/mirall/owncloudpropagator.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp index 8ae97805d..b527948cf 100644 --- a/src/mirall/owncloudpropagator.cpp +++ b/src/mirall/owncloudpropagator.cpp @@ -393,6 +393,10 @@ void PropagateUploadFile::start() if( trans->modtime_accepted ) { _item._etag = QByteArray(hbf_transfer_etag( trans.data() )); + if (_item._etag.endsWith("-gzip")) { + // https://github.com/owncloud/mirall/issues/1195 + _item._etag.chop(5); + } } else { updateMTimeAndETag(uri.data(), _item._modtime); } From 33ff6b3934213db5aacb1dee58cc74f8f09b2324 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Mon, 25 Nov 2013 17:38:17 +0100 Subject: [PATCH 37/42] Even if problems occured show the Ok-Icon in the setup dialog. Fixes bug #942. --- src/mirall/accountsettings.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp index b40bb2ba9..e23b64fe8 100644 --- a/src/mirall/accountsettings.cpp +++ b/src/mirall/accountsettings.cpp @@ -248,7 +248,11 @@ void AccountSettings::folderToModelItem( QStandardItem *item, Folder *f ) } // we keep the previous icon for the SyncPrepare state. } else { // kepp the previous icon for the prepare phase. - item->setData( theme->syncStateIcon( status ), FolderStatusDelegate::FolderStatusIconRole ); + 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 From f47ce2fea67fd9e3702634ee588fcef1137d042e Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 25 Nov 2013 17:55:20 +0100 Subject: [PATCH 38/42] Account Settings: Set initial button state correctly Fixes #1185 --- src/mirall/accountsettings.cpp | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp index e23b64fe8..c8944f2a7 100644 --- a/src/mirall/accountsettings.cpp +++ b/src/mirall/accountsettings.cpp @@ -115,7 +115,16 @@ void AccountSettings::slotFolderActivated( const QModelIndex& indx ) { bool state = indx.isValid(); - ui->_buttonRemove->setEnabled( state ); + bool haveFolders = ui->_folderList->model()->rowCount() > 0; + + ui->_buttonRemove->setEnabled(state); + if( Theme::instance()->singleSyncFolder() ) { + // only one folder synced folder allowed. + ui->_buttonAdd->setVisible(!haveFolders); + } else { + ui->_buttonAdd->setVisible(true); + ui->_buttonAdd->setEnabled( state ); + } ui->_buttonEnable->setEnabled( state ); ui->_buttonInfo->setEnabled( state ); @@ -200,23 +209,11 @@ void AccountSettings::slotAddFolder( Folder *folder ) void AccountSettings::slotButtonsSetEnabled() { - bool haveFolders = ui->_folderList->model()->rowCount() > 0; - - ui->_buttonRemove->setEnabled(false); - if( Theme::instance()->singleSyncFolder() ) { - // only one folder synced folder allowed. - ui->_buttonAdd->setVisible(!haveFolders); - } else { - ui->_buttonAdd->setVisible(true); - ui->_buttonAdd->setEnabled(true); - } - QModelIndex selected = ui->_folderList->currentIndex(); bool isSelected = selected.isValid(); - - ui->_buttonEnable->setEnabled(isSelected); - ui->_buttonRemove->setEnabled(isSelected); - ui->_buttonInfo->setEnabled(isSelected); + if (isSelected) { + slotFolderActivated(selected); + } } void AccountSettings::setGeneralErrors( const QStringList& errors ) From ac8296fb942ff30943aed5b4126033b33be85335 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Mon, 25 Nov 2013 19:00:34 +0100 Subject: [PATCH 39/42] Propagator: Check E-Tag when resuming Should fix #756 --- src/mirall/owncloudpropagator.cpp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp index b527948cf..f148fa982 100644 --- a/src/mirall/owncloudpropagator.cpp +++ b/src/mirall/owncloudpropagator.cpp @@ -519,6 +519,7 @@ private: QIODevice *_file; QScopedPointer _decompress; QString errorString; + QByteArray _expectedEtagForResume; static int content_reader(void *userdata, const char *buf, size_t len) { @@ -574,17 +575,28 @@ private: return; } - const char *etag = ne_get_response_header( req, "ETag" ); - if (!etag) { - qDebug() << Q_FUNC_INFO << "No E-Tag reply by server, considering it invalid"; + QByteArray etag = parseEtag(req); + if (etag.isEmpty()) { + qDebug() << Q_FUNC_INFO << "No E-Tag reply by server, considering it invalid" << ne_get_response_header(req, "etag"); that->errorString = QLatin1String("No E-Tag received from server, check Proxy/Gateway"); ne_set_error(that->_propagator->_session, "No E-Tag received from server, check Proxy/Gateway"); ne_add_response_body_reader( req, do_not_accept, do_not_download_content_reader, (void*) that ); return; + } else if (!that->_expectedEtagForResume.isEmpty() && that->_expectedEtagForResume != etag) { + qDebug() << Q_FUNC_INFO << "We received a different E-Tag for resuming!" + << QString::fromLatin1(that->_expectedEtagForResume.data()) << "vs" + << QString::fromLatin1(etag.data()); + that->errorString = QLatin1String("We received a different E-Tag for resuming. Retrying next time."); + ne_set_error(that->_propagator->_session, "We received a different E-Tag for resuming. Retrying next time."); + ne_add_response_body_reader( req, do_not_accept, + do_not_download_content_reader, + (void*) that ); + return; } + const char *enc = ne_get_response_header( req, "Content-Encoding" ); qDebug("Content encoding ist <%s> with status %d", enc ? enc : "empty", status ? status->code : -1 ); @@ -624,6 +636,7 @@ void PropagateDownloadFile::start() _propagator->_journal->setDownloadInfo(_item._file, SyncJournalDb::DownloadInfo()); } else { tmpFileName = progressInfo._tmpfile; + _expectedEtagForResume = progressInfo._etag; } } From fa0f773fcb001ee24067af128bd6cab795db3b9f Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 25 Nov 2013 19:12:13 +0100 Subject: [PATCH 40/42] Separate the case of file changing durng upload in the chunk or non chunk case. If the file is changed between chunk, it is easy and we can just retry as the file has not been changed on the server. But if the file is changed after it has been updated on the server, we must still update the database with the etag. (and possibly delete the partial file) Relates to issue #1002 --- src/mirall/owncloudpropagator.cpp | 52 ++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 14 deletions(-) diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp index f148fa982..f5da22b02 100644 --- a/src/mirall/owncloudpropagator.cpp +++ b/src/mirall/owncloudpropagator.cpp @@ -352,22 +352,11 @@ void PropagateUploadFile::start() /* If the source file changed during submission, lets try again */ if( state == HBF_SOURCE_FILE_CHANGE ) { - if( attempts++ < 20 ) { /* FIXME: How often do we want to try? */ - qDebug("SOURCE file has changed during upload, retry #%d in two seconds!", attempts); - sleep(2); + if( attempts++ < 5 ) { /* FIXME: How often do we want to try? */ + qDebug("SOURCE file has changed during upload, retry #%d in %d seconds!", attempts, 2*attempts); + sleep(2*attempts); continue; } - // Still the file change error, but we tried a couple of times. - // Ignore this file for now. - // Lets remove the file from the server (at least if it is new) as it is different - // from our file here. - if( _item._instruction == CSYNC_INSTRUCTION_NEW ) { - QScopedPointer uri( - ne_path_escape((_propagator->_remoteDir + _item._file).toUtf8())); - - int rc = ne_delete(_propagator->_session, uri.data()); - qDebug() << "Remove the invalid file from server:" << rc; - } const QString errMsg = tr("Local file changed during sync, syncing once it arrived completely"); done( SyncFileItem::SoftError, errMsg ); @@ -405,6 +394,41 @@ void PropagateUploadFile::start() // Remove from the progress database: _propagator->_journal->setUploadInfo(_item._file, SyncJournalDb::UploadInfo()); _propagator->_journal->commit("upload file start"); + + if (hbf_validate_source_file(trans.data()) == HBF_SOURCE_FILE_CHANGE) { + /* Did the source file changed since the upload ? + This is different from the previous check because the previous check happens between + chunks while this one happens when the whole file has been uploaded. + + The new etag is already stored in the database in the previous lines so in case of + crash, we won't have a conflict but we will properly do a new upload + */ + + if( attempts++ < 5 ) { /* FIXME: How often do we want to try? */ + qDebug("SOURCE file has changed after upload, retry #%d in %d seconds!", attempts, 2*attempts); + sleep(2*attempts); + continue; + } + + // Still the file change error, but we tried a couple of times. + // Ignore this file for now. + // Lets remove the file from the server (at least if it is new) as it is different + // from our file here. + if( _item._instruction == CSYNC_INSTRUCTION_NEW ) { + QScopedPointer uri( + ne_path_escape((_propagator->_remoteDir + _item._file).toUtf8())); + + int rc = ne_delete(_propagator->_session, uri.data()); + qDebug() << "Remove the invalid file from server:" << rc; + } + + const QString errMsg = tr("Local file changed during sync, syncing once it arrived completely"); + done( SyncFileItem::SoftError, errMsg ); + return; + } + + + emit progress(Progress::EndUpload, _item, 0, _item._size); done(SyncFileItem::Success); return; From 911e0bdd6ebfda4a543b4df96cd7f6a00fcdb8e4 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Mon, 25 Nov 2013 19:18:50 +0100 Subject: [PATCH 41/42] Propagator: Check write errors when downloading --- src/mirall/owncloudpropagator.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp index f5da22b02..24e6d0afc 100644 --- a/src/mirall/owncloudpropagator.cpp +++ b/src/mirall/owncloudpropagator.cpp @@ -540,7 +540,7 @@ public: void start(); private: - QIODevice *_file; + QFile *_file; QScopedPointer _decompress; QString errorString; QByteArray _expectedEtagForResume; @@ -557,8 +557,9 @@ private: if(buf) { written = that->_file->write(buf, len); - if( len != written ) { + if( len != written || that->_file->error() != QFile::NoError) { qDebug() << "WRN: content_reader wrote wrong num of bytes:" << len << "," << written; + return NE_ERROR; } return NE_OK; } From fa715ce135cc0e93c741c44343f4b0576d4375a1 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Mon, 25 Nov 2013 19:22:43 +0100 Subject: [PATCH 42/42] Propagator: Open download file as Unbuffered --- src/mirall/owncloudpropagator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp index 24e6d0afc..2c6022ab3 100644 --- a/src/mirall/owncloudpropagator.cpp +++ b/src/mirall/owncloudpropagator.cpp @@ -677,7 +677,7 @@ void PropagateDownloadFile::start() QFile tmpFile(_propagator->_localDir + tmpFileName); _file = &tmpFile; - if (!tmpFile.open(QIODevice::Append)) { + if (!tmpFile.open(QIODevice::Append | QIODevice::Unbuffered)) { done(SyncFileItem::NormalError, tmpFile.errorString()); return; }