From 356a4abf1400e866583cad76e3fc6bea63ba5604 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Sat, 16 Dec 2006 04:47:10 +0000 Subject: [PATCH] some string cleanups. svn path=/branches/KDE/3.5/kdepim/; revision=614050 --- customtemplates.cpp | 20 ++++++++---------- kmmainwidget.cpp | 12 +++++------ templatesconfiguration.cpp | 43 +++++++++++++++----------------------- 3 files changed, 32 insertions(+), 43 deletions(-) diff --git a/customtemplates.cpp b/customtemplates.cpp index da2171e75..ecf959d27 100644 --- a/customtemplates.cpp +++ b/customtemplates.cpp @@ -91,20 +91,18 @@ CustomTemplates::CustomTemplates( QWidget *parent, const char *name ) QString help = i18n( "" - "

There you can add, edit and delete custom message " - "templates used when you " - "compose an answer to message sender or to all recipients " - "of original message, or forward message with using " - "custom template by selecting it from right mouse button " - "menu or toolbar menu. Also you can bind a keyboard combination to " - "template for faster operations.

" - "

Inside message templates you can use substitution commands " + "

Here you can add, edit, and delete custom message " + "templates to use when you compose a reply or forwarding message. " + "Create the custom template by selecting it using the right mouse " + " button menu or toolbar menu. Also, you can bind a keyboard " + "combination to the template for faster operations.

" + "

Message templates support substitution commands " "by simple typing them or selecting them from menu " "Insert command.

" - "

There are four types of custom templates: used only to " - "Reply, Reply to All, Forward message, and " + "

There are four types of custom templates: used to " + "Reply, Reply to All, Forward, and " "Universal which can be used for all kind of operations. " - "You can`t bind keyboard shortcut to Universal templates.

" + "You cannot bind keyboard shortcut to Universal templates.

" "" ); mHelp->setText( i18n( "How does this work?" ).arg( help ) ); } diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp index 915203b35..afbc5c871 100644 --- a/kmmainwidget.cpp +++ b/kmmainwidget.cpp @@ -2436,7 +2436,7 @@ void KMMainWidget::updateCustomTemplateMenus() delete mCustomForwardMapper; mCustomForwardActionMenu = - new KActionMenu( i18n("Forward with template"), + new KActionMenu( i18n("Forward with custom template"), "mail_custom_forward", actionCollection(), "custom_forward" ); QSignalMapper *mCustomForwardMapper = new QSignalMapper( this ); @@ -2445,7 +2445,7 @@ void KMMainWidget::updateCustomTemplateMenus() mForwardActionMenu->insert( mCustomForwardActionMenu ); mCustomReplyActionMenu = - new KActionMenu( i18n("Reply with template"), "mail_custom_reply", + new KActionMenu( i18n("Reply with custom template"), "mail_custom_reply", actionCollection(), "custom_reply" ); QSignalMapper *mCustomReplyMapper = new QSignalMapper( this ); connect( mCustomReplyMapper, SIGNAL( mapped( int ) ), @@ -2453,7 +2453,7 @@ void KMMainWidget::updateCustomTemplateMenus() mReplyActionMenu->insert( mCustomReplyActionMenu ); mCustomReplyAllActionMenu = - new KActionMenu( i18n("Reply to All with template"), + new KActionMenu( i18n("Reply to All with custom template"), "mail_custom_reply_all", actionCollection(), "custom_reply_all" ); QSignalMapper *mCustomReplyAllMapper = new QSignalMapper( this ); @@ -2548,15 +2548,15 @@ void KMMainWidget::updateCustomTemplateMenus() ++idx; } if ( !replyc ) { - mCustomReplyActionMenu->popupMenu()->insertItem( i18n( "(no templates)" ), 0 ); + mCustomReplyActionMenu->popupMenu()->insertItem( i18n( "(no custom templates)" ), 0 ); mCustomReplyActionMenu->popupMenu()->setItemEnabled( 0, false ); } if ( !replyallc ) { - mCustomReplyAllActionMenu->popupMenu()->insertItem( i18n( "(no templates)" ), 0 ); + mCustomReplyAllActionMenu->popupMenu()->insertItem( i18n( "(no custom templates)" ), 0 ); mCustomReplyAllActionMenu->popupMenu()->setItemEnabled( 0, false ); } if ( !forwardc ) { - mCustomForwardActionMenu->popupMenu()->insertItem( i18n( "(no templates)" ), 0 ); + mCustomForwardActionMenu->popupMenu()->insertItem( i18n( "(no custom templates)" ), 0 ); mCustomForwardActionMenu->popupMenu()->setItemEnabled( 0, false ); } diff --git a/templatesconfiguration.cpp b/templatesconfiguration.cpp index df72f2ece..f31e2873a 100644 --- a/templatesconfiguration.cpp +++ b/templatesconfiguration.cpp @@ -68,46 +68,37 @@ TemplatesConfiguration::TemplatesConfiguration( QWidget *parent, const char *nam if ( QString( name ) == "folder-templates" ) { help = i18n( "" - "

There you can input message templates used when you " - "compose new message, compose answer to message sender or to " - "all recipients mentioned in original message, or when you " - "forward message.

" - "

Inside message templates you can use substitution commands " + "

Here you can create message templates to use when you " + "compose new messages or replies, or when you forward messages.

" + "

The message templates support substitution commands " "by simple typing them or selecting them from menu " "Insert command.

" - "

Templates specified there are folder-specific. " + "

Templates specified here are folder-specific. " "They override both global templates and per-identity " - "templates.

" - "

Templates specified there are folder-specific. " - "They override both global templates and per-identity " - "templates.

" + "templates if they are specified.

" "" ); } else if ( QString( name ) == "identity-templates" ) { help = i18n( "" - "

There you can input message templates used when you " - "compose new message, compose answer to message sender or to " - "all recipients mentioned in original message, or when you " - "forward message.

" - "

Inside message templates you can use substitution commands " + "

Here you can create message templates to use when you " + "compose new messages or replies, or when you forward messages.

" + "

The message templates support substitution commands " "by simple typing them or selecting them from menu " "Insert command.

" "

Templates specified there are mail identity-wide. " - "They override global templates and being overriden by per-folder " + "They override global templates and per-folder " "templates if they are specified.

" "" ); } else { help = i18n( "" - "

There you can input message templates used when you " - "compose new message, compose answer to message sender or to " - "all recipients mentioned in original message, or when you " - "forward message.

" - "

Inside message templates you can use substitution commands " + "

Here you can create message templates to use when you " + "compose new messages or replies, or when you forward messages.

" + "

The message templates support substitution commands " "by simple typing them or selecting them from menu " "Insert command.

" - "

This is global (default) templates. They can be overriden " - "by per-identity templates and by per-folder templates " + "

This is a global (default) template. They override " + "both per-identity templates and by per-folder templates " "if they are specified.

" "" ); } @@ -311,7 +302,7 @@ void TemplatesConfiguration::loadFromFolder( QString id, uint identity ) void TemplatesConfiguration::saveToFolder( QString id ) { Templates t( id ); - + t.setTemplateNewMessage( strOrBlank( textEdit_new->text() ) ); t.setTemplateReply( strOrBlank( textEdit_reply->text() ) ); t.setTemplateReplyAll( strOrBlank( textEdit_reply_all->text() ) ); @@ -369,7 +360,7 @@ void TemplatesConfiguration::loadFromPhrases() } } -void TemplatesConfiguration::importFromPhrases() +void TemplatesConfiguration::importFromPhrases() { kdDebug() << "TemplatesConfiguration::importFromPhrases()" << endl; @@ -428,7 +419,7 @@ void TemplatesConfiguration::importFromPhrases() GlobalSettings::self()->writeConfig(); } -QString TemplatesConfiguration::convertPhrases( QString &str ) +QString TemplatesConfiguration::convertPhrases( QString &str ) { QString result; QChar ch;