[Pkg-owncloud-commits] [owncloud-client] 73/171: Translation cleanups

[Sandro Knauß]

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

hefee-guest pushed a commit to annotated tag upstream/2.1.1+dfsg
in repository owncloud-client.

commit 9c7066ac47dc1d027c6fffe41dbc73820f0e8b50
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Wed Jan 6 16:50:59 2016 +0100

    Translation cleanups
    
    - Disambiguation
    - Remove potentially illigitmate concatenations
---
 src/gui/activityitemdelegate.cpp |  9 +++++----
 src/gui/activitywidget.cpp       | 10 +++++-----
 src/libsync/syncengine.cpp       |  3 ++-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/gui/activityitemdelegate.cpp b/src/gui/activityitemdelegate.cpp
index 2c50da3..2d86ba9 100644
--- a/src/gui/activityitemdelegate.cpp
+++ b/src/gui/activityitemdelegate.cpp
@@ -130,12 +130,13 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
         accountRole.remove(0, atPos+1);
     }
 
-    QString timeStr = tr("%1 on %2").arg(timeText).arg(accountRole);
-    if( !accountOnline ) {
+    QString timeStr;
+    if ( accountOnline ) {
+        timeStr = tr("%1 on %2").arg(timeText).arg(accountRole);
+    } else {
+        timeStr = tr("%1 on %2 (disconnected)").arg(timeText).arg(accountRole);
         QPalette p = option.palette;
         painter->setPen(p.color(QPalette::Disabled, QPalette::Text));
-        timeStr.append(" ");
-        timeStr.append(tr("(disconnected)"));
     }
     const QString elidedTime = fm.elidedText(timeStr, Qt::ElideRight, timeBox.width());
 
diff --git a/src/gui/activitywidget.cpp b/src/gui/activitywidget.cpp
index 022cba4..20994e1 100644
--- a/src/gui/activitywidget.cpp
+++ b/src/gui/activitywidget.cpp
@@ -442,24 +442,24 @@ void ActivitySettings::slotCopyToClipboard()
     QTextStream ts(&text);
 
     int idx = _tab->currentIndex();
-    QString theSubject;
+    QString message;
 
     if( idx == 0 ) {
         // the activity widget
         _activityWidget->storeActivityList(ts);
-        theSubject = tr("server activity list");
+        message = tr("The server activity list has been copied to the clipboard.");
     } else if(idx == 1 ) {
         // the protocol widget
         _protocolWidget->storeSyncActivity(ts);
-        theSubject = tr("sync activity list");
+        message = tr("The sync activity list has been copied to the clipboard.");
     } else if(idx == 2 ) {
         // issues Widget
-        theSubject = tr("not syned items list");
+        message = tr("The list of unsynched items has been copied to the clipboard.");
        _protocolWidget->storeSyncIssues(ts);
     }
 
     QApplication::clipboard()->setText(text);
-    emit guiLog(tr("Copied to clipboard"), tr("The %1 has been copied to the clipboard.").arg(theSubject));
+    emit guiLog(tr("Copied to clipboard"), message);
 }
 
 void ActivitySettings::slotRemoveAccount( AccountState *ptr )
diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index c71ad4a..38aff9f 100644
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -650,7 +650,8 @@ void SyncEngine::startSync()
         qDebug() << "There are" << freeBytes << "bytes available at" << _localPath
                  << "and at least" << minFree << "are required";
         if (freeBytes < minFree) {
-            emit csyncError(tr("Only %1 are available, need at least %2 to start").arg(
+            emit csyncError(tr("Only %1 are available, need at least %2 to start",
+                               "Placeholders are postfixed with file sizes using Utility::octetsToString()").arg(
                                 Utility::octetsToString(freeBytes),
                                 Utility::octetsToString(minFree)));
             finalize(false);

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