[Uml-devel] KDE

[Chusslove Illich]

SVN commit 549247 by ilic:

i18n fixes.

 M  +1 -1      kdegraphics/kviewshell/plugins/pdf/pdfMultipage.cpp  
 M  +1 -1      kdenetwork/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp  
 M  +1 -2      kdenetwork/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp  
 M  +1 -1      kdenetwork/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp  
 M  +2 -4      kdenetwork/kopete/protocols/yahoo/yahooaccount.cpp  
 M  +1 -1      kdepim/kalarm/alarmcalendar.cpp  
 M  +6 -5      kdepim/kalarm/resourceselector.cpp  
 M  +1 -1      kdesdk/umbrello/umbrello/umlviewimageexporter.cpp  


--- trunk/KDE/kdegraphics/kviewshell/plugins/pdf/pdfMultipage.cpp #549246:549247
@@ -155,7 +155,7 @@
     return;
   
   // initialize the printer using the print dialog
-  if ( printer->setup(parentWdg, i18n("Print %1").arg(m_file.section('/', -1))) ) {
+  if ( printer->setup(parentWdg, i18n("Print %1", m_file.section('/', -1))) ) {
     // Now do the printing.
     QList<int> pageList = printer->pageList();
     if (pageList.isEmpty())
--- trunk/KDE/kdenetwork/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp #549246:549247
@@ -100,7 +100,7 @@
 	else
 	{
 		kDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Error opening file: " << file.errorString() << endl;
-		client()->notifyError(i18n("Error opening file: %1").arg(m_path), file.errorString(), Client::Error );
+		client()->notifyError(i18n("Error opening file: %1", m_path), file.errorString(), Client::Error );
 		return;
 	}
 
--- trunk/KDE/kdenetwork/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp #549246:549247
@@ -201,8 +201,7 @@
 {
 	KStreamSocket* socket = const_cast<KStreamSocket*>( dynamic_cast<const KStreamSocket*>( sender() ) );
 	kDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Webcam connection to the user " << socketMap[socket].sender << " failed. Error " << error << " - " << socket->errorString() << endl;
-	client()->notifyError( i18n("Webcam connection to the user %1 could not be established.\n\nPlease relogin and try again.")
-			.arg(socketMap[socket].sender), QString("%1 - %2").arg(error).arg( socket->errorString()), Client::Error );
+	client()->notifyError( i18n("Webcam connection to the user %1 could not be established.\n\nPlease relogin and try again.", socketMap[socket].sender), QString("%1 - %2").arg(error).arg( socket->errorString()), Client::Error );
 	socketMap.remove( socket );
 }
 
--- trunk/KDE/kdenetwork/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp #549246:549247
@@ -82,7 +82,7 @@
 	{
 		kDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "An error occured while downloading buddy icon." << endl;
 		if( m_client )
-			m_client->notifyError( i18n( "An error occured while downloading buddy icon (%1)" ).arg(m_jobs[transfer].url.url()), job->errorString(), Client::Info );
+			m_client->notifyError( i18n( "An error occured while downloading buddy icon (%1)", m_jobs[transfer].url.url() ), job->errorString(), Client::Info );
 	}
 	else
 	{
--- trunk/KDE/kdenetwork/kopete/protocols/yahoo/yahooaccount.cpp #549246:549247
@@ -756,11 +756,9 @@
 	if( level <= Client::Notice )
 		return;
 	else if( level <= Client::Warning )
-		KMessageBox::information( Kopete::UI::Global::mainWidget(), i18n( "%1\n\nReason: %2 - %3" ).arg(m_session->errorInformation())
-		                          .arg(m_session->error()).arg(m_session->errorString()), i18n( "Yahoo Plugin" ) );
+		KMessageBox::information( Kopete::UI::Global::mainWidget(), i18n( "%1\n\nReason: %2 - %3", m_session->errorInformation(), m_session->error(), m_session->errorString() ), i18n( "Yahoo Plugin" ) );
 	else 
-		KMessageBox::error( Kopete::UI::Global::mainWidget(), i18n( "%1\n\nReason: %2 - %3" ).arg(m_session->errorInformation())
-		                    .arg(m_session->error()).arg(m_session->errorString()), i18n( "Yahoo Plugin" ) );
+		KMessageBox::error( Kopete::UI::Global::mainWidget(), i18n( "%1\n\nReason: %2 - %3", m_session->errorInformation(), m_session->error(), m_session->errorString() ), i18n( "Yahoo Plugin" ) );
 }
 
 void YahooAccount::slotGotBuddy( const QString &userid, const QString &alias, const QString &group )
--- trunk/KDE/kdepim/kalarm/alarmcalendar.cpp #549246:549247
@@ -269,7 +269,7 @@
 		if (!KIO::NetAccess::download(mUrl, tmpFile, MainWindow::mainMainWindow()))
 		{
 			kError(5950) << "AlarmCalendar::load(): Download failure" << endl;
-			KMessageBox::error(0, i18n("Cannot download calendar:\n%1").arg(mUrl.prettyUrl()));
+			KMessageBox::error(0, i18n("Cannot download calendar:\n%1", mUrl.prettyUrl()));
 			return -1;
 		}
 		kDebug(5950) << "AlarmCalendar::load(): --- Downloaded to " << tmpFile << endl;
--- trunk/KDE/kdepim/kalarm/resourceselector.cpp #549246:549247
@@ -191,10 +191,10 @@
 	AlarmResource* resource = dynamic_cast<AlarmResource*>(manager->createResource(type));
 	if (!resource)
 	{
-		KMessageBox::error(this, i18n("<qt>Unable to create resource of type <b>%1</b>.</qt>").arg(type));
+		KMessageBox::error(this, i18n("<qt>Unable to create resource of type <b>%1</b>.</qt>", type));
 		return;
 	}
-	resource->setResourceName(i18n("%1 resource").arg(type));
+	resource->setResourceName(i18n("%1 resource", type));
 	resource->setAlarmType(mCurrentAlarmType);
 	resource->setActive(false);   // prevent setReadOnly() declaring it as unwritable before we've tried to load it
 
@@ -274,9 +274,10 @@
 			return;
 		}
 	}
-	QString text = std ? i18n("Do you really want to remove your default resource (%1) from the list?")
-	                   : i18n("Do you really want to remove the resource %1 from the list?");
-	text = "<qt>" + text.arg("<b>" + item->text(0) + "</b>") + "</qt>";
+	QString tmp = "<b>" + item->text(0) + "</b>";
+	QString text = std ? i18n("Do you really want to remove your default resource (%1) from the list?", tmp)
+	                   : i18n("Do you really want to remove the resource %1 from the list?", tmp);
+	text = "<qt>" + text + "</qt>";
 	if (KMessageBox::warningContinueCancel(this, text, "", KStdGuiItem::remove()) == KMessageBox::Cancel)
 		return;
 
--- trunk/KDE/kdesdk/umbrello/umbrello/umlviewimageexporter.cpp #549246:549247
@@ -63,7 +63,7 @@
 #endif
                                 )) {
             int wantSave = KMessageBox::warningContinueCancel(0,
-                                i18n("The selected file %1 exists.\nDo you want to overwrite it?").arg(m_imageURL.prettyURL()),
+                                i18n("The selected file %1 exists.\nDo you want to overwrite it?", m_imageURL.prettyURL()),
                                 i18n("File Already Exists"), i18n("&Overwrite"));
             if (wantSave == KMessageBox::Ok) {
                 exportPrepared = true;