[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/kdepim/kmail-soc
From: Thomas McGuire <mcguire () kde ! org>
Date: 2008-11-04 20:29:03
Message-ID: 1225830543.180577.12452.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 880128 by tmcguire:
Merged revisions 866449 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/trunk/KDE/kdepim
........
r866449 | bbroeksema | 2008-09-30 23:44:07 +0200 (Tue, 30 Sep 2008) | 2 lines
EBN Fixes: validity of i18n calls.
........
_M . (directory)
M +1 -1 kmail/accountdialog.cpp
M +3 -3 kmail/callback.cpp
M +5 -3 kmail/kmacctimap.cpp
M +2 -1 kmail/kmfolderimap.cpp
M +3 -3 kmail/messagelistview/core/widgetbase.cpp
M +1 -1 kmail/newfolderdialog.cpp
M +3 -3 kmail/vacation.cpp
** branches/kdepim/kmail-soc #property svnmerge-integrated
- /trunk/KDE/kdepim:1-809847,809850-809958,809960-809966,809968-809980,809982-80998 \
5,809988-809995,809997-810000,810002-810007,810009-810040,810042,810045-810047,810049- \
810057,810059-817874,817876-819282,819284-819632,819634-820669,820671-822014,822016-82 \
2985,822987-823622,823624-823979,823981-824406,824408-826710,826712-827255,827257-8273 \
76,827378-827382,827384-827390,827392-827402,827404-828589,828591-855397,855424-856741 \
,856802-858097,858138-861197,861317-861351,861369-866448,866450-866597,866599-866769,8 \
66771-867006,867008-867066,867068-867917,867919-868155,868157-868194,868196-868662,868 \
664-868766,869039-869171,869173-869729,869731-869878,869880-869930,869932-870341,87034 \
3-870354,870356-870369,870372-870373,870375-870617,870619-870889,870891-871135,871137-871535
+ /trunk/KDE/kdepim:1-809847,809850-809958,809960-809966,809968-809980,809982-809985 \
,809988-809995,809997-810000,810002-810007,810009-810040,810042,810045-810047,810049-8 \
10057,810059-817874,817876-819282,819284-819632,819634-820669,820671-822014,822016-822 \
985,822987-823622,823624-823979,823981-824406,824408-826710,826712-827255,827257-82737 \
6,827378-827382,827384-827390,827392-827402,827404-828589,828591-855397,855424-856741, \
856802-858097,858138-861197,861317-861351,861369-866597,866599-866769,866771-867006,86 \
7008-867066,867068-867917,867919-868155,868157-868194,868196-868662,868664-868766,8690 \
39-869171,869173-869729,869731-869878,869880-869930,869932-870341,870343-870354,870356-870369,870372-870373,870375-870617,870619-870889,870891-871135,871137-871535
--- branches/kdepim/kmail-soc/kmail/accountdialog.cpp #880127:880128
@@ -778,7 +778,7 @@
if( acctFolder == 0 )
{
folderCombo->addItem( i18nc("Placeholder for the case that there is no folder."
- , "<none>") );
+ , "<placeholder>none</placeholder>") );
}
else
{
--- branches/kdepim/kmail-soc/kmail/callback.cpp #880127:880128
@@ -73,11 +73,11 @@
QString tsubject = subject;
tsubject.remove( i18n( "Answer: " ) );
if ( status == QLatin1String( "cancel" ) ) {
- msg->setSubject( i18n( "Declined: %1", tsubject ) );
+ msg->setSubject( i18nc( "Not able to attend.", "Declined: %1", tsubject ) );
} else if ( status == QLatin1String("tentative") ) {
- msg->setSubject( i18n( "Tentative: %1", tsubject ) );
+ msg->setSubject( i18nc( "Unsure if it is possible to attend.", "Tentative: \
%1", tsubject ) ); } else if ( status == QLatin1String("accepted") ) {
- msg->setSubject( i18n( "Accepted: %1", tsubject ) );
+ msg->setSubject( i18nc( "Accepted the invitation.", "Accepted: %1", tsubject ) \
); } else {
msg->setSubject( subject );
}
--- branches/kdepim/kmail-soc/kmail/kmacctimap.cpp #880127:880128
@@ -300,7 +300,7 @@
mMailCheckProgressItem =
ProgressManager::createProgressItem(
"MailCheckAccount" + name(),
- i18n( "Checking account: %1", Qt::escape( name() ) ),
+ i18nc( "@info:status", "Checking account: %1", Qt::escape( name() ) ),
QString(), // status
true, // can be canceled
useSSL() || useTLS() );
@@ -397,7 +397,8 @@
if ( mMailCheckProgressItem ) {
mMailCheckProgressItem->incCompletedItems();
mMailCheckProgressItem->updateProgress();
- mMailCheckProgressItem->setStatus( folder->prettyUrl() + i18n(" completed") );
+ mMailCheckProgressItem->setStatus( folder->prettyUrl()
+ + i18nc("@info:status Number of emails retrieved.", " completed") );
}
mCountRemainChecks--;
@@ -602,7 +603,8 @@
id() );
if (filterResult == 2) {
// something went horribly wrong (out of space?)
- kmkernel->emergencyExit( i18n("Unable to process messages: " ) + \
QString::fromLocal8Bit(strerror(errno))); + kmkernel->emergencyExit(
+ i18nc( "@info:status", "Unable to process messages: " ) + \
QString::fromLocal8Bit(strerror(errno))); return 2;
}
if (msg->parent()) { // unGet this msg
--- branches/kdepim/kmail-soc/kmail/kmfolderimap.cpp #880127:880128
@@ -860,7 +860,8 @@
// update progress
account()->listDirProgressItem()->incCompletedItems();
account()->listDirProgressItem()->updateProgress();
- account()->listDirProgressItem()->setStatus( folder()->prettyUrl() + i18n(" \
completed") ); + account()->listDirProgressItem()->setStatus( \
folder()->prettyUrl() + + i18nc("@info:status Number of folders for which \
update is completed.", " completed") );
f->initializeFrom( this, subfolderPaths[i], subfolderMimeTypes[i] );
f->setChildrenState( subfolderAttributes[i] );
--- branches/kdepim/kmail-soc/kmail/messagelistview/core/widgetbase.cpp \
#880127:880128 @@ -74,7 +74,7 @@
g->setSpacing( 2 );
mSearchEdit = new KLineEdit( this );
- mSearchEdit->setClickMessage( i18n( "Enter a Search String..." ) );
+ mSearchEdit->setClickMessage( i18nc( "Search for messages.", "Search" ) );
mSearchEdit->setClearButtonShown( true );
connect( mSearchEdit, SIGNAL( textEdited( const QString & ) ),
@@ -842,14 +842,14 @@
act->setData( QVariant( static_cast< int >( \
KPIM::MessageStatus::statusForwarded().toQInt32() ) ) ); grp->addAction( act );
- act = menu->addAction( i18n( "Important" ) );
+ act = menu->addAction( i18nc( "@action:inmenu Status of a message", "Important") \
); act->setIcon( SmallIcon("emblem-important") );
act->setCheckable( true );
act->setChecked( stat.isImportant() );
act->setData( QVariant( static_cast< int >( \
KPIM::MessageStatus::statusImportant().toQInt32() ) ) ); grp->addAction( act );
- act = menu->addAction( i18n( "To Do" ) );
+ act = menu->addAction( i18n( "Action Item" ) );
act->setIcon( SmallIcon("mail-task") );
act->setCheckable( true );
act->setChecked( stat.isToAct() );
--- branches/kdepim/kmail-soc/kmail/newfolderdialog.cpp #880127:880128
@@ -82,7 +82,7 @@
mNameLabel = new QLabel( privateLayoutWidget );
mNameLabel->setObjectName( "mNameLabel" );
- mNameLabel->setText( i18n( "&Name:" ) );
+ mNameLabel->setText( i18nc( "@label:textbox Name of the new folder.", "&Name:" ) \
); mNameHBox->addWidget( mNameLabel );
mNameLineEdit = new KLineEdit( privateLayoutWidget );
--- branches/kdepim/kmail-soc/kmail/vacation.cpp #880127:880128
@@ -567,14 +567,14 @@
QString Vacation::defaultMessageText() {
return i18n( "I am out of office till %1.\n"
"\n"
- "In urgent cases, please contact Mrs. <vacation replacement>\n"
+ "In urgent cases, please contact Mrs. <placeholder>vacation \
replacement</placeholder>\n" "\n"
- "email: <email address of vacation replacement>\n"
+ "email: <placeholder>email address of vacation \
replacement</placeholder>\n" "phone: +49 711 1111 11\n"
"fax.: +49 711 1111 12\n"
"\n"
"Yours sincerely,\n"
- "-- <enter your name and email address here>\n",
+ "-- <placeholder>enter your name and email address \
here</placeholder>\n",
KGlobal::locale()->formatDate( QDate::currentDate().addDays( 1 ) ) );
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic