Replace "Queued" by "Waiting" in queue and history lines.

This makes it possible to have different translations of it in the lines and other places.

po/main/SABnzbd.pot

@@ -12,7 +12,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ASCII\n"
 "Content-Transfer-Encoding: 7bit\n"
-"POT-Creation-Date: 2011-03-07 16:00+West-Europa (standaardtijd)\n"
+"POT-Creation-Date: 2011-03-12 19:55+West-Europa (standaardtijd)\n"
 "Generated-By: pygettext.py 1.5\n"
 
 
@@ -149,11 +149,11 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: sabnzbd/api.py:1405 # sabnzbd/interface.py:2184
+#: sabnzbd/api.py:1405 # sabnzbd/interface.py:2183
 msgid "WARNING:"
 msgstr ""
 
-#: sabnzbd/api.py:1405 # sabnzbd/interface.py:2184 # sabnzbd/interface.py:2291
+#: sabnzbd/api.py:1405 # sabnzbd/interface.py:2183 # sabnzbd/interface.py:2276
 msgid "ERROR:"
 msgstr ""
 
@@ -311,43 +311,43 @@ msgstr ""
 msgid "Shutting down"
 msgstr ""
 
-#: sabnzbd/emailer.py:51 # sabnzbd/emailer.py:105 [Error message]
-msgid "Failed to send e-mail"
-msgstr ""
-
-#: sabnzbd/emailer.py:75 [Error message] # sabnzbd/emailer.py:78 [Error message]
+#: sabnzbd/emailer.py:78 # sabnzbd/emailer.py:80
 msgid "Failed to connect to mail server"
 msgstr ""
 
-#: sabnzbd/emailer.py:91 [Error message]
+#: sabnzbd/emailer.py:92
 msgid "Failed to initiate TLS connection"
 msgstr ""
 
-#: sabnzbd/emailer.py:99 [Error message]
+#: sabnzbd/emailer.py:99
 msgid "Failed to authenticate to mail server"
 msgstr ""
 
-#: sabnzbd/emailer.py:111 [Warning message]
+#: sabnzbd/emailer.py:113
+msgid "Failed to send e-mail"
+msgstr ""
+
+#: sabnzbd/emailer.py:118
 msgid "Failed to close mail connection"
 msgstr ""
 
-#: sabnzbd/emailer.py:114
+#: sabnzbd/emailer.py:124
 msgid "Email succeeded"
 msgstr ""
 
-#: sabnzbd/emailer.py:138 [Error message]
+#: sabnzbd/emailer.py:147 [Error message]
 msgid "Cannot find email templates in %s"
 msgstr ""
 
-#: sabnzbd/emailer.py:147
+#: sabnzbd/emailer.py:156
 msgid "No email templates found"
 msgstr ""
 
-#: sabnzbd/emailer.py:160
+#: sabnzbd/emailer.py:171
 msgid "Invalid encoding of email template %s"
 msgstr ""
 
-#: sabnzbd/emailer.py:204
+#: sabnzbd/emailer.py:215
 msgid ""
 "to: %s\n"
 "from: %s\n"
@@ -452,45 +452,45 @@ msgstr ""
 msgid "Sunday"
 msgstr ""
 
-#: sabnzbd/interface.py:2176
+#: sabnzbd/interface.py:2175
 msgid " Resolving address"
 msgstr ""
 
-#: sabnzbd/interface.py:2291
+#: sabnzbd/interface.py:2276
 msgid "Incorrect parameter"
 msgstr ""
 
-#: sabnzbd/interface.py:2291 # sabnzbd/interface.py:2317
-#: sabnzbd/interface.py:2341 # sabnzbd/interface.py:2358
-#: sabnzbd/interface.py:2443 # sabnzbd/interface.py:2462 # sabnzbd/skintext.py:96 [Generic "Back" button]
+#: sabnzbd/interface.py:2276 # sabnzbd/interface.py:2302
+#: sabnzbd/interface.py:2326 # sabnzbd/interface.py:2343
+#: sabnzbd/interface.py:2428 # sabnzbd/interface.py:2447 # sabnzbd/skintext.py:96 [Generic "Back" button]
 msgid "Back"
 msgstr ""
 
-#: sabnzbd/interface.py:2358
+#: sabnzbd/interface.py:2343
 msgid "Job \"%s\" was re-added to the queue"
 msgstr ""
 
-#: sabnzbd/interface.py:2443
+#: sabnzbd/interface.py:2428
 msgid "Jobs marked with a '*' will not be automatically downloaded."
 msgstr ""
 
-#: sabnzbd/interface.py:2443 # sabnzbd/skintext.py:473 [Config->RSS section header]
+#: sabnzbd/interface.py:2428 # sabnzbd/skintext.py:473 [Config->RSS section header]
 msgid "Matched"
 msgstr ""
 
-#: sabnzbd/interface.py:2444
+#: sabnzbd/interface.py:2429
 msgid "Not matched"
 msgstr ""
 
-#: sabnzbd/interface.py:2444 # sabnzbd/skintext.py:475 [Config->RSS section header]
+#: sabnzbd/interface.py:2429 # sabnzbd/skintext.py:475 [Config->RSS section header]
 msgid "Downloaded"
 msgstr ""
 
-#: sabnzbd/interface.py:2462
+#: sabnzbd/interface.py:2447
 msgid "Downloaded so far"
 msgstr ""
 
-#: sabnzbd/interface.py:2504
+#: sabnzbd/interface.py:2492
 msgid "Incorrect value for %s: %s"
 msgstr ""
 
@@ -710,7 +710,7 @@ msgstr ""
 msgid "[%s] Joined %s files"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:404 # sabnzbd/newsunpack.py:689
+#: sabnzbd/newsunpack.py:404 # sabnzbd/newsunpack.py:688
 msgid "Unpacking failed, %s"
 msgstr ""
 
@@ -723,145 +723,145 @@ msgid "Error \"%s\" while running rar_unpack on %s"
 msgstr ""
 
 #: sabnzbd/newsunpack.py:423 [Warning message] # sabnzbd/newsunpack.py:432 [Warning message]
-#: sabnzbd/newsunpack.py:674 [Warning message] # sabnzbd/newsunpack.py:684 [Warning message]
-#: sabnzbd/newsunpack.py:781 [Warning message] # sabnzbd/newsunpack.py:791 [Warning message]
-#: sabnzbd/newsunpack.py:798 [Warning message] # sabnzbd/newsunpack.py:805 [Warning message]
-#: sabnzbd/newsunpack.py:820 [Warning message]
+#: sabnzbd/newsunpack.py:673 [Warning message] # sabnzbd/newsunpack.py:683 [Warning message]
+#: sabnzbd/newsunpack.py:780 [Warning message] # sabnzbd/newsunpack.py:790 [Warning message]
+#: sabnzbd/newsunpack.py:797 [Warning message] # sabnzbd/newsunpack.py:804 [Warning message]
+#: sabnzbd/newsunpack.py:819 [Warning message]
 msgid "Deleting %s failed!"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:524 # sabnzbd/newsunpack.py:544
-#: sabnzbd/newsunpack.py:649
+#: sabnzbd/newsunpack.py:523 # sabnzbd/newsunpack.py:543
+#: sabnzbd/newsunpack.py:648
 msgid "Unpacking"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:548 # sabnzbd/newsunpack.py:549
+#: sabnzbd/newsunpack.py:547 # sabnzbd/newsunpack.py:548
 msgid "Unpacking failed, unable to find %s"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:551 [Warning message]
+#: sabnzbd/newsunpack.py:550 [Warning message]
 msgid "ERROR: unable to find \"%s\""
 msgstr ""
 
-#: sabnzbd/newsunpack.py:556
+#: sabnzbd/newsunpack.py:555
 msgid "Unpacking failed, CRC error"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:557 # sabnzbd/newsunpack.py:559 [Warning message]
+#: sabnzbd/newsunpack.py:556 # sabnzbd/newsunpack.py:558 [Warning message]
 msgid "ERROR: CRC failed in \"%s\""
 msgstr ""
 
-#: sabnzbd/newsunpack.py:563 # sabnzbd/newsunpack.py:564
+#: sabnzbd/newsunpack.py:562 # sabnzbd/newsunpack.py:563
 msgid "Unpacking failed, write error or disk is full?"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:566 [Warning message]
+#: sabnzbd/newsunpack.py:565 [Warning message]
 msgid "ERROR: write error (%s)"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:570
+#: sabnzbd/newsunpack.py:569
 msgid "Unpacking failed, see log"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:571 [Warning message] # sabnzbd/newsunpack.py:572
+#: sabnzbd/newsunpack.py:570 [Warning message] # sabnzbd/newsunpack.py:571
 msgid "ERROR: %s"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:578 # sabnzbd/newsunpack.py:579
-#: sabnzbd/newsunpack.py:581 [Error message]
+#: sabnzbd/newsunpack.py:577 # sabnzbd/newsunpack.py:578
+#: sabnzbd/newsunpack.py:580 [Error message]
 msgid "Unpacking failed, archive requires a password"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:615
+#: sabnzbd/newsunpack.py:614
 msgid "Missing expected file: %s => unrar error?"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:618
+#: sabnzbd/newsunpack.py:617
 msgid "Unpacking failed, an expected file was not unpacked"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:620
+#: sabnzbd/newsunpack.py:619
 msgid "Unpacking failed, these file(s) are missing:"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:627
+#: sabnzbd/newsunpack.py:626
 msgid "Unpacked %s files/folders in %s"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:661
+#: sabnzbd/newsunpack.py:660
 msgid "%s files in %s"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:690 [Error message]
+#: sabnzbd/newsunpack.py:689 [Error message]
 msgid "Error \"%s\" while running unzip() on %s"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:728
+#: sabnzbd/newsunpack.py:727
 msgid "Quick Checking"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:728 # sabnzbd/newsunpack.py:740 # sabnzbd/skintext.py:27 [PP phase "repair"]
+#: sabnzbd/newsunpack.py:727 # sabnzbd/newsunpack.py:739 # sabnzbd/skintext.py:27 [PP phase "repair"]
 #: sabnzbd/skintext.py:246
 msgid "Repair"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:732
+#: sabnzbd/newsunpack.py:731
 msgid "[%s] Quick Check OK"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:740
+#: sabnzbd/newsunpack.py:739
 msgid "Starting Repair"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:764 # sabnzbd/newsunpack.py:823
+#: sabnzbd/newsunpack.py:763 # sabnzbd/newsunpack.py:822
 msgid "Repairing failed, %s"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:765 [Error message]
+#: sabnzbd/newsunpack.py:764 [Error message]
 msgid "Error %s while running par2_repair on set %s"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:824 [Error message]
+#: sabnzbd/newsunpack.py:823 [Error message]
 msgid "Error \"%s\" while running par2_repair on set %s"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:902
+#: sabnzbd/newsunpack.py:901
 msgid "[%s] PAR2 received incorrect options, check your Config->Switches settings"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:907
+#: sabnzbd/newsunpack.py:906
 msgid "[%s] Verified in %s, all files correct"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:914
+#: sabnzbd/newsunpack.py:913
 msgid "[%s] Verified in %s, repair is required"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:923
+#: sabnzbd/newsunpack.py:922
 msgid "Main packet not found..."
 msgstr ""
 
-#: sabnzbd/newsunpack.py:977 # sabnzbd/newsunpack.py:1009
+#: sabnzbd/newsunpack.py:976 # sabnzbd/newsunpack.py:1008
 msgid "Repair failed, not enough repair blocks (%s short)"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:1004
+#: sabnzbd/newsunpack.py:1003
 msgid "Fetching %s blocks..."
 msgstr ""
 
-#: sabnzbd/newsunpack.py:1006
+#: sabnzbd/newsunpack.py:1005
 msgid "Fetching"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:1018 # sabnzbd/newsunpack.py:1023
+#: sabnzbd/newsunpack.py:1017 # sabnzbd/newsunpack.py:1022
 msgid "Repairing"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:1027
+#: sabnzbd/newsunpack.py:1026
 msgid "[%s] Repaired in %s"
 msgstr ""
 
-#: sabnzbd/newsunpack.py:1045 # sabnzbd/newsunpack.py:1063
+#: sabnzbd/newsunpack.py:1044 # sabnzbd/newsunpack.py:1062
 msgid "Verifying"
 msgstr ""
 
@@ -873,7 +873,7 @@ msgstr ""
 msgid "Failed to update newzbin job %s"
 msgstr ""
 
-#: sabnzbd/newzbin.py:138 # sabnzbd/nzbqueue.py:329
+#: sabnzbd/newzbin.py:138 # sabnzbd/nzbqueue.py:330
 msgid "NZB added to queue"
 msgstr ""
 
@@ -909,19 +909,19 @@ msgstr ""
 msgid "Newzbin gives undocumented error code (%s)"
 msgstr ""
 
-#: sabnzbd/nzbqueue.py:77 [Error message]
+#: sabnzbd/nzbqueue.py:78 [Error message]
 msgid "Incompatible queuefile found, cannot proceed"
 msgstr ""
 
-#: sabnzbd/nzbqueue.py:83 [Error message]
+#: sabnzbd/nzbqueue.py:84 [Error message]
 msgid "Error loading %s, corrupt file detected"
 msgstr ""
 
-#: sabnzbd/nzbqueue.py:237 [Error message]
+#: sabnzbd/nzbqueue.py:238 [Error message]
 msgid "Error while adding %s, removing"
 msgstr ""
 
-#: sabnzbd/nzbqueue.py:685 [Warning message]
+#: sabnzbd/nzbqueue.py:687 [Warning message]
 msgid "%s -> Unknown encoding"
 msgstr ""
 
@@ -1217,8 +1217,8 @@ msgstr ""
 msgid "Failed"
 msgstr ""
 
-#: sabnzbd/skintext.py:34 [PP status] # sabnzbd/skintext.py:95 ["Queued" used to show amount of jobs] # sabnzbd/skintext.py:126
-msgid "Queued"
+#: sabnzbd/skintext.py:34 [PP status]
+msgid "Waiting"
 msgstr ""
 
 #: sabnzbd/skintext.py:36 [PP status]
@@ -1385,6 +1385,10 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
+#: sabnzbd/skintext.py:95 ["Queued" used to show amount of jobs] # sabnzbd/skintext.py:126
+msgid "Queued"
+msgstr ""
+
 #: sabnzbd/skintext.py:97 [Generic "Delete" button, short form] # sabnzbd/skintext.py:472 [Config->RSS button "Delete filter"] # sabnzbd/skintext.py:535
 msgid "X"
 msgstr ""

sabnzbd/skintext.py

@@ -31,7 +31,7 @@ SKIN_TEXT = {
 
     'post-Completed'     : TT('Completed'), #: PP status
     'post-Failed'        : TT('Failed'), #: PP status
-    'post-Queued'        : TT('Queued'), #: PP status
+    'post-Queued'        : TT('Waiting'), #: PP status
     'post-Paused'        : TT('Paused'), #: PP status
     'post-Repairing'     : TT('Repairing...'), #: PP status
     'post-Extracting'    : TT('Extracting...'), #: PP status