diff options
| author | Klaas Freitag <freitag@owncloud.com> | 2012-05-21 18:48:49 +0400 |
|---|---|---|
| committer | Klaas Freitag <freitag@owncloud.com> | 2012-05-21 18:48:49 +0400 |
| commit | 6f7165f9f0f4dad12d7740afc2a7cb612a2763f6 (patch) | |
| tree | 4109651f4c085c6a332ad46e6d01c6086a948ef2 | |
| parent | 428ef9aba317d28aeeb8b58ebf003f610383fc8c (diff) | |
A lot of krazy2 (codechecker) fixes.
29 files changed, 374 insertions, 306 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ca75d7d4..08a4fb8c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,6 +76,6 @@ add_subdirectory(src) if(BUILD_OWNCLOUD_OSX_BUNDLE) install( FILES exclude.lst DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources ) else() - install( FILES exclude.lst DESTINATION /etc ) + install( FILES exclude.lst DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} ) endif() diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp index 5d5178584..4c2bcd804 100644 --- a/src/mirall/application.cpp +++ b/src/mirall/application.cpp @@ -12,14 +12,6 @@ * for more details. */ -#include <QtCore> -#include <QtGui> -#include <QHash> -#include <QHashIterator> -#include <QUrl> -#include <QDesktopServices> -#include <QTranslator> - #include "mirall/application.h" #include "mirall/folder.h" #include "mirall/folderwatcher.h" @@ -42,6 +34,14 @@ #endif #include "mirall/inotify.h" +#include <QtCore> +#include <QtGui> +#include <QHash> +#include <QHashIterator> +#include <QUrl> +#include <QDesktopServices> +#include <QTranslator> + namespace Mirall { Application::Application(int &argc, char **argv) : @@ -132,7 +132,7 @@ Application::Application(int &argc, char **argv) : #if QT_VERSION >= 0x040700 qDebug() << "* Network is" << (_networkMgr->isOnline() ? "online" : "offline"); - foreach (QNetworkConfiguration netCfg, _networkMgr->allConfigurations(QNetworkConfiguration::Active)) { + foreach (const QNetworkConfiguration& netCfg, _networkMgr->allConfigurations(QNetworkConfiguration::Active)) { //qDebug() << "Network:" << netCfg.identifier(); } #endif @@ -323,7 +323,7 @@ void Application::slotFolderOpenAction( const QString& alias ) // work around a bug in QDesktopServices on Win32, see i-net QString filePath = f->path(); - if (filePath.startsWith("\\\\") || filePath.startsWith("//")) + if (filePath.startsWith(QLatin1String("\\\\") || filePath.startsWith("//")) url.setUrl(QDir::toNativeSeparators(filePath)); else url = QUrl::fromLocalFile(filePath); @@ -469,34 +469,6 @@ void Application::slotRemoveFolder( const QString& alias ) setupContextMenu(); } -#ifdef HAVE_FETCH_AND_PUSH -void Application::slotFetchFolder( const QString& alias ) -{ - qDebug() << "start to fetch folder with alias " << alias; - - if( ! _folderMap.contains( alias ) ) { - qDebug() << "!! Can not fetch alias " << alias << ", can not be found in folderMap."; - return; - } - - Folder *f = _folderMap[alias]; - -} - -void Application::slotPushFolder( const QString& alias ) -{ - qDebug() << "start to push folder with alias " << alias; - - if( ! _folderMap.contains( alias ) ) { - qDebug() << "!! Can not push alias " << alias << ", can not be found in folderMap."; - return; - } - - Folder *f = _folderMap[alias]; - -} -#endif - void Application::slotInfoFolder( const QString& alias ) { qDebug() << "details of folder with alias " << alias; @@ -538,7 +510,7 @@ void Application::slotInfoFolder( const QString& alias ) QMessageBox infoBox( QMessageBox::Information, tr( "Folder information" ), alias, QMessageBox::Ok ); QStringList li = folderResult.errorStrings(); - foreach( const QString l, li ) { + foreach( const QString& l, li ) { folderMessage += QString("<p>%1</p>").arg( l ); } @@ -562,8 +534,8 @@ void Application::slotInfoFolder( const QString& alias ) QStringList files = change_it.value(); QString fileList; - foreach( QString file, files) { - fileList += file + "\n"; + foreach( const QString& file, files) { + fileList += file + QChar('\n'); } details += changeType + fileList; } @@ -619,7 +591,7 @@ void Application::slotSyncStateChange( const QString& alias ) void Application::computeOverallSyncStatus() { - // display the info of the least succesful sync (eg. not just display the result of the latest sync + // display the info of the least successful sync (eg. not just display the result of the latest sync SyncResult overallResult = SyncResult::Success; QString trayMessage; Folder::Map map = _folderMan->map(); diff --git a/src/mirall/application.h b/src/mirall/application.h index 64d121145..9dba5d66a 100644 --- a/src/mirall/application.h +++ b/src/mirall/application.h @@ -52,10 +52,6 @@ protected slots: void slotAddFolder(); void slotOpenStatus(); void slotRemoveFolder( const QString& ); -#ifdef HAVE_FETCH_AND_PUSH - void slotFetchFolder( const QString& ); - void slotPushFolder( const QString& ); -#endif void slotEnableFolder( const QString&, const bool ); void slotInfoFolder( const QString& ); void slotConfigure(); diff --git a/src/mirall/csyncfolder.cpp b/src/mirall/csyncfolder.cpp index 8380d9059..5e7fb0da5 100644 --- a/src/mirall/csyncfolder.cpp +++ b/src/mirall/csyncfolder.cpp @@ -12,6 +12,12 @@ * for more details. */ +#include "mirall/csyncfolder.h" +#include "mirall/csyncthread.h" +#include "mirall/mirallconfigfile.h" + +#include <csync.h> + #include <QDebug> #include <QDir> #include <QMutexLocker> @@ -19,11 +25,6 @@ #include <QStringList> #include <QTextStream> -#include "csync.h" -#include "mirall/csyncthread.h" -#include "mirall/csyncfolder.h" -#include "mirall/mirallconfigfile.h" - namespace Mirall { CSyncFolder::CSyncFolder(const QString &alias, diff --git a/src/mirall/csyncfolder.h b/src/mirall/csyncfolder.h index e601191e3..89ff9bf61 100644 --- a/src/mirall/csyncfolder.h +++ b/src/mirall/csyncfolder.h @@ -16,13 +16,14 @@ * for more details. */ -#include <QMutex> -#include <QThread> -#include <QString> #include "mirall/csyncthread.h" #include "mirall/folder.h" +#include <QMutex> +#include <QThread> +#include <QString> + namespace Mirall { diff --git a/src/mirall/csyncthread.cpp b/src/mirall/csyncthread.cpp index 4e2f61392..2366694b8 100644 --- a/src/mirall/csyncthread.cpp +++ b/src/mirall/csyncthread.cpp @@ -13,6 +13,9 @@ * for more details. */ +#include "mirall/csyncthread.h" +#include "mirall/mirallconfigfile.h" + #include <QDebug> #include <QDir> #include <QMutexLocker> @@ -20,10 +23,6 @@ #include <QStringList> #include <QTextStream> #include <QTime> -#include <QDebug> - -#include "mirall/csyncthread.h" -#include "mirall/mirallconfigfile.h" namespace Mirall { @@ -185,7 +184,7 @@ void CSyncThread::run() break; case CSYNC_ERR_TIMESKEW: errStr = tr("The system time between the local machine and the server differs " - "too much. Please use a time syncronization service (ntp) on both machines."); + "too much. Please use a time synchronization service (ntp) on both machines."); break; case CSYNC_ERR_FILESYSTEM: errStr = tr("CSync could not detect the filesystem type."); diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp index 5d2abdcc6..92fbb07ae 100644 --- a/src/mirall/folder.cpp +++ b/src/mirall/folder.cpp @@ -11,16 +11,15 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. */ - -#include <QDebug> -#include <QTimer> -#include <QUrl> - #include "mirall/folder.h" #include "mirall/folderwatcher.h" #include "mirall/mirallconfigfile.h" #include "mirall/syncresult.h" +#include <QDebug> +#include <QTimer> +#include <QUrl> + #define DEFAULT_POLL_INTERVAL_SEC 15000 namespace Mirall { diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp index 124549d88..9f440c890 100644 --- a/src/mirall/folderman.cpp +++ b/src/mirall/folderman.cpp @@ -11,18 +11,17 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. */ - -#include <QDesktopServices> -#include <QtCore> - +#include "mirall/folderman.h" #include "mirall/mirallconfigfile.h" #include "mirall/unisonfolder.h" #include "mirall/csyncfolder.h" #include "mirall/owncloudfolder.h" #include "mirall/syncresult.h" -#include "mirall/folderman.h" #include "mirall/inotify.h" +#include <QDesktopServices> +#include <QtCore> + namespace Mirall { FolderMan::FolderMan(QObject *parent) : @@ -90,7 +89,7 @@ int FolderMan::setupKnownFolders() dir.setFilter(QDir::Files); QStringList list = dir.entryList(); - foreach ( QString alias, list ) { + foreach ( const QString& alias, list ) { Folder *f = setupFolderFromConfigFile( alias ); } // return the number of valid folders. @@ -103,7 +102,7 @@ Folder* FolderMan::setupFolderFromConfigFile(const QString &file) { Folder *folder = 0L; qDebug() << " ` -> setting up:" << file; - QSettings settings( _folderConfigPath + "/" + file, QSettings::IniFormat); + QSettings settings( _folderConfigPath + QChar('/') + file, QSettings::IniFormat); qDebug() << " -> file path: " + settings.fileName(); settings.beginGroup( file ); // read the group with the same name as the file which is the folder alias @@ -310,7 +309,7 @@ void FolderMan::addFolderDefinition( const QString& backend, const QString& alia bool onlyThisLAN ) { // Create a settings file named after the alias - QSettings settings( _folderConfigPath + "/" + alias, QSettings::IniFormat); + QSettings settings( _folderConfigPath + QChar('/') + alias, QSettings::IniFormat); settings.setValue(QString("%1/localPath").arg(alias), sourceFolder ); settings.setValue(QString("%1/targetPath").arg(alias), targetPath ); @@ -343,7 +342,7 @@ void FolderMan::removeFolder( const QString& alias ) qDebug() << "!! Can not remove " << alias << ", not in folderMap."; } - QFile file( _folderConfigPath + "/" + alias ); + QFile file( _folderConfigPath + QChar('/') + alias ); if( file.exists() ) { qDebug() << "Remove folder config file " << file.fileName(); file.remove(); diff --git a/src/mirall/folderwatcher.cpp b/src/mirall/folderwatcher.cpp index e2358245b..837ca0c88 100644 --- a/src/mirall/folderwatcher.cpp +++ b/src/mirall/folderwatcher.cpp @@ -13,6 +13,11 @@ */ // event masks +#include "mirall/folderwatcher.h" +#include "mirall/folder.h" +#include "mirall/inotify.h" +#include "mirall/fileutils.h" + #include <stdint.h> #include <QFileInfo> @@ -23,11 +28,6 @@ #include <QStringList> #include <QTimer> -#include "mirall/folder.h" -#include "mirall/inotify.h" -#include "mirall/folderwatcher.h" -#include "mirall/fileutils.h" - #ifdef USE_INOTIFY #include <sys/inotify.h> #endif @@ -60,7 +60,7 @@ FolderWatcher::FolderWatcher(const QString &root, QObject *parent) _inotify = new INotify(standard_event_mask); slotAddFolderRecursive(root); QObject::connect(_inotify, SIGNAL(notifyEvent(int, int, const QString &)), - SLOT(slotINotifyEvent(int, int, const QString &))); + this, SLOT(slotINotifyEvent(int, int, const QString &))); #endif // do a first synchronization to get changes while // the application was not running @@ -165,7 +165,7 @@ void FolderWatcher::slotAddFolderRecursive(const QString &path) if (folder.exists() && !watchedFolders.contains(folder.path())) { subdirs++; // check that it does not match the ignore list - foreach (QString pattern, _ignores) { + foreach ( const QString& pattern, _ignores) { QRegExp regexp(pattern); regexp.setPatternSyntax(QRegExp::Wildcard); if ( regexp.exactMatch(folder.path()) ) { @@ -237,7 +237,7 @@ void FolderWatcher::slotINotifyEvent(int mask, int cookie, const QString &path) //qDebug() << cookie << " OTHER " << mask << " :" << path; } - foreach (QString pattern, _ignores) { + foreach (const QString& pattern, _ignores) { QRegExp regexp(pattern); regexp.setPatternSyntax(QRegExp::Wildcard); diff --git a/src/mirall/folderwatcher.h b/src/mirall/folderwatcher.h index ee37e0cb8..4d59afc85 100644 --- a/src/mirall/folderwatcher.h +++ b/src/mirall/folderwatcher.h @@ -15,6 +15,8 @@ #ifndef MIRALL_FOLDERWATCHER_H #define MIRALL_FOLDERWATCHER_H +#include "mirall/folder.h" + #include <QList> #include <QObject> #include <QString> @@ -22,15 +24,14 @@ #include <QTime> #include <QHash> -#include "mirall/folder.h" - class QTimer; + +namespace Mirall { + #ifdef USE_INOTIFY class INotify; #endif -namespace Mirall { - /** * Watches a folder and sub folders for changes * diff --git a/src/mirall/folderwizard.cpp b/src/mirall/folderwizard.cpp index 21b81add4..783f74350 100644 --- a/src/mirall/folderwizard.cpp +++ b/src/mirall/folderwizard.cpp @@ -12,6 +12,11 @@ * for more details. */ +#include "mirall/folderwizard.h" +#include "mirall/owncloudinfo.h" +#include "mirall/mirallconfigfile.h" +#include "mirall/theme.h" + #include <QDebug> #include <QDesktopServices> #include <QFileDialog> @@ -23,12 +28,6 @@ #include <stdlib.h> -#include "mirall/folderwizard.h" -#include "mirall/owncloudinfo.h" -#include "mirall/mirallconfigfile.h" -#include "mirall/owncloudinfo.h" -#include "mirall/theme.h" - namespace Mirall { @@ -433,7 +432,7 @@ void FolderWizardOwncloudPage::initializePage() { _ui.lineEditOCAlias->setText( "ownCloud" ); _ui.lineEditOCUrl->setText( "http://localhost/owncloud" ); - QString user( getenv("USER")); + QString user( qgetenv("USER")); _ui.lineEditOCUser->setText( user ); } diff --git a/src/mirall/gitfolder.cpp b/src/mirall/gitfolder.cpp index c0e95fdcb..e1e3129f5 100644 --- a/src/mirall/gitfolder.cpp +++ b/src/mirall/gitfolder.cpp @@ -12,9 +12,10 @@ * for more details. */ +#include "mirall/gitfolder.h" + #include <QMutexLocker> #include <QProcess> -#include "mirall/gitfolder.h" namespace Mirall { diff --git a/src/mirall/inotify.cpp b/src/mirall/inotify.cpp index 63764e736..140afaad0 100644 --- a/src/mirall/inotify.cpp +++ b/src/mirall/inotify.cpp @@ -14,17 +14,18 @@ * for more details. */ -#include <mirall/folder.h> - #ifdef USE_INOTIFY #include <sys/inotify.h> #endif +#include "inotify.h" +#include "mirall/folder.h" + #include <cerrno> #include <unistd.h> #include <QDebug> #include <QStringList> -#include "inotify.h" + // Buffer Size for read() buffer #define DEFAULT_READ_BUFFERSIZE 2048 @@ -48,9 +49,9 @@ INotify::~INotify() s_thread->unregisterForNotification(this); // Remove all inotify watchs. - QString key; - foreach (key, _wds.keys()) - inotify_rm_watch(s_fd, _wds.value(key)); + foreach( int fd, _wds ) { + inotify_rm_watch(s_fd, fd); + } } void INotify::addPath(const QString &path) @@ -99,8 +100,8 @@ INotify::fireEvent(int mask, int cookie, int wd, char* name) { //qDebug() << "****" << name; QStringList paths(_wds.keys(wd)); - foreach (QString path, paths) - emit notifyEvent(mask, cookie, path + "/" + QString::fromUtf8(name)); + foreach (const QString& path, paths) + emit notifyEvent(mask, cookie, path + QChar('/') + QString::fromUtf8(name)); } void diff --git a/src/mirall/mirallconfigfile.cpp b/src/mirall/mirallconfigfile.cpp index b31307ce7..0171ef138 100644 --- a/src/mirall/mirallconfigfile.cpp +++ b/src/mirall/mirallconfigfile.cpp @@ -11,6 +11,11 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. */ + +#include "mirall/mirallconfigfile.h" +#include "mirall/owncloudtheme.h" +#include "mirall/miralltheme.h" + #include <QtCore> #include <QtGui> @@ -22,18 +27,14 @@ #include <winbase.h> #endif -#include "mirall/mirallconfigfile.h" -#include "mirall/owncloudtheme.h" -#include "mirall/miralltheme.h" - #ifdef Q_OS_MAC #include <mach-o/dyld.h> #endif namespace Mirall { -QString MirallConfigFile::_passwd = QString(); -QString MirallConfigFile::_oCVersion = QString(); +QString MirallConfigFile::_passwd; // = QString(); +QString MirallConfigFile::_oCVersion; // = QString(); bool MirallConfigFile::_askedUser = false; MirallConfigFile::MirallConfigFile() @@ -139,14 +140,14 @@ void MirallConfigFile::writeOwncloudConfig( const QString& connection, QSettings settings( file, QSettings::IniFormat); QString cloudsUrl( url ); - if( !cloudsUrl.startsWith("http") ) - cloudsUrl.prepend( "http://" ); + if( !cloudsUrl.startsWith( QLatin1String("http")) ) + cloudsUrl.prepend(QLatin1String("http://")); settings.beginGroup( connection ); settings.setValue("url", cloudsUrl ); settings.setValue("user", user ); if( skipPwd ) { - pwd = QString(); + pwd.clear(); } QByteArray pwdba = pwd.toUtf8(); @@ -294,7 +295,7 @@ bool MirallConfigFile::ownCloudSkipUpdateCheck( const QString& connection ) cons QByteArray MirallConfigFile::basicAuthHeader() const { - QString concatenated = ownCloudUser() + ":" + ownCloudPasswd(); + QString concatenated = ownCloudUser() + QChar(':') + ownCloudPasswd(); const QString b("Basic "); QByteArray data = b.toLocal8Bit() + concatenated.toLocal8Bit().toBase64(); diff --git a/src/mirall/mirallconfigfile.h b/src/mirall/mirallconfigfile.h index c23e9f571..5a4dd7a43 100644 --- a/src/mirall/mirallconfigfile.h +++ b/src/mirall/mirallconfigfile.h @@ -15,6 +15,9 @@ #ifndef MIRALLCONFIGFILE_H #define MIRALLCONFIGFILE_H +#include <QString> + + namespace Mirall { diff --git a/src/mirall/miralltheme.cpp b/src/mirall/miralltheme.cpp index 5740342e4..65e8e8985 100644 --- a/src/mirall/miralltheme.cpp +++ b/src/mirall/miralltheme.cpp @@ -12,13 +12,13 @@ * for more details. */ +#include "miralltheme.h" + #include <QString> #include <QDebug> #include <QPixmap> #include <QIcon> -#include "miralltheme.h" - namespace Mirall { mirallTheme::mirallTheme() diff --git a/src/mirall/networklocation.cpp b/src/mirall/networklocation.cpp index 6cb330e63..b98565bd0 100644 --- a/src/mirall/networklocation.cpp +++ b/src/mirall/networklocation.cpp @@ -49,7 +49,7 @@ NetworkLocation NetworkLocation::currentLocation() QByteArray gwIp; while (ip.canReadLine()) { QByteArray line = ip.readLine(); - if (line.startsWith("default")) { + if ( line.startsWith("default") ) { // krazy:exclude=strings QList<QByteArray> parts = line.split(' '); gwIp = parts[2]; break; diff --git a/src/mirall/owncloudfolder.cpp b/src/mirall/owncloudfolder.cpp index c9c6711b3..ab378fe40 100644 --- a/src/mirall/owncloudfolder.cpp +++ b/src/mirall/owncloudfolder.cpp @@ -13,6 +13,11 @@ * for more details. */ +#include "mirall/owncloudfolder.h" +#include "mirall/mirallconfigfile.h" + +#include <csync.h> + #include <QDebug> #include <QDir> #include <QUrl> @@ -22,11 +27,6 @@ #include <QTextStream> #include <QTimer> -#include "csync.h" - -#include "mirall/owncloudfolder.h" -#include "mirall/mirallconfigfile.h" - namespace Mirall { #define POLL_TIMER_EXCEED 10 diff --git a/src/mirall/owncloudinfo.cpp b/src/mirall/owncloudinfo.cpp index 215f5fdcd..940e04723 100644 --- a/src/mirall/owncloudinfo.cpp +++ b/src/mirall/owncloudinfo.cpp @@ -12,18 +12,15 @@ * for more details. */ - -#include <QtCore> -#include <QtGui> -#include <QAuthenticator> - - #include "mirall/owncloudinfo.h" #include "mirall/mirallconfigfile.h" -#include "mirall/sslerrordialog.h" #include "mirall/version.h" #include "mirall/sslerrordialog.h" +#include <QtCore> +#include <QtGui> +#include <QAuthenticator> + #if QT46_IMPL #include <QHttp> #endif @@ -258,11 +255,11 @@ void ownCloudInfo::slotReplyFinished() const QString version( reply->readAll() ); const QString url = reply->url().toString(); QString plainUrl(url); - plainUrl.remove("/status.php"); + plainUrl.remove( QLatin1String("/status.php")); QString info( version ); - if( url.endsWith("status.php") ) { + if( url.endsWith( QLatin1String("status.php")) ) { // it was a call to status.php if( reply->error() == QNetworkReply::NoError && info.isEmpty() ) { // This seems to be a bit strange behaviour of QNetworkAccessManager. @@ -279,12 +276,11 @@ void ownCloudInfo::slotReplyFinished() info.remove(-1,1); // remove the last char which is a "}" QStringList li = info.split( QChar(',') ); - QString infoString; QString versionStr; QString version; QString edition; - foreach ( infoString, li ) { + foreach ( const QString& infoString, li ) { QStringList touple = infoString.split( QChar(':')); QString key = touple[0]; key.remove(QChar('"')); diff --git a/src/mirall/owncloudsetupwizard.cpp b/src/mirall/owncloudsetupwizard.cpp index 71ae751ca..58e09e0f2 100644 --- a/src/mirall/owncloudsetupwizard.cpp +++ b/src/mirall/owncloudsetupwizard.cpp @@ -12,16 +12,16 @@ * for more details. */ -#include <QtCore> -#include <QProcess> -#include <QMessageBox> -#include <QDesktopServices> - #include "mirall/owncloudsetupwizard.h" #include "mirall/mirallconfigfile.h" #include "mirall/owncloudinfo.h" #include "mirall/folderman.h" +#include <QtCore> +#include <QProcess> +#include <QMessageBox> +#include <QDesktopServices> + namespace Mirall { class Theme; @@ -364,7 +364,7 @@ void OwncloudSetupWizard::slotCreateRemoteFolderFinished( QNetworkReply::Network qDebug() << "** webdav mkdir request finished " << error; if( error == QNetworkReply::NoError ) { - _ocWizard->appendToResultWidget( tr("Remote folder %1 created sucessfully.").arg(_remoteFolder)); + _ocWizard->appendToResultWidget( tr("Remote folder %1 created successfully.").arg(_remoteFolder)); // Now write the resulting folder definition if( _folderMan ) { diff --git a/src/mirall/owncloudtheme.cpp b/src/mirall/owncloudtheme.cpp index 7ebd8ce98..1b3f807d9 100644 --- a/src/mirall/owncloudtheme.cpp +++ b/src/mirall/owncloudtheme.cpp @@ -12,13 +12,13 @@ * for more details. */ +#include "owncloudtheme.h" + #include <QString> #include <QDebug> #include <QPixmap> #include <QIcon> -#include "owncloudtheme.h" - namespace Mirall { ownCloudTheme::ownCloudTheme() diff --git a/src/mirall/owncloudwizard.cpp b/src/mirall/owncloudwizard.cpp index 9399b109f..f8d3e811b 100644 --- a/src/mirall/owncloudwizard.cpp +++ b/src/mirall/owncloudwizard.cpp @@ -12,6 +12,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. */ +#include "mirall/owncloudwizard.h" #include <QDebug> #include <QDesktopServices> @@ -25,8 +26,6 @@ #include <stdlib.h> -#include "mirall/owncloudwizard.h" - namespace Mirall { @@ -125,7 +124,7 @@ bool OwncloudCredentialsPage::isComplete() const void OwncloudCredentialsPage::initializePage() { - QString user = getenv( "USER" ); + QString user = qgetenv( "USER" ); _ui.OCUserEdit->setText( user ); } @@ -311,10 +310,10 @@ void OwncloudWizard::slotCurrentPageChanged( int id ) // preset the ftp url field CreateAnOwncloudPage *p = static_cast<CreateAnOwncloudPage*> (page( Page_Create_OC )); QString domain = p->domain(); - if( domain.startsWith( "http://" )) { + if( domain.startsWith( QLatin1String("http://") )) { domain = domain.right( domain.length()-7 ); } - if( domain.startsWith( "https://" )) { + if( domain.startsWith( QLatin1String("https://") )) { domain = domain.right( domain.length()-8 ); } diff --git a/src/mirall/sslerrordialog.cpp b/src/mirall/sslerrordialog.cpp index 31f1164a5..70c339f16 100644 --- a/src/mirall/sslerrordialog.cpp +++ b/src/mirall/sslerrordialog.cpp @@ -11,14 +11,12 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. */ +#include "sslerrordialog.h" +#include "mirall/mirallconfigfile.h" #include <QtGui> #include <QtNetwork> -#include "sslerrordialog.h" - -#include "mirall/mirallconfigfile.h" - namespace Mirall { @@ -92,7 +90,7 @@ bool SslErrorDialog::setErrorList( QList<QSslError> errors ) // loop over the unknown certs and line up their errors. msg += QL("<h3>") + tr("Warnings about current SSL Connection:") + QL("</h3>"); msg += QL("<div id=\"ca_errors\">"); - foreach( QSslCertificate cert, _unknownCerts ) { + foreach( const QSslCertificate& cert, _unknownCerts ) { msg += QL("<div id=\"ca_error\">"); // add the errors for this cert foreach( QSslError err, errors ) { @@ -182,7 +180,7 @@ void SslErrorDialog::accept() sslCfg.setCaCertificates(ca_list); QSslConfiguration::setDefaultConfiguration(sslCfg); - foreach( QSslCertificate cert, _unknownCerts ) { + foreach( const QSslCertificate& cert, _unknownCerts ) { certs += cert.toPem() + '\n'; } diff --git a/src/mirall/statusdialog.cpp b/src/mirall/statusdialog.cpp index 6f9f3b980..01bb5702f 100644 --- a/src/mirall/statusdialog.cpp +++ b/src/mirall/statusdialog.cpp @@ -12,14 +12,14 @@ * for more details. */ - #include <QtCore> - #include <QtGui> - #include "mirall/statusdialog.h" #include "mirall/folder.h" #include "mirall/theme.h" #include "mirall/owncloudinfo.h" +#include <QtCore> +#include <QtGui> + namespace Mirall { FolderStatusModel::FolderStatusModel() @@ -183,13 +183,11 @@ StatusDialog::StatusDialog( Theme *theme, QWidget *parent) : connect(_ButtonClose, SIGNAL(clicked()), this, SLOT(accept())); connect(_ButtonRemove, SIGNAL(clicked()), this, SLOT(slotRemoveFolder())); -#ifdef HAVE_FETCH_AND_PUSH - connect(_ButtonFetch, SIGNAL(clicked()), this, SLOT(slotFetchFolder())); - connect(_ButtonPush, SIGNAL(clicked()), this, SLOT(slotPushFolder())); -#else + + // hide these two for now... _ButtonFetch->setVisible( false ); _ButtonPush->setVisible( false ); -#endif + connect(_ButtonEnable, SIGNAL(clicked()), this, SLOT(slotEnableFolder())); connect(_ButtonInfo, SIGNAL(clicked()), this, SLOT(slotInfoFolder())); connect(_ButtonAdd, SIGNAL(clicked()), this, SLOT(slotAddSync())); @@ -421,7 +419,7 @@ void StatusDialog::slotOCInfo( const QString& url, const QString& versionStr, co // work around a bug in QDesktopServices on Win32, see i-net QString filePath = url; - if (filePath.startsWith("\\\\") || filePath.startsWith("//")) + if (filePath.startsWith(QLatin1String("\\\\") || filePath.startsWith(QLatin1String("//")) _OCUrl.setUrl(QDir::toNativeSeparators(filePath)); else _OCUrl = QUrl::fromLocalFile(filePath); diff --git a/src/mirall/temporarydir.cpp b/src/mirall/temporarydir.cpp index 6f3ab03b3..07caef19d 100644 --- a/src/mirall/temporarydir.cpp +++ b/src/mirall/temporarydir.cpp @@ -12,6 +12,9 @@ * for more details. */ +#include "mirall/temporarydir.h" +#include "mirall/fileutils.h" + #include <cstdlib> #include <cerrno> #include <cstring> @@ -20,9 +23,6 @@ #include <QDir> #include <QDateTime> -#include "mirall/temporarydir.h" -#include "mirall/fileutils.h" - namespace Mirall { diff --git a/src/mirall/unisonfolder.cpp b/src/mirall/unisonfolder.cpp index 2c6373b95..3e4eb56d3 100644 --- a/src/mirall/unisonfolder.cpp +++ b/src/mirall/unisonfolder.cpp @@ -12,14 +12,14 @@ * for more details. */ +#include "mirall/unisonfolder.h" + #include <QDebug> #include <QDir> #include <QMutexLocker> #include <QStringList> #include <QTextStream> -#include "mirall/unisonfolder.h" - namespace Mirall { UnisonFolder::UnisonFolder(const QString &alias, @@ -77,7 +77,7 @@ void UnisonFolder::startSync(const QStringList &pathList) if (_syncCount > 0 ) { // may be we should use a QDir in the API itself? QDir root(path()); - foreach(QString changedPath, pathList) { + foreach( const QString& changedPath, pathList) { args << "-path" << root.relativeFilePath(changedPath); } } diff --git a/src/mirall/updatedetector.cpp b/src/mirall/updatedetector.cpp index 4e3d37c2b..ed72fd784 100644 --- a/src/mirall/updatedetector.cpp +++ b/src/mirall/updatedetector.cpp @@ -11,16 +11,16 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. */ -#include <QtCore> -#include <QtNetwork> -#include <QtGui> - -#include "updatedetector.h" +#include "mirall/updatedetector.h" #include "mirall/theme.h" #include "mirall/version.h" #include "mirall/occinfo.h" +#include <QtCore> +#include <QtNetwork> +#include <QtGui> + namespace Mirall { diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts index 47130df43..eada14038 100644 --- a/translations/mirall_de.ts +++ b/translations/mirall_de.ts @@ -264,32 +264,31 @@ p, li { white-space: pre-wrap; } <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="252"/> + <location filename="../src/mirall/application.cpp" line="257"/> <source>Add folder...</source> <translation>Hinzufügen...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="254"/> + <location filename="../src/mirall/application.cpp" line="259"/> <source>Configure...</source> <translation>Einstellen...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="258"/> + <location filename="../src/mirall/application.cpp" line="263"/> <source>Quit</source> <translation>Beenden</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="290"/> <source>open %1</source> - <translation>%1 öffnen</translation> + <translation type="obsolete">%1 öffnen</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="410"/> + <location filename="../src/mirall/application.cpp" line="455"/> <source>Confirm Folder Remove</source> <translation>Bestätigung Verzeichnis Löschen</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="410"/> + <location filename="../src/mirall/application.cpp" line="455"/> <source>Do you really want to remove upload folder <i>%1</i>?</source> <translation>Möchten Sie wirklich das Sync-Verzeichnis <i>%1</i> löschen?</translation> </message> @@ -326,18 +325,18 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">Unbekannter Status</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="241"/> + <location filename="../src/mirall/application.cpp" line="244"/> <source>ownCloud Sync Started</source> <translation>ownCloud Sync ist gestartet</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="241"/> + <location filename="../src/mirall/application.cpp" line="244"/> <source>Sync started for %1 configured sync folder(s).</source> <translation>Synchronisation gestart für %1 Verzeichniss(e).</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="221"/> - <location filename="../src/mirall/application.cpp" line="228"/> + <location filename="../src/mirall/application.cpp" line="224"/> + <location filename="../src/mirall/application.cpp" line="231"/> <source>No ownCloud Connection</source> <translation>Keine Verbindung zu ownCloud</translation> </message> @@ -360,101 +359,121 @@ p, li { white-space: pre-wrap; } <translation><p>Es wurde bisher keine Verbindung zur ownCloud konfiguriert.</p><p>Bitte richten Sie eine ein durch Klicken auf das ownCloud-Symbol in der Systemleiste.</p> </translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="199"/> + <location filename="../src/mirall/application.cpp" line="202"/> <source><p>The ownCloud at %1 could not be reached.</p></source> <translation><p>Unter %1 konnte keine ownCloud erreicht werden.</p></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="200"/> + <location filename="../src/mirall/application.cpp" line="203"/> <source><p>The detailed error message is<br/><tt>%1</tt></p></source> <translation><p>Die detaillierte Fehlermeldung ist <br/><tt>%1</tt></p></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="202"/> + <location filename="../src/mirall/application.cpp" line="205"/> <source><p>Please check your configuration by clicking on the tray icon.</p></source> <translation><p>Bitte überprüfen Sie die Konfiguration durch Klicken auf das Symbol in der Systemleiste.</p></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="204"/> + <location filename="../src/mirall/application.cpp" line="207"/> <source>ownCloud Connection Failed</source> <translation>ownCloud-Verbindung fehlgeschlagen</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="222"/> + <location filename="../src/mirall/application.cpp" line="225"/> <source><p>Your ownCloud credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p></source> <translation><p>Die ownCloud Benutzerdaten sind nicht korrekt</p><p>Bitte korrigieren Sie sie im Konfigurationsdialog.</p></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="229"/> + <location filename="../src/mirall/application.cpp" line="232"/> <source><p>Your ownCloud user name or password is not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p></source> <translation><p>Der ownCloud Benutzername oder das Passwort sind nicht richtig.</p><p>Bitte korrigieren Sie das im Konfigurationsdialog.</p></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="250"/> + <location filename="../src/mirall/application.cpp" line="253"/> + <source>Open ownCloud...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="255"/> <source>Open status...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="467"/> + <location filename="../src/mirall/application.cpp" line="296"/> + <source>open folder %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="517"/> <source>Undefined Folder State</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="470"/> + <location filename="../src/mirall/application.cpp" line="520"/> <source>The folder waits to start syncing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="473"/> - <location filename="../src/mirall/application.cpp" line="595"/> + <location filename="../src/mirall/application.cpp" line="523"/> + <location filename="../src/mirall/application.cpp" line="646"/> <source>Sync is running.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="476"/> - <location filename="../src/mirall/application.cpp" line="598"/> + <location filename="../src/mirall/application.cpp" line="526"/> + <location filename="../src/mirall/application.cpp" line="649"/> <source>Last Sync was successful.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="479"/> - <location filename="../src/mirall/application.cpp" line="602"/> + <location filename="../src/mirall/application.cpp" line="529"/> + <location filename="../src/mirall/application.cpp" line="653"/> <source>Syncing Error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="482"/> - <location filename="../src/mirall/application.cpp" line="608"/> + <location filename="../src/mirall/application.cpp" line="532"/> + <location filename="../src/mirall/application.cpp" line="659"/> <source>Setup Error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="485"/> - <location filename="../src/mirall/application.cpp" line="611"/> + <location filename="../src/mirall/application.cpp" line="535"/> + <location filename="../src/mirall/application.cpp" line="662"/> <source>Undefined Error State.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="537"/> + <location filename="../src/mirall/application.cpp" line="587"/> <source>Sync Running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="538"/> + <location filename="../src/mirall/application.cpp" line="588"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="589"/> + <location filename="../src/mirall/application.cpp" line="640"/> <source>Undefined State.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="592"/> + <location filename="../src/mirall/application.cpp" line="643"/> <source>Waits to start syncing.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/mirall/application.cpp" line="666"/> + <source>Sync is paused.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="679"/> + <source>No sync folders configured.</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Last sync was succesful.</source> <translation type="obsolete">Die letzte Synchronisation war erfolgreich.</translation> </message> @@ -475,29 +494,29 @@ p, li { white-space: pre-wrap; } <translation type="obsolete"><b>Undefinierter Status</b><br/></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="489"/> + <location filename="../src/mirall/application.cpp" line="539"/> <source>Folder information</source> <translation>Verzeichnis Information</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="504"/> + <location filename="../src/mirall/application.cpp" line="554"/> <source>Unknown</source> <translation>Unbekannt</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="506"/> + <location filename="../src/mirall/application.cpp" line="556"/> <source>Changed files: </source> <translation>Geänderte Dateien:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="508"/> + <location filename="../src/mirall/application.cpp" line="558"/> <source>Added files: </source> <translation>Hinzugefügte Dateien:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="510"/> + <location filename="../src/mirall/application.cpp" line="560"/> <source>New files in the server, or files deleted locally: </source> <translation>Neue Dateien auf dem Server, oder lokal gelöschte Dateien:</translation> @@ -631,7 +650,7 @@ Please write a bug report.</source> <translation type="obsolete">Angehalten</translation> </message> <message> - <location filename="../src/mirall/statusdialog.cpp" line="154"/> + <location filename="../src/mirall/statusdialog.cpp" line="152"/> <source>Remote path: %1</source> <translation>Server-Pfad: %1</translation> </message> @@ -639,7 +658,7 @@ Please write a bug report.</source> <context> <name>Mirall::FolderWizard</name> <message> - <location filename="../src/mirall/folderwizard.cpp" line="460"/> + <location filename="../src/mirall/folderwizard.cpp" line="463"/> <source>%1 Folder Wizard</source> <translation>%1 Verzeichnis Assistent</translation> </message> @@ -705,22 +724,22 @@ Please write a bug report.</source> <translation>Wählen Sie besser nicht das ownCloud root Verzeichnis aus.<br/>Wenn Sie dieses wählen, können Sie <b>kein</b> weiteres Verzeichnis synchronisieren.</translation> </message> <message> - <location filename="../src/mirall/folderwizard.cpp" line="312"/> + <location filename="../src/mirall/folderwizard.cpp" line="315"/> <source>to your <a href="%1">ownCloud</a> (version %2)</source> <translation>zur <a href="%1">ownCloud</a> (version %2)</translation> </message> <message> - <location filename="../src/mirall/folderwizard.cpp" line="322"/> + <location filename="../src/mirall/folderwizard.cpp" line="325"/> <source>no configured ownCloud found!</source> <translation>keine eingerichtete ownCloud verfügbar!</translation> </message> <message> - <location filename="../src/mirall/folderwizard.cpp" line="323"/> + <location filename="../src/mirall/folderwizard.cpp" line="326"/> <source>Your ownCloud could not be reached:<br/><tt>%1</tt></source> <translation>Die ownCloud kann nicht erreicht werden: <br/><tt>%1</tt></translation> </message> <message> - <location filename="../src/mirall/folderwizard.cpp" line="390"/> + <location filename="../src/mirall/folderwizard.cpp" line="393"/> <source>Select the target folder</source> <translation>Wählen Sie den Zielordner</translation> </message> @@ -738,9 +757,8 @@ Please write a bug report.</source> <translation>Versuche mit ownCloud %1zu verbinden... </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="115"/> <source><font color="green">Successfully connected to %1: ownCloud version %2</font><br/><br/></source> - <translation><font color="green">Erfolgreich verbunden mit %1: ownCloud Version %2</font><br/><br/></translation> + <translation type="obsolete"><font color="green">Erfolgreich verbunden mit %1: ownCloud Version %2</font><br/><br/></translation> </message> <message> <location filename="../src/mirall/owncloudsetupwizard.cpp" line="126"/> @@ -752,6 +770,11 @@ Please write a bug report.</source> <translation type="obsolete">Fehler Nummer %1</translation> </message> <message> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="115"/> + <source><font color="green">Successfully connected to %1: ownCloud version %2 (%3)</font><br/><br/></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/mirall/owncloudsetupwizard.cpp" line="127"/> <source>Error: <tt>%1</tt></source> <translation>Fehler: <tt>%1</tt></translation> @@ -909,37 +932,50 @@ Setup can not be done.</source> <context> <name>Mirall::StatusDialog</name> <message> - <location filename="../src/mirall/statusdialog.cpp" line="244"/> <source>disable</source> - <translation>Sync stoppen</translation> + <translation type="obsolete">Sync stoppen</translation> </message> <message> - <location filename="../src/mirall/statusdialog.cpp" line="246"/> <source>enable</source> - <translation>Sync starten</translation> + <translation type="obsolete">Sync starten</translation> + </message> + <message> + <location filename="../src/mirall/statusdialog.cpp" line="242"/> + <source>Pause</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/statusdialog.cpp" line="244"/> + <source>Resume</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/statusdialog.cpp" line="410"/> + <location filename="../src/mirall/statusdialog.cpp" line="408"/> <source>Checking ownCloud connection...</source> <translation>Überprüfe ownCloud-Verbindung...</translation> </message> <message> - <location filename="../src/mirall/statusdialog.cpp" line="415"/> + <location filename="../src/mirall/statusdialog.cpp" line="413"/> <source>No ownCloud connection configured.</source> <translation>ownCloud-Verbindung nicht eingerichtet.</translation> </message> <message> - <location filename="../src/mirall/statusdialog.cpp" line="426"/> + <location filename="../src/mirall/statusdialog.cpp" line="435"/> <source>Connected to <a href="%1">%2</a>, ownCloud %3</source> <translation>Verbunden mit <a href="%1">%2</a>, ownCloud %3</translation> </message> <message> - <location filename="../src/mirall/statusdialog.cpp" line="433"/> + <location filename="../src/mirall/statusdialog.cpp" line="436"/> + <source>Version: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/statusdialog.cpp" line="443"/> <source>unknown problem.</source> <translation>unbekanntes Problem.</translation> </message> <message> - <location filename="../src/mirall/statusdialog.cpp" line="436"/> + <location filename="../src/mirall/statusdialog.cpp" line="446"/> <source><p>Failed to connect to ownCloud: <tt>%1</tt></p></source> <translation><p>Verbindung zur ownCloud fehlgeschlagen: <tt>%1</tt></p></translation> </message> @@ -1021,17 +1057,17 @@ Setup can not be done.</source> <context> <name>Mirall::UpdateDetector</name> <message> - <location filename="../src/mirall/updatedetector.cpp" line="95"/> + <location filename="../src/mirall/updatedetector.cpp" line="115"/> <source>Client Version Check</source> <translation>Client Versionsprüfung</translation> </message> <message> - <location filename="../src/mirall/updatedetector.cpp" line="97"/> + <location filename="../src/mirall/updatedetector.cpp" line="117"/> <source><p>A new version of the ownCloud Client is available.</source> <translation><p>Eine neue Version des ownCloud Clients ist verfügbar.</translation> </message> <message> - <location filename="../src/mirall/updatedetector.cpp" line="98"/> + <location filename="../src/mirall/updatedetector.cpp" line="118"/> <source>%1 is available. The installed version is %3.<p/><p>For more information see <a href="%2">%2</a></p></source> <translation>%1 ist verfügbar. Die installierte Version ist %3.<p/><p>Mehr Information unter <a href="%2">%2</a></p></translation> </message> @@ -1288,12 +1324,12 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/mirall/mirallconfigfile.cpp" line="214"/> + <location filename="../src/mirall/mirallconfigfile.cpp" line="237"/> <source>ownCloud Password Required</source> <translation>ownCloud Passwort benötigt</translation> </message> <message> - <location filename="../src/mirall/mirallconfigfile.cpp" line="215"/> + <location filename="../src/mirall/mirallconfigfile.cpp" line="238"/> <source>Please enter your ownCloud password:</source> <translation>Bitte geben Sie Ihr ownCloud-Passwort an:</translation> </message> @@ -1345,24 +1381,40 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../src/mirall/statusdialog.ui" line="56"/> - <source>fetch...</source> - <translation>Holen...</translation> + <source>Fetch...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/mirall/statusdialog.ui" line="63"/> + <source>Push...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/statusdialog.ui" line="70"/> + <source>Pause</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/statusdialog.ui" line="77"/> + <source>Info...</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>fetch...</source> + <translation type="obsolete">Holen...</translation> + </message> + <message> <source>push...</source> <translatorcomment>very unsure - don't remember seeing this button</translatorcomment> - <translation>Hochladen...</translation> + <translation type="obsolete">Hochladen...</translation> </message> <message> - <location filename="../src/mirall/statusdialog.ui" line="70"/> <source>enable</source> - <translation>Aktivieren</translation> + <translation type="obsolete">Aktivieren</translation> </message> <message> - <location filename="../src/mirall/statusdialog.ui" line="77"/> <source>info...</source> - <translation>Info...</translation> + <translation type="obsolete">Info...</translation> </message> <message> <location filename="../src/mirall/statusdialog.ui" line="99"/> diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts index 3fae06f56..3f5a63221 100644 --- a/translations/mirall_ru.ts +++ b/translations/mirall_ru.ts @@ -264,143 +264,162 @@ p, li { white-space: pre-wrap; } <translation><p>Не настроено подключение к ownCloud</p><p>Параметры можно изменить через меню значка в области уведомлений.</p></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="199"/> + <location filename="../src/mirall/application.cpp" line="202"/> <source><p>The ownCloud at %1 could not be reached.</p></source> <translation><p>Экземпляр ownCloud %1 недоступен.</p></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="200"/> + <location filename="../src/mirall/application.cpp" line="203"/> <source><p>The detailed error message is<br/><tt>%1</tt></p></source> <translation><p>Подробное сообщение об ошибке <br/><tt>%1</tt></p></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="202"/> + <location filename="../src/mirall/application.cpp" line="205"/> <source><p>Please check your configuration by clicking on the tray icon.</p></source> <translation></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="204"/> + <location filename="../src/mirall/application.cpp" line="207"/> <source>ownCloud Connection Failed</source> <translation>Ошибка подключения к ownCloud</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="221"/> - <location filename="../src/mirall/application.cpp" line="228"/> + <location filename="../src/mirall/application.cpp" line="224"/> + <location filename="../src/mirall/application.cpp" line="231"/> <source>No ownCloud Connection</source> <translation>Нет подключения к ownCloud</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="222"/> + <location filename="../src/mirall/application.cpp" line="225"/> <source><p>Your ownCloud credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p></source> <translation><p>Параметры доступа к ownCloud указаны неверно.</p><p>Параметры можно изменить через меню значка в области уведомлений.</p></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="229"/> + <location filename="../src/mirall/application.cpp" line="232"/> <source><p>Your ownCloud user name or password is not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p></source> <translation><p>Имя пользователя или пароль к ownCloud указано неверно.</p><p>Параметры можно изменить через меню значка в области уведомлений.</p></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="241"/> + <location filename="../src/mirall/application.cpp" line="244"/> <source>ownCloud Sync Started</source> <translation>Запущена синхронизация с ownCloud</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="241"/> + <location filename="../src/mirall/application.cpp" line="244"/> <source>Sync started for %1 configured sync folder(s).</source> <translation>Запущена синхронизация папок: %1.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="250"/> + <location filename="../src/mirall/application.cpp" line="253"/> + <source>Open ownCloud...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="255"/> <source>Open status...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="252"/> + <location filename="../src/mirall/application.cpp" line="257"/> <source>Add folder...</source> <translation>Добавить папку...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="254"/> + <location filename="../src/mirall/application.cpp" line="259"/> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="258"/> + <location filename="../src/mirall/application.cpp" line="263"/> <source>Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="290"/> + <location filename="../src/mirall/application.cpp" line="296"/> + <source>open folder %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="666"/> + <source>Sync is paused.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="679"/> + <source>No sync folders configured.</source> + <translation type="unfinished"></translation> + </message> + <message> <source>open %1</source> - <translation>Открыть %1</translation> + <translation type="obsolete">Открыть %1</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="410"/> + <location filename="../src/mirall/application.cpp" line="455"/> <source>Confirm Folder Remove</source> <translation>Подтверждение удаления папки</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="410"/> + <location filename="../src/mirall/application.cpp" line="455"/> <source>Do you really want to remove upload folder <i>%1</i>?</source> <translation>Удалить папку <i>%1</i> на сервере?</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="467"/> + <location filename="../src/mirall/application.cpp" line="517"/> <source>Undefined Folder State</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="470"/> + <location filename="../src/mirall/application.cpp" line="520"/> <source>The folder waits to start syncing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="473"/> - <location filename="../src/mirall/application.cpp" line="595"/> + <location filename="../src/mirall/application.cpp" line="523"/> + <location filename="../src/mirall/application.cpp" line="646"/> <source>Sync is running.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="476"/> - <location filename="../src/mirall/application.cpp" line="598"/> + <location filename="../src/mirall/application.cpp" line="526"/> + <location filename="../src/mirall/application.cpp" line="649"/> <source>Last Sync was successful.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="479"/> - <location filename="../src/mirall/application.cpp" line="602"/> + <location filename="../src/mirall/application.cpp" line="529"/> + <location filename="../src/mirall/application.cpp" line="653"/> <source>Syncing Error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="482"/> - <location filename="../src/mirall/application.cpp" line="608"/> + <location filename="../src/mirall/application.cpp" line="532"/> + <location filename="../src/mirall/application.cpp" line="659"/> <source>Setup Error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="485"/> - <location filename="../src/mirall/application.cpp" line="611"/> + <location filename="../src/mirall/application.cpp" line="535"/> + <location filename="../src/mirall/application.cpp" line="662"/> <source>Undefined Error State.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="537"/> + <location filename="../src/mirall/application.cpp" line="587"/> <source>Sync Running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="538"/> + <location filename="../src/mirall/application.cpp" line="588"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="589"/> + <location filename="../src/mirall/application.cpp" line="640"/> <source>Undefined State.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="592"/> + <location filename="../src/mirall/application.cpp" line="643"/> <source>Waits to start syncing.</source> <translation type="unfinished"></translation> </message> @@ -425,29 +444,29 @@ p, li { white-space: pre-wrap; } <translation type="obsolete"><b>Неопределённое состояние</b><br/></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="489"/> + <location filename="../src/mirall/application.cpp" line="539"/> <source>Folder information</source> <translation>Сведения о папке</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="504"/> + <location filename="../src/mirall/application.cpp" line="554"/> <source>Unknown</source> <translation>Нет данных</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="506"/> + <location filename="../src/mirall/application.cpp" line="556"/> <source>Changed files: </source> <translation>Изменены файлы:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="508"/> + <location filename="../src/mirall/application.cpp" line="558"/> <source>Added files: </source> <translation></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="510"/> + <location filename="../src/mirall/application.cpp" line="560"/> <source>New files in the server, or files deleted locally: </source> <translation>Новые файлы на сервере или файлы удалены локально:</translation> @@ -569,7 +588,7 @@ Please write a bug report.</source> <context> <name>Mirall::FolderViewDelegate</name> <message> - <location filename="../src/mirall/statusdialog.cpp" line="154"/> + <location filename="../src/mirall/statusdialog.cpp" line="152"/> <source>Remote path: %1</source> <translation>Путь на сервере: %1</translation> </message> @@ -577,7 +596,7 @@ Please write a bug report.</source> <context> <name>Mirall::FolderWizard</name> <message> - <location filename="../src/mirall/folderwizard.cpp" line="460"/> + <location filename="../src/mirall/folderwizard.cpp" line="463"/> <source>%1 Folder Wizard</source> <translation>Настройка папки %1</translation> </message> @@ -643,22 +662,22 @@ Please write a bug report.</source> <translation>Лучше не использовать сетевой корневой каталог.<br/>В этом случае вы <b>не сможете</b> синхронизировать другую локальную папку.</translation> </message> <message> - <location filename="../src/mirall/folderwizard.cpp" line="312"/> + <location filename="../src/mirall/folderwizard.cpp" line="315"/> <source>to your <a href="%1">ownCloud</a> (version %2)</source> <translation></translation> </message> <message> - <location filename="../src/mirall/folderwizard.cpp" line="322"/> + <location filename="../src/mirall/folderwizard.cpp" line="325"/> <source>no configured ownCloud found!</source> <translation>Нет настроенного экземпляра ownCloud.</translation> </message> <message> - <location filename="../src/mirall/folderwizard.cpp" line="323"/> + <location filename="../src/mirall/folderwizard.cpp" line="326"/> <source>Your ownCloud could not be reached:<br/><tt>%1</tt></source> <translation>Ваш экземпляр ownCloud недоступен:<br/><tt>%1</tt></translation> </message> <message> - <location filename="../src/mirall/folderwizard.cpp" line="390"/> + <location filename="../src/mirall/folderwizard.cpp" line="393"/> <source>Select the target folder</source> <translation>Выберите папку</translation> </message> @@ -676,9 +695,13 @@ Please write a bug report.</source> <translation></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="115"/> <source><font color="green">Successfully connected to %1: ownCloud version %2</font><br/><br/></source> - <translation><font color="green">Успешное подключение к %1: версия ownCloud %2</font><br/><br/></translation> + <translation type="obsolete"><font color="green">Успешное подключение к %1: версия ownCloud %2</font><br/><br/></translation> + </message> + <message> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="115"/> + <source><font color="green">Successfully connected to %1: ownCloud version %2 (%3)</font><br/><br/></source> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/mirall/owncloudsetupwizard.cpp" line="126"/> @@ -840,37 +863,50 @@ Setup can not be done.</source> <context> <name>Mirall::StatusDialog</name> <message> - <location filename="../src/mirall/statusdialog.cpp" line="244"/> <source>disable</source> - <translation>отключено</translation> + <translation type="obsolete">отключено</translation> </message> <message> - <location filename="../src/mirall/statusdialog.cpp" line="246"/> <source>enable</source> - <translation>включено</translation> + <translation type="obsolete">включено</translation> + </message> + <message> + <location filename="../src/mirall/statusdialog.cpp" line="242"/> + <source>Pause</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/statusdialog.cpp" line="244"/> + <source>Resume</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/statusdialog.cpp" line="410"/> + <location filename="../src/mirall/statusdialog.cpp" line="408"/> <source>Checking ownCloud connection...</source> <translation>Проверка подключения к ownCloud...</translation> </message> <message> - <location filename="../src/mirall/statusdialog.cpp" line="415"/> + <location filename="../src/mirall/statusdialog.cpp" line="413"/> <source>No ownCloud connection configured.</source> <translation>Нет настроенного подключения к ownCloud.</translation> </message> <message> - <location filename="../src/mirall/statusdialog.cpp" line="426"/> + <location filename="../src/mirall/statusdialog.cpp" line="435"/> <source>Connected to <a href="%1">%2</a>, ownCloud %3</source> <translation>Подключено к <a href="%1">%2</a>, ownCloud %3</translation> </message> <message> - <location filename="../src/mirall/statusdialog.cpp" line="433"/> + <location filename="../src/mirall/statusdialog.cpp" line="436"/> + <source>Version: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/statusdialog.cpp" line="443"/> <source>unknown problem.</source> <translation>неизвестная ошибка.</translation> </message> <message> - <location filename="../src/mirall/statusdialog.cpp" line="436"/> + <location filename="../src/mirall/statusdialog.cpp" line="446"/> <source><p>Failed to connect to ownCloud: <tt>%1</tt></p></source> <translation><p>Не удалось подключиться к ownCloud: <tt>%1</tt></p></translation> </message> @@ -916,17 +952,17 @@ Setup can not be done.</source> <context> <name>Mirall::UpdateDetector</name> <message> - <location filename="../src/mirall/updatedetector.cpp" line="95"/> + <location filename="../src/mirall/updatedetector.cpp" line="115"/> <source>Client Version Check</source> <translation>Проверка версии клиента</translation> </message> <message> - <location filename="../src/mirall/updatedetector.cpp" line="97"/> + <location filename="../src/mirall/updatedetector.cpp" line="117"/> <source><p>A new version of the ownCloud Client is available.</source> <translation><p>Доступна новая версия клиента ownCloud.</translation> </message> <message> - <location filename="../src/mirall/updatedetector.cpp" line="98"/> + <location filename="../src/mirall/updatedetector.cpp" line="118"/> <source>%1 is available. The installed version is %3.<p/><p>For more information see <a href="%2">%2</a></p></source> <translation>Доступна версия %1. Установлена версия %3.<p/><p>Подробности на сайте<a href="%2">%2</a></p></translation> </message> @@ -1162,12 +1198,12 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../src/mirall/mirallconfigfile.cpp" line="214"/> + <location filename="../src/mirall/mirallconfigfile.cpp" line="237"/> <source>ownCloud Password Required</source> <translation>Требуется пароль к ownCloud</translation> </message> <message> - <location filename="../src/mirall/mirallconfigfile.cpp" line="215"/> + <location filename="../src/mirall/mirallconfigfile.cpp" line="238"/> <source>Please enter your ownCloud password:</source> <translation>Укажите пароль для доступа к ownCloud:</translation> </message> @@ -1214,23 +1250,39 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../src/mirall/statusdialog.ui" line="56"/> - <source>fetch...</source> - <translation>Получить...</translation> + <source>Fetch...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/mirall/statusdialog.ui" line="63"/> - <source>push...</source> - <translation>Отправить...</translation> + <source>Push...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/mirall/statusdialog.ui" line="70"/> - <source>enable</source> - <translation>Включить</translation> + <source>Pause</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/mirall/statusdialog.ui" line="77"/> + <source>Info...</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>fetch...</source> + <translation type="obsolete">Получить...</translation> + </message> + <message> + <source>push...</source> + <translation type="obsolete">Отправить...</translation> + </message> + <message> + <source>enable</source> + <translation type="obsolete">Включить</translation> + </message> + <message> <source>info...</source> - <translation>Свойства...</translation> + <translation type="obsolete">Свойства...</translation> </message> <message> <location filename="../src/mirall/statusdialog.ui" line="99"/> |