[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/noatun
From:       Laurent Montel <montel () kde ! org>
Date:       2007-01-24 17:37:29
Message-ID: 1169660249.178578.11029.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 626823 by mlaurent:

Fix i18n


 M  +4 -4      library/playlistsaver.cpp  
 M  +1 -1      modules/excellent/userinterface.cpp  
 M  +3 -3      modules/kaiman/userinterface.cpp  
 M  +1 -1      modules/kjofol-skin/kjloader.cpp  
 M  +1 -1      modules/simple/propertiesdialog.ui.h  
 M  +1 -1      modules/splitplaylist/view.cpp  
 M  +7 -7      modules/winskin/waSkin.cpp  
 M  +1 -1      modules/winskin/winSkinConfig.cpp  


--- trunk/KDE/kdemultimedia/noatun/library/playlistsaver.cpp #626822:626823
@@ -291,7 +291,7 @@
 								else
 								{
 									//propMap["playObject"]="SplayPlayObject";
-									propMap["title"] = i18n("Stream from %1").arg(url.host());
+									propMap["title"] = i18n("Stream from %1",url.host());
 									if (!url.hasPath())
 										url.setPath("/");
 									propMap["url"] = url.url();
@@ -500,7 +500,7 @@
 			{
 				//prop["playObject"]="SplayPlayObject";
 				// Default title, might be overwritten by #EXTINF later
-				prop["title"] = i18n("Stream from %1").arg(protourl.host());
+				prop["title"] = i18n("Stream from %1",protourl.host());
 
 				if (!protourl.hasPath())
 					protourl.setPath("/");
@@ -676,9 +676,9 @@
 			url.setPath("/");
 
 		if (title.isEmpty())
-			map["title"] = i18n("Stream from %1 (port: %2)").arg(url.host(), \
QString::number(url.port())); +			map["title"] = i18n("Stream from %1 (port: \
%2)",url.host(), QString::number(url.port()));  else
-			map["title"] = i18n("Stream from %1, (ip: %2, port: %3)").arg(title, url.host(), \
QString::number(url.port())); +			map["title"] = i18n("Stream from %1, (ip: %2, port: \
%3)",title, url.host(), QString::number(url.port()));  
 		map["url"] = map["stream_"] = url.url();
 
--- trunk/KDE/kdemultimedia/noatun/modules/excellent/userinterface.cpp #626822:626823
@@ -392,7 +392,7 @@
 	else
 	{
 		KMessageBox::information(this,
-			i18n("<qt>Press %1 to show the menubar.</qt>").arg(
+			i18n("<qt>Press %1 to show the menubar.</qt>",
 				menubarAction->shortcut().toString()),
 			QString::null, "Hide Menu warning");
 		menuBar()->hide();
--- trunk/KDE/kdemultimedia/noatun/modules/kaiman/userinterface.cpp #626822:626823
@@ -88,10 +88,10 @@
 
 	if ( !changeStyle(skinName, "skindata") )
 	{
-		KMessageBox::sorry( this, i18n("Cannot load skin %1. Switching to default \
skin.").arg(skinName) ); +		KMessageBox::sorry( this, i18n("Cannot load skin %1. \
Switching to default skin.",skinName) );  if ( !changeStyle( DEFAULT_SKIN, "skindata" \
) )  {
-			KMessageBox::error( this, i18n("Cannot load default skin %1.").arg(DEFAULT_SKIN) \
); +			KMessageBox::error( this, i18n("Cannot load default skin %1.",DEFAULT_SKIN) );
 			QTimer::singleShot( 0, this, SLOT(close()) );
 			return;
 		}
@@ -517,7 +517,7 @@
 			if ( title.isEmpty() )
 				title = napp->player()->current().file();
 
-			title = i18n("TITLE (LENGTH)", "%1 (%2)").arg(title,
+			title = i18n("TITLE (LENGTH)", "%1 (%2)",title,
 				napp->player()->current().lengthString());
 		}
 		titleItem->setValue( title );
--- trunk/KDE/kdemultimedia/noatun/modules/kjofol-skin/kjloader.cpp #626822:626823
@@ -190,7 +190,7 @@
 	else
 	{
 		KNotifyClient::event(winId(), "warning",
-			i18n("There was trouble loading skin %1. Please select another skin \
file.").arg(skin)); +			i18n("There was trouble loading skin %1. Please select \
another skin file.",skin));  mPlugin->global()->openPreferencesDialog();
 	}
 
--- trunk/KDE/kdemultimedia/noatun/modules/simple/propertiesdialog.ui.h \
#626822:626823 @@ -46,7 +46,7 @@
     // PlaylistItem properties (name and mimetype)
     if (!pi.isNull())
     {
-	setCaption( i18n("Properties for %1").arg(pi.url().fileName()) );
+	setCaption( i18n("Properties for %1",pi.url().fileName()) );
 
 	KSharedPtr<KMimeType> mime = KMimeType::mimeType( pi.mimetype() );
 	iconLabel->setPixmap( mime->pixmap( KIcon::Desktop, KIcon::SizeMedium ) );
--- trunk/KDE/kdemultimedia/noatun/modules/splitplaylist/view.cpp #626822:626823
@@ -499,7 +499,7 @@
 	}
 	else
 	{
-		KMessageBox::error( this, i18n("Could not write to %1.").arg(url.prettyUrl()) );
+		KMessageBox::error( this, i18n("Could not write to %1.",url.prettyUrl()) );
 		return false;
 	}
 }
--- trunk/KDE/kdemultimedia/noatun/modules/winskin/waSkin.cpp #626822:626823
@@ -448,10 +448,10 @@
 void WaSkin::jumpValueChanged(int val)
 {
     if (mJumpPressed && !napp->player()->isStopped()) {
-        QString timeStr = i18n("Seek to: %1/%2 (%3%)").
-		arg(getTimeString(val * 1000)).
-		arg(getTimeString(napp->player()->getLength())).
-		arg((val * 1000 * 100) / napp->player()->getLength());
+        QString timeStr = i18n("Seek to: %1/%2 (%3%)",
+		getTimeString(val * 1000),
+		getTimeString(napp->player()->getLength()),
+		(val * 1000 * 100) / napp->player()->getLength());
         waInfo->setText(timeStr);
     }
 }
@@ -558,9 +558,9 @@
         waInfo->setText(i18n("Balance: Center"));
     }
     else if (val < 0) {
-        waInfo->setText(i18n("Balance: %1% Left").arg(-val));
+        waInfo->setText(i18n("Balance: %1% Left",QString::number(-val)));
     } else {
-        waInfo->setText(i18n("Balance: %1% Right").arg(val));
+        waInfo->setText(i18n("Balance: %1% Right",QString::number(val)));
    }
 }
 
@@ -672,7 +672,7 @@
 void WaSkin::volumeSetValue(int val)
 {
     if (mVolumePressed)
-        waInfo->setText(i18n("Volume: %1%").arg(val));
+        waInfo->setText(i18n("Volume: %1%",val));
 
     napp->player()->setVolume(val);
 }
--- trunk/KDE/kdemultimedia/noatun/modules/winskin/winSkinConfig.cpp #626822:626823
@@ -163,7 +163,7 @@
 
     // Ask the user first
     if( KMessageBox::questionYesNo( this,
-        i18n("<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>").arg( \
skin_list->currentText() ) ) +        i18n("<qt>Are you sure you want to remove the \
<b>%1</b> skin?</qt>", skin_list->currentText() ) )  == KMessageBox::Yes ) {
 
         mWaSkinManager->removeSkin( skin_list->currentText() );


[prev in list] [next in list] [prev in thread] [next in thread]