From 1080d6019efe5f674fbd50307effcb1593439771 Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Tue, 13 Jul 2004 22:10:40 +0000 Subject: [PATCH] Revert compound stuff - no time left for discussion svn path=/trunk/kdepim/; revision=328950 --- configuredialog.cpp | 2 +- imapaccountbase.cpp | 2 +- kmreaderwin.cpp | 2 +- kmsender.cpp | 2 +- kmtransport.cpp | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configuredialog.cpp b/configuredialog.cpp index c5a09b42c..d90869a61 100644 --- a/configuredialog.cpp +++ b/configuredialog.cpp @@ -2329,7 +2329,7 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( QWidget * parent, const char * n mEditorRequester, SLOT(setEnabled(bool)) ); label = new QLabel( i18n("%f 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)) ); diff --git a/imapaccountbase.cpp b/imapaccountbase.cpp index 0e9d575ff..a5f1a5ef7 100644 --- a/imapaccountbase.cpp +++ b/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, diff --git a/kmreaderwin.cpp b/kmreaderwin.cpp index 4b5774d49..299ef81a7 100644 --- a/kmreaderwin.cpp +++ b/kmreaderwin.cpp @@ -1870,7 +1870,7 @@ void KMReaderWin::openAttachment( int id, const QString & name ) { "

Open attachment '%5'?

" "

Warning: 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).

" + "filename it seems to be of type '%3' (%4).

" "

Note that opening an attachment may compromise your " "system's security.

") .arg( KMimeType::mimeType( contentTypeStr )->comment(), diff --git a/kmsender.cpp b/kmsender.cpp index 0f8acc117..d68e84d40 100644 --- a/kmsender.cpp +++ b/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 ) diff --git a/kmtransport.cpp b/kmtransport.cpp index ce4ce5669..b98ac2de9 100644 --- a/kmtransport.cpp +++ b/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." "

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 );