wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n html tags fixes only to kdepim

Browse Source 
svn path=/trunk/KDE/kdepim/; revision=702957
wilder-work
Arto Hytnen 19 years ago
parent 421c83769c
commit 86916891d9
17 changed files with 36 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      antispamwizard.cpp
  2. 8
      callback.cpp
  3. 6
      configuredialog.cpp
  4. 10
      htmlstatusbar.cpp
  5. 2
      identitydialog.cpp
  6. 2
      kmacctlocal.cpp
  7. 2
      kmailicalifaceimpl.cpp
  8. 2
      kmcommands.cpp
  9. 2
      kmfilter.cpp
  10. 2
      kmfolder.cpp
  11. 4
      kmheaders.cpp
  12. 8
      kmkernel.cpp
  13. 4
      kmmainwidget.cpp
  14. 4
      kmpopfiltercnfrmdlg.cpp
  15. 4
      messagecomposer.cpp
  16. 2
      objecttreeparser.cpp
  17. 2
      xfaceconfigurator.cpp

8
antispamwizard.cpp
Unescape View File

@ -576,10 +576,10 @@ void AntiSpamWizard::slotBuildSummary()
text = i18n( "<p>Messages classified as spam are not marked as read." );
if ( mSpamRulesPage->moveSpamSelected() )
text += i18n( "<br>Spam messages are moved into the folder named <i>" )
text += i18n( "<br />Spam messages are moved into the folder named <i>" )
+ mSpamRulesPage->selectedSpamFolderName() + "</i>.</p>";
else
text += i18n( "<br>Spam messages are not moved into a certain folder.</p>" );
text += i18n( "<br />Spam messages are not moved into a certain folder.</p>" );
for ( QList<SpamToolConfig>::Iterator it = mToolList.begin();
it != mToolList.end(); ++it ) {
@ -897,7 +897,7 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode,
"the responsiveness of KMail because anti-virus tool "
"operations are usually time consuming; please consider "
"deleting the filter rules created by the wizard to get "
"back to the former behavior."
"back to the former behavior.</p>"
) );
mIntroText->setWordWrap(true);
layout->addWidget( mIntroText );
@ -994,7 +994,7 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( QWidget * parent, const char * name,
i18n( "The default folder is the inbox folder, but you may change that "
"in the folder view below.<p>"
"Not all tools support a classification as unsure. If you haven't "
"selected a capable tool, you can't select a folder as well.") );
"selected a capable tool, you can't select a folder as well.</p>") );
layout->addWidget( mMoveUnsureRules );
mFolderReqForUnsureFolder = new FolderRequester( this, mainFolderTree );

8
callback.cpp
Unescape View File

