queuing: fix false "Error" message reported by rb07

diff --git a/gtk/torrent-cell-renderer.c b/gtk/torrent-cell-renderer.c
index 1717f80c13042215998bcce00c8e5bb91c6be85c..a126e2f9853091c7d6731838e9bf5e849b011b9f 100644 (file)
--- a/gtk/torrent-cell-renderer.c
+++ b/gtk/torrent-cell-renderer.c
@@ -195,27 +195,21 @@ getShortStatusString( GString           * gstr,
     switch( st->activity )
     {
         case TR_STATUS_STOPPED:
-            if( st->finished )
-                g_string_append( gstr, _( "Finished" ) );
-            else
-                g_string_append( gstr, _( "Paused" ) );
+            g_string_append( gstr, st->finished ? _( "Finished" ) : _( "Paused" ) );
             break;
-
         case TR_STATUS_CHECK_WAIT:
-            g_string_append( gstr, _( "Waiting to verify local data" ) );
-            break;
-
-        case TR_STATUS_CHECK:
-            g_string_append_printf( gstr,
-                                    _( "Verifying local data (%.1f%% tested)" ),
-                                    tr_truncd( st->recheckProgress * 100.0, 1 ) );
+            g_string_append( gstr, _( "Queued for verification" ) );
             break;
-
         case TR_STATUS_DOWNLOAD_WAIT:
-            g_string_append( gstr, _( "Waiting to download" ) );
+            g_string_append( gstr, _( "Queued for download" ) );
             break;
         case TR_STATUS_SEED_WAIT:
-            g_string_append( gstr, _( "Waiting to seed" ) );
+            g_string_append( gstr, _( "Queued for seeding" ) );
+            break;
+
+        case TR_STATUS_CHECK:
+            g_string_append_printf( gstr, _( "Verifying local data (%.1f%% tested)" ),
+                                    tr_truncd( st->recheckProgress * 100.0, 1 ) );
             break;
 
         case TR_STATUS_DOWNLOAD:

diff --git a/qt/torrent-delegate.cc b/qt/torrent-delegate.cc
index 516a28f2c268c4b043e78ed7b332cdb99e86bcfe..99ea94f8eaf51f1ecac6b19362f9d7875a10859b 100644 (file)
--- a/qt/torrent-delegate.cc
+++ b/qt/torrent-delegate.cc
@@ -226,6 +226,8 @@ TorrentDelegate :: statusString( const Torrent& tor ) const
         case TR_STATUS_STOPPED:
         case TR_STATUS_CHECK_WAIT:
         case TR_STATUS_CHECK:
+        case TR_STATUS_DOWNLOAD_WAIT:
+        case TR_STATUS_SEED_WAIT:
             str = shortStatusString( tor );
             break;