Revert compound stuff - no time left for discussion

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

configuredialog.cpp

@@ -2329,7 +2329,7 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( QWidget * parent, const char * n
 	   mEditorRequester, SLOT(setEnabled(bool)) );
 
   label = new QLabel( i18n("<b>%f</b> will be replaced with the "
-			   "file name to edit."), group );
+			   "filename to edit."), group );
   label->setEnabled( false ); // see above
   connect( mExternalEditorCheck, SIGNAL(toggled(bool)),
 	   label, SLOT(setEnabled(bool)) );

imapaccountbase.cpp

@@ -240,7 +240,7 @@ namespace KMail {
       bool store = true;
       KConfigGroup passwords( KGlobal::config(), "Passwords" );
       passwords.writeEntry( "Keep", storePasswd() );
-      QString msg = i18n("You need to supply a user name and a password to "
+      QString msg = i18n("You need to supply a username and a password to "
 			 "access this mailbox.");
       mPasswordDialogIsActive = true;
       if ( PasswordDialog::getNameAndPassword( log, pass, &store, msg, false,

kmreaderwin.cpp

@@ -1870,7 +1870,7 @@ void KMReaderWin::openAttachment( int id, const QString & name ) {
                   "<qt><p>Open attachment '%5'?</p>"
                   "<p><b>Warning:</b> The message suggests that this "
                   "attachment is of type '%1' (%2), but according to the "
-                  "file name it seems to be of type '%3' (%4).</p>"
+                  "filename it seems to be of type '%3' (%4).</p>"
                   "<p>Note that opening an attachment may compromise your "
                   "system's security.</p></qt>")
              .arg( KMimeType::mimeType( contentTypeStr )->comment(),

kmsender.cpp

@@ -1049,7 +1049,7 @@ bool KMSendSMTP::send(KMMessage *aMsg)
 
       KCursorSaver idle(KBusyPtr::idle());
       result = KIO::PasswordDialog::getNameAndPassword(ti->user, ti->pass,
-	&b, i18n("You need to supply a user name and a password to use this "
+	&b, i18n("You need to supply a username and a password to use this "
 	     "SMTP server."), FALSE, QString::null, ti->name, QString::null);
 
       if ( result != QDialog::Accepted )

kmtransport.cpp

@@ -355,11 +355,11 @@ void KMTransportDialog::makeSmtpPage()
   grid->addMultiCellWidget( line, 11, 11, 0, 1 );
 
   mSmtp.specifyHostnameCheck =
-    new QCheckBox( i18n("Sen&d custom host name to server"), page1 );
+    new QCheckBox( i18n("Sen&d custom hostname to server"), page1 );
   grid->addMultiCellWidget( mSmtp.specifyHostnameCheck, 12, 12, 0, 1 );
   QWhatsThis::add(mSmtp.specifyHostnameCheck,
                   i18n("Check this option to have KMail use "
-                       "a custom host name when identifying itself "
+                       "a custom hostname when identifying itself "
                        "to the mail server."
                        "<p>This is useful when your system's hostname "
                        "may not be set correctly or to mask your "
@@ -369,7 +369,7 @@ void KMTransportDialog::makeSmtpPage()
   grid->addWidget( mSmtp.localHostnameLabel, 13, 0);
   mSmtp.localHostnameEdit = new KLineEdit( page1 );
   QWhatsThis::add(mSmtp.localHostnameEdit,
-                  i18n("Enter the host name KMail should use when "
+                  i18n("Enter the hostname KMail should use when "
                        "identifying itself to the server."));
   mSmtp.localHostnameLabel->setBuddy( mSmtp.localHostnameEdit );
   grid->addWidget( mSmtp.localHostnameEdit, 13, 1 );