From cb094cce121acf240cbf46a4f6b03f79533c8d41 Mon Sep 17 00:00:00 2001
From: Stephan Binner <binner@kde.org>
Date: Mon, 27 Oct 2003 13:01:25 +0000
Subject: [PATCH] CVS_SILENT i18n style guide fixes

svn path=/trunk/kdepim/; revision=262437
---
 kmcommands.cpp   | 2 +-
 kmcomposewin.cpp | 2 +-
 kmfoldermgr.cpp  | 2 +-
 kmgroupware.cpp  | 2 +-
 kmkernel.cpp     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kmcommands.cpp b/kmcommands.cpp
index 75400de49..6685af80f 100644
--- a/kmcommands.cpp
+++ b/kmcommands.cpp
@@ -698,7 +698,7 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job)
     {
       if (KMessageBox::warningContinueCancel(0,
         i18n("File %1 exists.\nDo you want to replace it?")
-        .arg(mUrl.prettyURL()), i18n("Save to file"), i18n("&Replace"))
+        .arg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
         == KMessageBox::Continue) {
         mMsgListIndex = 0;
 
diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp
index e7dcac497..474e3e1ad 100644
--- a/kmcomposewin.cpp
+++ b/kmcomposewin.cpp
@@ -1734,7 +1734,7 @@ bool KMComposeWin::applyChanges( bool backgroundMode )
 							 "<p>Should this message also be "
 							 "encrypted?</p></qt>"),
 						    i18n("Encrypt Message?"),
-						    KGuiItem( i18n("Sign and &Encrypt") ),
+						    KGuiItem( i18n("Sign && &Encrypt") ),
 						    KGuiItem( i18n("&Sign Only") ) );
 	  else
 	    ret = KMessageBox::questionYesNoCancel( this,
diff --git a/kmfoldermgr.cpp b/kmfoldermgr.cpp
index 2afbf31f8..167d756d9 100644
--- a/kmfoldermgr.cpp
+++ b/kmfoldermgr.cpp
@@ -62,7 +62,7 @@ void KMFolderMgr::expireAll() {
   if (config->readBoolEntry("warn-before-expire", true)) {
     ret = KMessageBox::warningContinueCancel(KMainWindow::memberList->first(),
 			 i18n("Are you sure you want to expire old messages?"),
-			 i18n("Expire old messages?"), i18n("Expire"));
+			 i18n("Expire Old Messages?"), i18n("Expire"));
   }
 
   if (ret == KMessageBox::Continue) {
diff --git a/kmgroupware.cpp b/kmgroupware.cpp
index 141b58457..c4e04ecc9 100644
--- a/kmgroupware.cpp
+++ b/kmgroupware.cpp
@@ -335,7 +335,7 @@ void KMGroupware::processVCalRequest( const QCString& receiver,
           if( fromAddress.isEmpty() ) {
               bool bOk;
               fromAddress = KInputDialog::getItem( i18n( "Select Address" ),
-                                                   i18n( "In order to let Outlook(tm) recognize you as the receiver, you need to indicate which one of the following addresses is your email address" ),
+                                                   i18n( "In order to let Outlook(tm) recognize you as the receiver, you need to indicate which one of the following addresses is your email address:" ),
                                                    toAddresses, 0, false, &bOk,
                                                    kmkernel->mainWin() );
               if( !bOk )
diff --git a/kmkernel.cpp b/kmkernel.cpp
index ec561b835..728b3c87d 100644
--- a/kmkernel.cpp
+++ b/kmkernel.cpp
@@ -1297,7 +1297,7 @@ void KMKernel::slotResult(KIO::Job *job)
     {
       if (KMessageBox::warningContinueCancel(0,
         i18n("File %1 exists.\nDo you want to replace it?")
-        .arg((*it).url.prettyURL()), i18n("Save to file"), i18n("&Replace"))
+        .arg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace"))
         == KMessageBox::Continue)
         byteArrayToRemoteFile((*it).data, (*it).url, TRUE);
     }