[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-30 21:44:10
Message-ID: 1222811050.238425.6938.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 866449 by bbroeksema:

EBN Fixes: validity of i18n calls.


 M  +1 -1      accountdialog.cpp  
 M  +3 -3      callback.cpp  
 M  +1 -1      headerlistquicksearch.cpp  
 M  +5 -3      kmacctimap.cpp  
 M  +2 -1      kmfolderimap.cpp  
 M  +6 -5      kmheaders.cpp  
 M  +1 -1      newfolderdialog.cpp  
 M  +3 -3      vacation.cpp  


--- trunk/KDE/kdepim/kmail/accountdialog.cpp #866448:866449
@@ -778,7 +778,7 @@
   if( acctFolder == 0 )
   {
     folderCombo->addItem( i18nc("Placeholder for the case that there is no folder."
-      , "<none>") );
+      , "<placeholder>none</placeholder>") );
   }
   else
   {
--- trunk/KDE/kdepim/kmail/callback.cpp #866448:866449
@@ -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 );
     }
--- trunk/KDE/kdepim/kmail/headerlistquicksearch.cpp #866448:866449
@@ -57,7 +57,7 @@
     mComboStatusCount( 0 ), mFilterWithTag( false ), mTagLabel() 
 
 {
-  setClickMessage( i18n("Search") );
+  setClickMessage( i18nc("Search for messages.","Search") );
 
   parent->layout()->addWidget( this );
 
--- trunk/KDE/kdepim/kmail/kmacctimap.cpp #866448:866449
@@ -301,7 +301,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() );
@@ -398,7 +398,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--;
 
@@ -603,7 +604,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
--- trunk/KDE/kdepim/kmail/kmfolderimap.cpp #866448:866449
@@ -861,7 +861,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] );
--- trunk/KDE/kdepim/kmail/kmheaders.cpp #866448:866449
@@ -142,7 +142,7 @@
   QAction* act = mPopup->addAction(i18n("Status"));
   act->setCheckable(true);
   mColumns.insert(act, KPaintInfo::COL_STATUS);
-  act = mPopup->addAction(i18n("Important"));
+  act = mPopup->addAction(i18nc("@action:inmenu Mark message as important.", \
"Important"));  act->setCheckable(true);
   mColumns.insert(act, KPaintInfo::COL_IMPORTANT);
   act = mPopup->addAction(i18n("Action Item"));
@@ -207,7 +207,7 @@
   header()->setStretchEnabled( false );
   header()->setResizeEnabled( false );
 
-  mPaintInfo.subCol      = addColumn( i18n("Subject"), 310 );
+  mPaintInfo.subCol      = addColumn( i18nc("@title:column Subject of message.", \
"Subject"), 310 );  mPaintInfo.senderCol   = addColumn( i18n("Sender"),  170 );
   mPaintInfo.dateCol     = addColumn( i18n("Date"),    170 );
   mPaintInfo.sizeCol     = addColumn( i18n("Size"),      0 );
@@ -787,7 +787,7 @@
       colText = i18n( "Date (Order of Arrival)" );
     setColumnText( mPaintInfo.dateCol, colText);
 
-    colText = i18n( "Subject" );
+    colText = i18nc( "@title:column Subject of email.", "Subject" );
     if (mPaintInfo.status)
       colText = colText + i18n( " (Status)" );
     setColumnText( mPaintInfo.subCol, colText);
@@ -1409,7 +1409,8 @@
   if ( static_cast<KMFolder*>(mFolder) == kmkernel->outboxFolder() )
     str = unread ? i18np( "1 unsent", "%1 unsent", unread ) : i18n( "0 unsent" );
   else
-    str = unread ? i18np( "1 unread", "%1 unread", unread ) : i18n( "0 unread" );
+    str = unread ? i18ncp( "Number of unread messages.", "1 unread", "%1 unread", \
unread ) +      : i18nc( "No unread messages.", "0 unread" );
   const int count = mFolder->count();
   str = count ? i18np( "1 message, %2.", "%1 messages, %2.", count, str )
               : i18n( "0 messages" ); // no need for "0 unread" to be added here
@@ -2663,7 +2664,7 @@
       colText = i18n( "Date (Order of Arrival)" );
     setColumnText( mPaintInfo.dateCol, colText);
 
-    colText = i18n( "Subject" );
+    colText = i18nc( "@title:column Subject of the email.", "Subject" );
     if (mPaintInfo.status)
       colText = colText + i18n( " (Status)" );
     setColumnText( mPaintInfo.subCol, colText);
--- trunk/KDE/kdepim/kmail/newfolderdialog.cpp #866448:866449
@@ -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 );
--- trunk/KDE/kdepim/kmail/vacation.cpp #866448:866449
@@ -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]