Fix remaining instances of tqStatus embedded in user visible strings

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1250385 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

14 files changed, 22 insertions, 22 deletions

diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 771f7a755..549ef94de 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -1722,10 +1722,10 @@ static const struct {
   { "PGPMessageErr", I18N_NOOP("OpenPGP Message - Bad Signature") },
   { "HTMLWarningColor", I18N_NOOP("Border Around Warning Prepending HTML Messages") },
   { "CloseToQuotaColor", I18N_NOOP("Folder Name and Size When Close to Quota") },
-  { "ColorbarBackgroundPlain", I18N_NOOP("HTML tqStatus Bar Background - No HTML Message") },
-  { "ColorbarForegroundPlain", I18N_NOOP("HTML tqStatus Bar Foreground - No HTML Message") },
-  { "ColorbarBackgroundHTML",  I18N_NOOP("HTML tqStatus Bar Background - HTML Message") },
-  { "ColorbarForegroundHTML",  I18N_NOOP("HTML tqStatus Bar Foreground - HTML Message") },
+  { "ColorbarBackgroundPlain", I18N_NOOP("HTML Status Bar Background - No HTML Message") },
+  { "ColorbarForegroundPlain", I18N_NOOP("HTML Status Bar Foreground - No HTML Message") },
+  { "ColorbarBackgroundHTML",  I18N_NOOP("HTML Status Bar Background - HTML Message") },
+  { "ColorbarForegroundHTML",  I18N_NOOP("HTML Status Bar Foreground - HTML Message") },
 };
 static const int numColorNames = sizeof colorNames / sizeof *colorNames;
 
@@ -2226,7 +2226,7 @@ static const BoolConfigEntry showColorbarMode = {
 };
 
 static const BoolConfigEntry showSpamStatusMode = {
-  "Reader", "showSpamtqStatus", I18N_NOOP("Show s&pam status in fancy headers"), true
+  "Reader", "showSpamStatus", I18N_NOOP("Show s&pam status in fancy headers"), true
 };
 
 static const BoolConfigEntry showEmoticons = {
diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp
index c576cc461..4d5669a1a 100644
--- a/kmail/headerlistquicksearch.cpp
+++ b/kmail/headerlistquicksearch.cpp
@@ -70,7 +70,7 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
 
   mStatusCombo = new TQComboBox( parent, "quick search status combo box" );
   mStatusCombo->setSizeLimit( 12 );
-  mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any tqStatus") );
+  mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any Status") );
 
   insertqStatus( StatusUnread );
   insertqStatus( StatusNew );
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index 6e459c7aa..437fc3fd5 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -463,7 +463,7 @@ namespace KMail {
 
     TQString spamHTML;
 
-    if ( configReader.readBoolEntry( "showSpamtqStatus", true ) ) {
+    if ( configReader.readBoolEntry( "showSpamStatus", true ) ) {
       SpamScores scores = SpamHeaderAnalyzer::getSpamScores( message );
       for ( SpamScoresIterator it = scores.begin(); it != scores.end(); ++it )
         spamHTML += (*it).agent() + " " +
@@ -841,7 +841,7 @@ namespace KMail {
 
     if ( !spamHTML.isEmpty() )
       headerStr.append( TQString( "<div class=\"spamheader\" dir=\"%1\"><b>%2</b>&nbsp;<span style=\"padding-left: 20px;\">%3</span></div>\n")
-                        .tqarg( subjectDir, i18n("Spam tqStatus:"), spamHTML ) );
+                        .tqarg( subjectDir, i18n("Spam Status:"), spamHTML ) );
 
     headerStr += "</div>\n\n";
     return headerStr;
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index 977090dd2..5470084a8 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -1197,7 +1197,7 @@ namespace KMail {
   void ImapAccountBase::setImaptqStatus( KMFolder* folder, const TQString& path, const TQCString& flags )
   {
      // set the status on the server, the uids are integrated in the path
-     kdDebug(5006) << "setImaptqStatus path=" << path << " to: " << flags << endl;
+     kdDebug(5006) << "setImapStatus path=" << path << " to: " << flags << endl;
      KURL url = getUrl();
      url.setPath(path);
 
diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index 2a68d18f8..88424e13e 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -215,7 +215,7 @@ bool KMAcctLocal::fetchMsg()
     }
 #endif
     msg->setqStatus(msg->headerField("Status").latin1(),
-      msg->headerField("X-tqStatus").latin1());
+      msg->headerField("X-Status").latin1());
     msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0) );
     msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0));
     msg->setComplete(true);
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp
index edd580f5c..818e614d0 100644
--- a/kmail/kmacctmaildir.cpp
+++ b/kmail/kmacctmaildir.cpp
@@ -171,7 +171,7 @@ void KMAcctMaildir::processNewMail(bool)
     if (msg)
     {
       msg->setqStatus(msg->headerField("Status").latin1(),
-        msg->headerField("X-tqStatus").latin1());
+        msg->headerField("X-Status").latin1());
       msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0));
       msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0));
 
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index 8390de4f9..117e84e3b 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -800,7 +800,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString&
     {
       xmarkStr = TQCString(line+13);
     }
-    else if (strncasecmp(line, "X-tqStatus:", 9) == 0)
+    else if (strncasecmp(line, "X-Status:", 9) == 0)
     {
       statusStr = TQCString(line+9);
     }
diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index b4841491a..a53a4be1b 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -734,7 +734,7 @@ int KMFolderMbox::createIndexFromContents()
       status[i] = '\0';
       needtqStatus &= ~1;
     }
-    else if ((needtqStatus & 2) && strncasecmp(line, "X-tqStatus:", 9)==0)
+    else if ((needtqStatus & 2) && strncasecmp(line, "X-Status:", 9)==0)
     {
       for(i=0; i<4 && line[i+10] > ' '; i++)
         xstatus[i] = line[i+10];
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index c535d2c8c..987f9aa06 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -803,7 +803,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
 
     colText = i18n( "Subject" );
     if (mPaintInfo.status)
-      colText = colText + i18n( " (tqStatus)" );
+      colText = colText + i18n( " (Status)" );
     setColumnText( mPaintInfo.subCol, colText);
   }
 
@@ -2645,7 +2645,7 @@ void KMHeaders::setSorting( int column, bool ascending )
 
     colText = i18n( "Subject" );
     if (mPaintInfo.status)
-      colText = colText + i18n( " (tqStatus)" );
+      colText = colText + i18n( " (Status)" );
     setColumnText( mPaintInfo.subCol, colText);
   }
   KListView::setSorting( column, ascending );
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 88884b696..6c46f14a6 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -2689,7 +2689,7 @@ void KMMainWidget::setupActions()
   (void) new KAction( i18n("&Send Queued Messages"), "mail_send", 0, TQT_TQOBJECT(this),
 		     TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued");
 
-  (void) new KAction( i18n("Online tqStatus (unknown)"), "online_status", 0, TQT_TQOBJECT(this),
+  (void) new KAction( i18n("Online Status (unknown)"), "online_status", 0, TQT_TQOBJECT(this),
                      TQT_SLOT(slotOnlinetqStatus()), actionCollection(), "online_status");
 
   KActionMenu *sendActionMenu = new
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index 2f27c305b..1e666701d 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -337,7 +337,7 @@ TQCString KMMessage::headerAsSendableString() const
 
 void KMMessage::removePrivateHeaderFields() {
   removeHeaderField("Status");
-  removeHeaderField("X-tqStatus");
+  removeHeaderField("X-Status");
   removeHeaderField("X-KMail-EncryptionState");
   removeHeaderField("X-KMail-SignatureState");
   removeHeaderField("X-KMail-MDN-Sent");
@@ -356,7 +356,7 @@ void KMMessage::seStatusFields()
   char str[2] = { 0, 0 };
 
   setHeaderField("Status", status() & KMMsgStatusNew ? "R" : "RO");
-  setHeaderField("X-tqStatus", statusToStr(status()));
+  setHeaderField("X-Status", statusToStr(status()));
 
   str[0] = (char)encryptionState();
   setHeaderField("X-KMail-EncryptionState", str);
@@ -410,7 +410,7 @@ void KMMessage::fromDwString(const DwString& str, bool aSetqStatus)
   mMsg->Parse();
 
   if (aSetqStatus) {
-    setqStatus(headerField("Status").latin1(), headerField("X-tqStatus").latin1());
+    setqStatus(headerField("Status").latin1(), headerField("X-Status").latin1());
     setEncryptionStateChar( headerField("X-KMail-EncryptionState").at(0) );
     setSignatureStateChar(  headerField("X-KMail-SignatureState").at(0) );
     setMDNSentState( static_cast<KMMsgMDNSentState>( headerField("X-KMail-MDN-Sent").tqat(0).latin1() ) );
diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h
index b222c0b89..ebc8c78ef 100644
--- a/kmail/kmmessage.h
+++ b/kmail/kmmessage.h
@@ -667,7 +667,7 @@ public:
    */
   bool deleteBodyPart( int partIndex );
 
-  /** Set "Status" and "X-tqStatus" fields of the message from the
+  /** Set "Status" and "X-Status" fields of the message from the
    * internal message status. */
   void seStatusFields();
 
diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp
index 90f7a3a0b..f1341d6c8 100644
--- a/kmail/kmmsgbase.cpp
+++ b/kmail/kmmsgbase.cpp
@@ -269,7 +269,7 @@ void KMMsgBase::setqStatus(const KMMsgtqStatus atqStatus, int idx)
 //-----------------------------------------------------------------------------
 void KMMsgBase::setqStatus(const char* aStatusStr, const char* aXStatusStr)
 {
-  // first try to find status from "X-tqStatus" field if given
+  // first try to find status from "X-Status" field if given
   if (aXStatusStr) {
     if (strchr(aXStatusStr, 'N')) setqStatus(KMMsgStatusNew);
     if (strchr(aXStatusStr, 'U')) setqStatus(KMMsgStatusUnread);
diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp
index 5477f3f64..f21bee17f 100644
--- a/kmail/kmsearchpatternedit.cpp
+++ b/kmail/kmsearchpatternedit.cpp
@@ -37,7 +37,7 @@ static const struct {
   { "<recipients>",  I18N_NOOP( "All Recipients" )    },
   { "<size>",        I18N_NOOP( "Size in Bytes" ) },
   { "<age in days>", I18N_NOOP( "Age in Days" )   },
-  { "<status>",      I18N_NOOP( "Message tqStatus" )        },
+  { "<status>",      I18N_NOOP( "Message Status" )        },
   { "Subject",       I18N_NOOP( "Subject" )  },
   { "From",          I18N_NOOP( "From" )  },
   { "To",            I18N_NOOP( "To" )  },