[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim/kmail
From: Bertjan Broeksema <b.broeksema () home ! nl>
Date: 2008-09-22 20:27:45
Message-ID: 1222115265.415577.21805.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 863681 by bbroeksema:
EBN Fixes: validity of i18n calls. (baby steps)
M +2 -1 filterlogdlg.cpp
M +36 -36 keyresolver.cpp
M +3 -2 kmfoldercachedimap.cpp
M +6 -2 kmfoldertree.cpp
M +3 -1 snippetwidget.cpp
--- trunk/KDE/kdepim/kmail/filterlogdlg.cpp #863680:863681
@@ -147,7 +147,8 @@
// value in the QSpinBox is in KB while it's in Byte in the FilterLog
mLogMemLimitSpin->setValue( FilterLog::instance()->getMaxLogSize() / 1024 );
mLogMemLimitSpin->setSuffix( " KB" );
- mLogMemLimitSpin->setSpecialValueText( i18n("unlimited") );
+ mLogMemLimitSpin->setSpecialValueText(
+ i18nc("@label:spinbox Set the size of the logfile to unlimited.", "unlimited") \
); connect( mLogMemLimitSpin, SIGNAL(valueChanged(int)),
this, SLOT(slotChangeLogMemLimit(int)) );
mLogMemLimitSpin->setWhatsThis(
--- trunk/KDE/kdepim/kmail/keyresolver.cpp #863680:863681
@@ -541,17 +541,17 @@
const QString msg =
key.protocol() == GpgME::OpenPGP
? ( mine ? sign
- ? ki18np("<p>Your OpenPGP signing key</p><p align=center><b>%2</b> (KeyID \
0x%3)</p>" + ? ki18np("<p>Your OpenPGP signing key</p><p align=\"center\"><b>%2</b> \
(KeyID 0x%3)</p>" "<p>expires in less than a day.</p>",
- "<p>Your OpenPGP signing key</p><p align=center><b>%2</b> (KeyID 0x%3)</p>"
+ "<p>Your OpenPGP signing key</p><p align=\"center\"><b>%2</b> (KeyID 0x%3)</p>"
"<p>expires in less than %1 days.</p>")
- : ki18np("<p>Your OpenPGP encryption key</p><p align=center><b>%2</b> (KeyID \
0x%3)</p>" + : ki18np("<p>Your OpenPGP encryption key</p><p \
align=\"center\"><b>%2</b> (KeyID 0x%3)</p>" "<p>expires in less than a day.</p>",
- "<p>Your OpenPGP encryption key</p><p align=center><b>%2</b> (KeyID 0x%3)</p>"
+ "<p>Your OpenPGP encryption key</p><p align=\"center\"><b>%2</b> (KeyID \
0x%3)</p>" "<p>expires in less than %1 days.</p>")
- : ki18np("<p>The OpenPGP key for</p><p align=center><b>%2</b> (KeyID 0x%3)</p>"
+ : ki18np("<p>The OpenPGP key for</p><p align=\"center\"><b>%2</b> (KeyID \
0x%3)</p>" "<p>expires in less than a day.</p>",
- "<p>The OpenPGP key for</p><p align=center><b>%2</b> (KeyID 0x%3)</p>"
+ "<p>The OpenPGP key for</p><p align=\"center\"><b>%2</b> (KeyID 0x%3)</p>"
"<p>expires in less than %1 days.</p>") )
.subs( daysTillExpiry )
.subs( QString::fromUtf8( key.userID(0).id() ) )
@@ -560,42 +560,42 @@
: ( ca
? ( key.isRoot()
? ( mine ? sign
- ? ki18np("<p>The root certificate</p><p align=center><b>%4</b></p>"
- "<p>for your S/MIME signing certificate</p><p align=center><b>%2</b> (serial \
number %3)</p>" + ? ki18np("<p>The root certificate</p><p \
align=\"center\"><b>%4</b></p>" + "<p>for your S/MIME signing certificate</p><p \
align=\"center\"><b>%2</b> (serial number %3)</p>" "<p>expires in less than a \
day.</p>",
- "<p>The root certificate</p><p align=center><b>%4</b></p>"
- "<p>for your S/MIME signing certificate</p><p align=center><b>%2</b> (serial \
number %3)</p>" + "<p>The root certificate</p><p align=\"center\"><b>%4</b></p>"
+ "<p>for your S/MIME signing certificate</p><p align=\"center\"><b>%2</b> \
(serial number %3)</p>" "<p>expires in less than %1 days.</p>")
- : ki18np("<p>The root certificate</p><p align=center><b>%4</b></p>"
- "<p>for your S/MIME encryption certificate</p><p align=center><b>%2</b> \
(serial number %3)</p>" + : ki18np("<p>The root certificate</p><p \
align=\"center\"><b>%4</b></p>" + "<p>for your S/MIME encryption \
certificate</p><p align=\"center\"><b>%2</b> (serial number %3)</p>" "<p>expires in \
less than a day.</p>",
- "<p>The root certificate</p><p align=center><b>%4</b></p>"
- "<p>for your S/MIME encryption certificate</p><p align=center><b>%2</b> \
(serial number %3)</p>" + "<p>The root certificate</p><p \
align=\"center\"><b>%4</b></p>" + "<p>for your S/MIME encryption \
certificate</p><p align=\"center\"><b>%2</b> (serial number %3)</p>" "<p>expires in \
less than %1 days.</p>")
- : ki18np("<p>The root certificate</p><p align=center><b>%4</b></p>"
- "<p>for S/MIME certificate</p><p align=center><b>%2</b> (serial number \
%3)</p>" + : ki18np("<p>The root certificate</p><p align=\"center\"><b>%4</b></p>"
+ "<p>for S/MIME certificate</p><p align=\"center\"><b>%2</b> (serial number \
%3)</p>" "<p>expires in less than a day.</p>",
- "<p>The root certificate</p><p align=center><b>%4</b></p>"
- "<p>for S/MIME certificate</p><p align=center><b>%2</b> (serial number \
%3)</p>" + "<p>The root certificate</p><p align=\"center\"><b>%4</b></p>"
+ "<p>for S/MIME certificate</p><p align=\"center\"><b>%2</b> (serial number \
%3)</p>" "<p>expires in less than %1 days.</p>") )
: ( mine ? sign
- ? ki18np("<p>The intermediate CA certificate</p><p align=center><b>%4</b></p>"
- "<p>for your S/MIME signing certificate</p><p align=center><b>%2</b> (serial \
number %3)</p>" + ? ki18np("<p>The intermediate CA certificate</p><p \
align=\"center\"><b>%4</b></p>" + "<p>for your S/MIME signing certificate</p><p \
align=\"center\"><b>%2</b> (serial number %3)</p>" "<p>expires in less than a \
day.</p>",
- "<p>The intermediate CA certificate</p><p align=center><b>%4</b></p>"
- "<p>for your S/MIME signing certificate</p><p align=center><b>%2</b> (serial \
number %3)</p>" + "<p>The intermediate CA certificate</p><p \
align=\"center\"><b>%4</b></p>" + "<p>for your S/MIME signing certificate</p><p \
align=\"center\"><b>%2</b> (serial number %3)</p>" "<p>expires in less than %1 \
days.</p>")
- : ki18np("<p>The intermediate CA certificate</p><p align=center><b>%4</b></p>"
- "<p>for your S/MIME encryption certificate</p><p align=center><b>%2</b> \
(serial number %3)</p>" + : ki18np("<p>The intermediate CA certificate</p><p \
align=\"center\"><b>%4</b></p>" + "<p>for your S/MIME encryption \
certificate</p><p align=\"center\"><b>%2</b> (serial number %3)</p>" "<p>expires in \
less than a day.</p>",
- "<p>The intermediate CA certificate</p><p align=center><b>%4</b></p>"
- "<p>for your S/MIME encryption certificate</p><p align=center><b>%2</b> \
(serial number %3)</p>" + "<p>The intermediate CA certificate</p><p \
align=\"center\"><b>%4</b></p>" + "<p>for your S/MIME encryption \
certificate</p><p align=\"center\"><b>%2</b> (serial number %3)</p>" "<p>expires in \
less than %1 days.</p>")
- : ki18np("<p>The intermediate CA certificate</p><p align=center><b>%4</b></p>"
- "<p>for S/MIME certificate</p><p align=center><b>%2</b> (serial number \
%3)</p>" + : ki18np("<p>The intermediate CA certificate</p><p \
align=\"center\"><b>%4</b></p>" + "<p>for S/MIME certificate</p><p \
align=\"center\"><b>%2</b> (serial number %3)</p>" "<p>expires in less than a \
day.</p>",
- "<p>The intermediate CA certificate</p><p align=center><b>%4</b></p>"
- "<p>for S/MIME certificate</p><p align=center><b>%2</b> (serial number \
%3)</p>" + "<p>The intermediate CA certificate</p><p \
align=\"center\"><b>%4</b></p>" + "<p>for S/MIME certificate</p><p \
align=\"center\"><b>%2</b> (serial number %3)</p>" "<p>expires in less than %1 \
days.</p>") ) )
.subs( daysTillExpiry )
.subs( Kleo::DN( orig.userID(0).id() ).prettyDN() )
@@ -603,17 +603,17 @@
.subs( Kleo::DN( key.userID(0).id() ).prettyDN() )
.toString()
: ( mine ? sign
- ? ki18np("<p>Your S/MIME signing certificate</p><p align=center><b>%2</b> \
(serial number %3)</p>" + ? ki18np("<p>Your S/MIME signing certificate</p><p \
align=\"center\"><b>%2</b> (serial number %3)</p>" "<p>expires in less than a \
day.</p>",
- "<p>Your S/MIME signing certificate</p><p align=center><b>%2</b> (serial \
number %3)</p>" + "<p>Your S/MIME signing certificate</p><p \
align=\"center\"><b>%2</b> (serial number %3)</p>" "<p>expires in less than %1 \
days.</p>")
- : ki18np("<p>Your S/MIME encryption certificate</p><p align=center><b>%2</b> \
(serial number %3)</p>" + : ki18np("<p>Your S/MIME encryption certificate</p><p \
align=\"center\"><b>%2</b> (serial number %3)</p>" "<p>expires in less than a \
day.</p>",
- "<p>Your S/MIME encryption certificate</p><p align=center><b>%2</b> (serial \
number %3)</p>" + "<p>Your S/MIME encryption certificate</p><p \
align=\"center\"><b>%2</b> (serial number %3)</p>" "<p>expires in less than %1 \
days.</p>")
- : ki18np("<p>The S/MIME certificate for</p><p align=center><b>%2</b> (serial \
number %3)</p>" + : ki18np("<p>The S/MIME certificate for</p><p \
align=\"center\"><b>%2</b> (serial number %3)</p>" "<p>expires in less than a \
day.</p>",
- "<p>The S/MIME certificate for</p><p align=center><b>%2</b> (serial number \
%3)</p>" + "<p>The S/MIME certificate for</p><p align=\"center\"><b>%2</b> \
(serial number %3)</p>" "<p>expires in less than %1 days.</p>" ) )
.subs( daysTillExpiry )
.subs( Kleo::DN( key.userID(0).id() ).prettyDN() )
--- trunk/KDE/kdepim/kmail/kmfoldercachedimap.cpp #863680:863681
@@ -148,7 +148,8 @@
topLayout->addWidget( mIndexButton );
KHBox *hbox = new KHBox( page );
- QLabel *scopeLabel = new QLabel( i18n( "Scope:" ), hbox );
+ QLabel *scopeLabel = new QLabel(
+ i18nc( "@label:listbox Scope used when rebuilding index.","Scope:" ), hbox );
scopeLabel->setEnabled( false );
mIndexScope = new KComboBox( hbox );
mIndexScope->addItem( i18n( "Only Current Folder" ) );
@@ -1595,7 +1596,7 @@
#if MAIL_LOSS_DEBUGGING
if ( KMessageBox::warningYesNo(
0, i18n( "<qt><p>Mails on the server in folder <b>%1</b> were deleted. \
"
- "Do you want to delete them locally?<br>UIDs: %2</p></qt>",
+ "Do you want to delete them locally?</p><p>UIDs: %2</p></qt>",
folder()->prettyUrl(), uids.join(",") ) ) == KMessageBox::Yes )
#endif
removeMessages( msgsForDeletion );
--- trunk/KDE/kdepim/kmail/kmfoldertree.cpp #863680:863681
@@ -1697,7 +1697,9 @@
removeUnreadColumn();
reload();
} else {
- addUnreadColumn( i18n("Unread"), 70 );
+ addUnreadColumn(
+ i18nc( "@title:column Collumn showing the number of unread email messages."
+ , "Unread"), 70 );
reload();
}
// toggle KMenu
@@ -1710,7 +1712,9 @@
removeTotalColumn();
reload();
} else {
- addTotalColumn( i18n("Total"), 70 );
+ addTotalColumn(
+ i18nc("@title:column Collumn showing the total number of messages"
+ , "Total"), 70 );
reload(openFolders);
}
// toggle KMenu
--- trunk/KDE/kdepim/kmail/snippetwidget.cpp #863680:863681
@@ -113,7 +113,9 @@
/* still no group, let's make a default one */
if (!group ) {
if ( _list.isEmpty() ) {
- group = new SnippetGroup(this, i18n("General"), SnippetGroup::getMaxId() );
+ group = new SnippetGroup(this
+ , i18nc( "@label:listbox General group for often used snippets in mail.", \
"General") + , SnippetGroup::getMaxId() );
_list.append( group );
} else {
group = dynamic_cast<SnippetGroup*>( _list.first() );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic