CVS_SILENT i18n style guide fixes

svn path=/trunk/kdepim/; revision=386464

configuredialog.cpp

@@ -1912,7 +1912,7 @@ static const struct {
   { I18N_NOOP("Sta&ndard format (%1)"), KMime::DateFormatter::CTime },
   { I18N_NOOP("Locali&zed format (%1)"), KMime::DateFormatter::Localized },
   { I18N_NOOP("Fancy for&mat (%1)"), KMime::DateFormatter::Fancy },
-  { I18N_NOOP("C&ustom format (Shift+F1 for help)"),
+  { I18N_NOOP("C&ustom format (Shift+F1 for help):"),
     KMime::DateFormatter::Custom }
 };
 static const int numDateDisplayConfig =
@@ -4183,11 +4183,11 @@ MiscPageFolderTab::MiscPageFolderTab( QWidget * parent, const char * name )
                 "When entering a folder:"), this );
   mActionEnterFolder->insertStringList( QStringList()
       << i18n("continuation of \"When entering a folder:\"",
-              "Jump to first new message")
+              "Jump to First New Message")
       << i18n("continuation of \"When entering a folder:\"",
-              "Jump to first unread or new message")
+              "Jump to First Unread or New Message")
       << i18n("continuation of \"When entering a folder:\"",
-              "Jump to last selected message"));
+              "Jump to Last Selected Message"));
   hlay->addWidget( label );
   hlay->addWidget( mActionEnterFolder, 1 );
   connect( mActionEnterFolder, SIGNAL( activated( int ) ),

expirypropertiesdialog.cpp

@@ -94,7 +94,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo
   actionsGroup->insert( moveToRB );
   connect( moveToRB, SIGNAL( toggled( bool ) ),
            this, SLOT( slotUpdateControls() ) );
-  moveToRB->setText( i18n( "Move To" ) );
+  moveToRB->setText( i18n( "Move to:" ) );
   moveToHBox->addWidget( moveToRB );
 
   folderSelector = new KMail::FolderRequester( privateLayoutWidget, tree );

kmsearchpattern.cpp

@@ -614,7 +614,7 @@ KMMsgStatus KMSearchRuleStatus::statusFromEnglishName(
     status = KMMsgStatusSpam;
   if ( ! aStatusString.compare("Ham") )
      status = KMMsgStatusHam;
-  if ( ! aStatusString.compare("Has an Attachment") )
+  if ( ! aStatusString.compare("Has Attachment") )
      status = KMMsgStatusHasAttach;
 
   return status;

kmsearchpattern.h

@@ -233,7 +233,7 @@ namespace KMail {
     { I18N_NOOP( "Ignored" ),          "kmmsgignored"   },
     { I18N_NOOP( "Spam" ),             "mark_as_spam"   },
     { I18N_NOOP( "Ham" ),              "mark_as_ham"    },
-    { I18N_NOOP( "Has an Attachment"), "attach"         },
+    { I18N_NOOP( "Has Attachment"),    "attach"         },
     { I18N_NOOP( "To Do" ),            "kontact_todo"   }
   };
 

recipientspicker.cpp

@@ -257,7 +257,7 @@ RecipientsPicker::RecipientsPicker( QWidget *parent )
 
   QBoxLayout *resLayout = new QHBoxLayout( topLayout );
 
-  QLabel *label = new QLabel( i18n("AddressBook:"), this );
+  QLabel *label = new QLabel( i18n("Address book:"), this );
   resLayout->addWidget( label );
 
   mCollectionCombo = new QComboBox( this );