[Pkg-owncloud-commits] [owncloud-client] 16/332: change the text to be a little more descriptive and use shorthand in the context menu

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit cd82a8585a42a8a78e62452ac20505f4f7445860
Author: Eran <etherpulse at gmail.com>
Date:   Thu May 29 00:09:02 2014 +0300

    change the text to be a little more descriptive and use shorthand in the context menu
---
 src/mirall/accountsettings.cpp | 4 ++--
 src/mirall/owncloudgui.cpp     | 4 ++--
 src/mirall/utility.cpp         | 8 +++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp
index 5c615aa..cb928e6 100644
--- a/src/mirall/accountsettings.cpp
+++ b/src/mirall/accountsettings.cpp
@@ -616,7 +616,7 @@ void AccountSettings::slotSetProgress(const QString& folder, const Progress::Inf
         QString s1 = Utility::octetsToString( curItemProgress );
         QString s2 = Utility::octetsToString( curItem._size );
         //: Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"
-        fileProgressString = tr("%1 %2 (%3 of %4) time left %5 at a rate of %6/s")
+        fileProgressString = tr("%1 %2 (%3 of %4) %5 left at a rate of %6/s")
             .arg(kindString, itemFileName, s1, s2,
                  Utility::timeToDescriptiveString(progress.getFileEstimate(curItem).getEtaEstimate(), 3, " ", true),
 		 Utility::octetsToString(progress.getFileEstimate(curItem).getEstimatedBandwidth()) );
@@ -631,7 +631,7 @@ void AccountSettings::slotSetProgress(const QString& folder, const Progress::Inf
     quint64 currentFile =  progress._completedFileCount + progress._currentItems.count();
     QString s1 = Utility::octetsToString( completedSize );
     QString s2 = Utility::octetsToString( progress._totalSize );
-    QString overallSyncString = tr("%1 of %2, file %3 of %4\nTime left %5")
+    QString overallSyncString = tr("%1 of %2, file %3 of %4\nTotal time left %5")
         .arg(s1, s2)
         .arg(currentFile).arg(progress._totalFileCount)
         .arg( Utility::timeToDescriptiveString(progress.totalEstimate().getEtaEstimate(), 3, " ", true) );
diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp
index 259bb01..68f04e6 100644
--- a/src/mirall/owncloudgui.cpp
+++ b/src/mirall/owncloudgui.cpp
@@ -408,11 +408,11 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const Progress::Info
             quint64 currentFile =  progress._completedFileCount + progress._currentItems.count();           
             _actionStatus->setText( tr("Syncing %1 of %2  (%3 left)")
                 .arg( currentFile ).arg( progress._totalFileCount )
-                 .arg( Utility::timeToDescriptiveString(progress.totalEstimate().getEtaEstimate(), 1, ":",false) ) );
+                 .arg( Utility::timeToDescriptiveString(progress.totalEstimate().getEtaEstimate(), 2, " ",true) ) );
         } else {
             _actionStatus->setText( tr("Syncing %1 (%2 left)")
                 .arg( totalSizeStr )
-                .arg( Utility::timeToDescriptiveString(progress.totalEstimate().getEtaEstimate(), 1, ":",false) ) );
+                .arg( Utility::timeToDescriptiveString(progress.totalEstimate().getEtaEstimate(), 2, " ",true) ) );
         }
 
 
diff --git a/src/mirall/utility.cpp b/src/mirall/utility.cpp
index 2273f1d..1129f80 100644
--- a/src/mirall/utility.cpp
+++ b/src/mirall/utility.cpp
@@ -442,6 +442,8 @@ void Utility::showInFileManager(const QString &localPath)
     }
 }
 
+
+
 QDateTime Utility::qDateTimeFromTime_t(qint64 t)
 {
     return QDateTime::fromMSecsSinceEpoch(t * 1000);
@@ -460,11 +462,11 @@ static QList<QPair<QString,quint32> > timeMapping = QList<QPair<QString,quint32>
                                                     QPair<QString,quint32>("%1h",3600) <<
                                                     QPair<QString,quint32>("%1m",60) <<
                                                     QPair<QString,quint32>("%1s",1);
-
-
+                                                    
+                                                    
 QString Utility::timeToDescriptiveString(quint64 msecs, quint8 precision, QString separator, bool specific) 
 {     
-    return timeToDescriptiveString(timeMapping, msecs, precision, separator, specific);
+    return timeToDescriptiveString( timeMapping , msecs, precision, separator, specific);
 }
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git