@ -176,14 +176,14 @@ QString Callback::receiver() const
QString selectMessage;
if ( found == 0 ) {
selectMessage = i18n("<qt>None of your identities match the "
"receiver of this message,<br>please "
"receiver of this message,<br />please "
"choose which of the following addresses "
"is yours, if any:");
"is yours, if any:</qt>");
} else {
selectMessage = i18n("<qt>Several of your identities match the "
"receiver of this message,<br>please "
"receiver of this message,<br />please "
"choose which of the following addresses "
"is yours:");
"is yours:</qt>");
}
mReceiver = KInputDialog::getItem(

6
configuredialog.cpp
Unescape View File

@ -3096,7 +3096,7 @@ ComposerPagePhrasesTab::ComposerPagePhrasesTab( QWidget * parent )
// row 0: help text
glay->addWidget( new QLabel( i18n("<qt>The following placeholders are "
"supported in the reply phrases:<br>"
"supported in the reply phrases:<br />"
"<table>"
"<tr><td><b>%D</b>: date</td>"
"<td><b>%S</b>: subject</td>"
@ -5252,11 +5252,11 @@ void MiscPageGroupwareTab::slotLegacyBodyInvitesToggled( bool on )
"a mail. This switch changes the invitation mails to "
"be sent in the text of the mail instead; this is "
"necessary to send invitations and replies to "
"Microsoft Outlook.<br>But, when you do this, you no "
"Microsoft Outlook.<br />But, when you do this, you no "
"longer get descriptive text that mail programs "
"can read; so, to people who have email programs "
"that do not understand the invitations, the "
"resulting messages look very odd.<br>People that have email "
"resulting messages look very odd.<br />People that have email "
"programs that do understand invitations will still "
"be able to work with this.</qt>" );
KMessageBox::information( this, txt, QString(),

10
htmlstatusbar.cpp
Unescape View File

@ -90,12 +90,12 @@ void KMail::HtmlStatusBar::setMode( Mode m ) {
QString KMail::HtmlStatusBar::message() const {
switch ( mode() ) {
case Html: // bold: "HTML Message"
return i18n( "<qt><b><br>H<br>T<br>M<br>L<br> "
"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>" );
return i18n( "<qt><b><br />H<br />T<br />M<br />L<br /> "
"<br />M<br />e<br />s<br />s<br />a<br />g<br />e</b></qt>" );
case Normal: // normal: "No HTML Message"
return i18n( "<qt><br>N<br>o<br> "
"<br>H<br>T<br>M<br>L<br> "
"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>" );
return i18n( "<qt><br />N<br />o<br /> "
"<br />H<br />T<br />M<br />L<br /> "
"<br />M<br />e<br />s<br />s<br />a<br />g<br />e</qt>" );
default:
case Neutral:
return QString();

2
identitydialog.cpp
Unescape View File

@ -221,7 +221,7 @@ namespace KMail {
"<p>You can leave this blank, but KMail will not be able "
"to encrypt copies of outgoing messages to you using OpenPGP; "
"normal mail functions will not be affected.</p>"
"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>");
"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>");
label = new QLabel( i18n("OpenPGP encryption key:"), tab );
label->setBuddy( mPGPEncryptionKeyRequester );
mPGPEncryptionKeyRequester->setWhatsThis( msg );

2
kmacctlocal.cpp
Unescape View File

@ -236,7 +236,7 @@ void KMAcctLocal::postProcess()
if ( rc != 0 ) {
KMessageBox::queuedMessageBox( 0, KMessageBox::Information,
i18n( "<qt>Cannot remove mail from "
"mailbox <b>%1</b>:<br>%2</qt>" ,
"mailbox <b>%1</b>:<br />%2</qt>" ,
mMailFolder->location() ,
strerror( rc ) ) );
}

2
kmailicalifaceimpl.cpp
Unescape View File

@ -1678,7 +1678,7 @@ void KMailICalIfaceImpl::readConfig()
operations += "</ul>";
msg = i18n("<qt>KMail found the following groupware folders in %1 and needs to perform the following operations: %2"
"<br>If you do not want this, cancel"
"<br />If you do not want this, cancel"
" and the IMAP resource will be disabled", parentFolderName, operations);
}

2
kmcommands.cpp
Unescape View File

@ -636,7 +636,7 @@ KMCommand::Result KMUrlSaveCommand::execute()
if ( KIO::NetAccess::exists( saveUrl, KIO::NetAccess::DestinationSide, parentWidget() ) )
{
if (KMessageBox::warningContinueCancel(0,
i18n("<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>",
i18n("<qt>File <b>%1</b> exists.<br />Do you want to replace it?</qt>",
saveUrl.prettyUrl()), i18n("Save to File"), KGuiItem(i18n("&Replace")))
!= KMessageBox::Continue)
return Canceled;

2
kmfilter.cpp
Unescape View File

@ -300,7 +300,7 @@ void KMFilter::readConfig(KConfigGroup & config)
}
} else
KMessageBox::information( 0 /* app-global modal dialog box */,
i18n("<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring it.</qt>",
i18n("<qt>Unknown filter action <b>%1</b><br />in filter rule <b>%2</b>.<br />Ignoring it.</qt>",
config.readEntry( actName, QString() ) ,
mPattern.name() ) );
}

2
kmfolder.cpp
Unescape View File

@ -80,7 +80,7 @@ KMFolder::KMFolder( KMFolderDir* aParent, const QString& aFolderName,
dirinfo.setFile( mStorage->location() );
if ( !dirinfo.exists() ) {
int rc = mStorage->create();
QString msg = i18n("<qt>Error while creating file <b>%1</b>:<br>%2</qt>", aFolderName, strerror(rc));
QString msg = i18n("<qt>Error while creating file <b>%1</b>:<br />%2</qt>", aFolderName, strerror(rc));
if ( rc ) {
KMessageBox::information(0, msg);
}

4
kmheaders.cpp
Unescape View File

@ -1566,9 +1566,9 @@ void KMHeaders::moveMsgToFolder ( KMFolder* destFolder, bool askForConfirmation
if ( msgList.isEmpty( ) ) return;
if ( !destFolder && askForConfirmation && // messages shall be deleted
KMessageBox::warningContinueCancel(this,
i18np("<qt>Do you really want to delete the selected message?<br>"
i18np("<qt>Do you really want to delete the selected message?<br />"
"Once deleted, it cannot be restored.</qt>",
"<qt>Do you really want to delete the %1 selected messages?<br>"
"<qt>Do you really want to delete the %1 selected messages?<br />"
"Once deleted, they cannot be restored.</qt>", msgList.count() ),
msgList.count()>1 ? i18n("Delete Messages") : i18n("Delete Message"), KStandardGuiItem::del(), KStandardGuiItem::cancel(),
"NoConfirmDelete") == KMessageBox::Cancel )

8
kmkernel.cpp
Unescape View File

@ -1700,11 +1700,11 @@ bool KMKernel::transferMail( QString & destinationDir )
"<qt>The <i>%4</i> folder exists. "
"%1 now uses the <i>%5</i> folder for "
"its messages.<p>"
"%2 can move the contents of <i>%6<i> into this folder for "
"%2 can move the contents of <i>%6</i> into this folder for "
"you, though this may replace any existing files with "
"the same name in <i>%7</i>.<p>"
"the same name in <i>%7</i>.</p><p>"
"<strong>Would you like %3 to move the mail "
"files now?</strong></qt>" )
"files now?</strong></p></qt>" )
.subs( kmailName ).subs( kmailName ).subs( kmailName )
.subs( dir ).subs( destinationDir ).subs( dir ).subs( destinationDir )
.toString();
@ -1716,7 +1716,7 @@ bool KMKernel::transferMail( QString & destinationDir )
"its messages. %2 can move the contents of <i>%6</i> into "
"this folder for you.<p>"
"<strong>Would you like %3 to move the mail "
"files now?</strong></qt>" )
"files now?</strong></p></qt>" )
.subs( kmailName ).subs( kmailName ).subs( kmailName )
.subs( dir ).subs( destinationDir ).subs( dir )
.toString();

4
kmmainwidget.cpp
Unescape View File

@ -970,7 +970,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck,
if ( GlobalSettings::self()->verboseNewMailNotification() ) {
summary = i18nc( "%1 is a list of the number of new messages per folder",
"<b>New mail arrived</b><br>%1" ,
"<b>New mail arrived</b><br />%1" ,
summary );
}
else {
@ -1216,7 +1216,7 @@ void KMMainWidget::slotRemoveFolder()
QString title;
if ( mFolder->folderType() == KMFolderTypeSearch ) {
title = i18n("Delete Search");
str = i18n("<qt>Are you sure you want to delete the search <b>%1</b>?<br>"
str = i18n("<qt>Are you sure you want to delete the search <b>%1</b>?<br />"
"Any messages it shows will still be available in their original folder.</qt>",
Qt::escape( mFolder->label() ) );
} else {

4
kmpopfiltercnfrmdlg.cpp
Unescape View File

@ -307,8 +307,8 @@ KMPopFilterCnfrmDlg::KMPopFilterCnfrmDlg( const QList<KMPopHeaders *> & aHeaders
vbl->setMargin(0);
QLabel *l = new QLabel(i18n("Messages to filter found on POP Account: <b>%1</b><p>"
"The messages shown exceed the maximum size limit you defined for this account.<br>You can select "
"what you want to do with them by checking the appropriate button.", aAccount), w);
"The messages shown exceed the maximum size limit you defined for this account.<br />You can select "
"what you want to do with them by checking the appropriate button.</p>", aAccount), w);
vbl->addWidget(l);
Q3GroupBox *upperBox = new Q3GroupBox(i18n("Messages Exceeding Size"), w);

4
messagecomposer.cpp
Unescape View File

@ -2126,7 +2126,7 @@ bool MessageComposer::processStructuringInfo( const QString bugURL,
KMessageBox::sorry( mComposeWin,
i18n( "<qt><p>Error: The backend did not return "
"any encoded data.</p>"
"<p>Please report this bug:<br>%1</p></qt>" ,
"<p>Please report this bug:<br />%1</p></qt>" ,
bugURL ) );
bOk = false;
}
@ -2205,7 +2205,7 @@ QByteArray MessageComposer::breakLinesAndApplyCodec() const
bool anyway = ( KMessageBox::warningYesNo(
mComposeWin,
i18n("<qt>Not all characters fit into the chosen"
" encoding.<br><br>Send the message anyway?</qt>"),
" encoding.<br /><br />Send the message anyway?</qt>"),
i18n("Some Characters Will Be Lost"),
KGuiItem ( i18n("Lose Characters") ),
KGuiItem( i18n("Change Encoding") ) ) == KMessageBox::Yes );

2
objecttreeparser.cpp
Unescape View File

@ -1437,7 +1437,7 @@ namespace KMail {
const GpgME::ImportResult res
= smimeCrypto->importCertificate( certData.data(), certData.size() );
if ( res.error() ) {
htmlWriter()->queue( i18n( "Sorry, certificate could not be imported.<br>"
htmlWriter()->queue( i18n( "Sorry, certificate could not be imported.<br />"
"Reason: %1", QString::fromLocal8Bit( res.error().asString() ) ) );
return true;
}

2
xfaceconfigurator.cpp
Unescape View File

@ -173,7 +173,7 @@ namespace KMail {
label1 = new QLabel( i18n("<qt>KMail can send a small (48x48 pixels), low-quality, "
"monochrome picture with every message. "
"For example, this could be a picture of you or a glyph. "
"It is shown in the recipient's mail client (if supported)." ), page );
"It is shown in the recipient's mail client (if supported).</qt>" ), page );
label1->setAlignment( Qt::AlignVCenter );
label1->setWordWrap( true );
page_vlay->addWidget( label1 );

Write Preview
Loading…
Cancel
Save