Replaced several Yes/No dialog buttons

svn path=/trunk/KDE/kdebase/kcontrol/kio/; revision=432857

kdepasswd/passwddlg.cpp

@@ -103,7 +103,7 @@ bool KDEpasswd2Dialog::checkPassword(const char *password)
 
     if (strlen(password) > 8)
     {
-	switch(KMessageBox::questionYesNoCancel(this,
+	switch(KMessageBox::warningYesNoCancel(this,
 		m_User.isEmpty() ?
 		i18n("Your password is longer than 8 characters. On some "
 			"systems, this can cause problems. You can truncate "
@@ -112,9 +112,9 @@ bool KDEpasswd2Dialog::checkPassword(const char *password)
 			"systems, this can cause problems. You can truncate "
 			"the password to 8 characters, or leave it as it is.")
 			,
-		i18n("Password too long"),
+		i18n("Password Too Long"),
 		i18n("Truncate"),
-		i18n("Use as is"),
+		i18n("Use as Is"),
 		"truncatePassword"))
 	{
 	case KMessageBox::Yes :

kfind/kftabdlg.cpp

@@ -615,7 +615,7 @@ void KfindTabWidget::setQuery(KQuery *query)
   }
   size = sizeEdit->value() * size;
   if (size < 0)  // overflow
-     if (KMessageBox::warningYesNo(this, i18n("Size is too big... Set maximum size value?"), i18n("Error"))
+     if (KMessageBox::warningYesNo(this, i18n("Size is too big. Set maximum size value?"), i18n("Error"),i18n("Set"),i18n("Do Not Set"))
            == KMessageBox::Yes)
 		{
          sizeEdit->setValue(INT_MAX);

konqueror/about/konq_aboutpage.cc

@@ -497,7 +497,7 @@ void KonqAboutPage::urlSelected( const QString &url, int button, int state, cons
 	if ( KMessageBox::questionYesNo( widget(),
 					 i18n("Do you want to disable showing "
 					      "the introduction in the webbrowsing profile?"),
-					 i18n("Faster Startup?") )
+					 i18n("Faster Startup?"),i18n("Disable"),i18n("Keep") )
 	     == KMessageBox::Yes )
 	{
 	    QString profile = locateLocal("data", "konqueror/profiles/webbrowsing");

konqueror/konq_mainwindow.cc

@@ -5263,7 +5263,7 @@ void KonqMainWindow::slotAddWebSideBar(const KURL& url, const QString& name)
     int rc = KMessageBox::questionYesNo(0L,
               i18n("Add new web extension \"%1\" to your sidebar?")
                                 .arg(name.isEmpty() ? name : url.prettyURL()),
-              i18n("Web Sidebar"));
+              i18n("Web Sidebar"),i18n("Add"),i18n("Do Not Add"));
 
     if (rc == KMessageBox::Yes) {
         // Show the sidebar

konqueror/settings/kio/kcookiespolicies.cpp

@@ -176,10 +176,10 @@ bool KCookiesPolicies::handleDuplicate( const QString& domain, int advice )
       QString msg = i18n("<qt>A policy already exists for"
                          "<center><b>%1</b></center>"
                          "Do you want to replace it?</qt>").arg(domain);
-      int res = KMessageBox::warningYesNo(this, msg,
+      int res = KMessageBox::warningContinueCancel(this, msg,
                                           i18n("Duplicate Policy"),
-                                          QString::null);
-      if ( res == KMessageBox::Yes )
+                                          i18n("Replace"));
+      if ( res == KMessageBox::Continue )
       {
         m_pDomainPolicy[item]= KCookieAdvice::adviceToStr(advice);
         item->setText(0, domain);

konqueror/settings/kio/useragentdlg.cpp

@@ -226,10 +226,10 @@ bool UserAgentDlg::handleDuplicate( const QString& site,
                          "<br/><b>%1</b><br/>"
                          "Do you want to replace it?</center>"
                          "</qt>").arg(site);
-      int res = KMessageBox::warningYesNo(this, msg,
+      int res = KMessageBox::warningContinueCancel(this, msg,
                                           i18n("Duplicate Identification"),
-                                          QString::null);
-      if ( res == KMessageBox::Yes )
+                                          i18n("Replace"));
+      if ( res == KMessageBox::Continue )
       {
         item->setText(0, site);
         item->setText(1, identity);

konqueror/settings/konq/rootopts.cpp

@@ -266,7 +266,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const QStr
     m_ok = true;
     // Ask for confirmation before moving the files
     if ( KMessageBox::questionYesNo( this, i18n("The path for '%1' has been changed;\ndo you want the files to be moved from '%2' to '%3'?").
-                              arg(type).arg(src.path()).arg(dest.path()), i18n("Confirmation Required") )
+                              arg(type).arg(src.path()).arg(dest.path()), i18n("Confirmation Required"),i18n("Move"),KStdGuiItem::cancel() )
             == KMessageBox::Yes )
     {
         bool destExists = QFile::exists(dest.path());

konqueror/settings/konqhtml/pluginopts.cpp

@@ -294,7 +294,7 @@ void KPluginOptions::scan()
         int ret = KMessageBox::warningYesNoCancel( this,
                                                     i18n("Do you want to apply your changes "
                                                          "before the scan? Otherwise the "
-                                                         "changes will be lost.") );
+                                                         "changes will be lost."), QString::null, KStdGuiItem::save(), KStdGuiItem::discard() );
         if ( ret==KMessageBox::Cancel ) {
             m_widget->scanButton->setEnabled(true);
             return;

konqueror/sidebar/sidebar_widget.cpp

@@ -117,7 +117,7 @@ void addBackEnd::aboutToShowAddMenu()
 
 void addBackEnd::doRollBack()
 {
-	if (KMessageBox::questionYesNo(m_parent, i18n("<qt>This removes all your entries from the sidebar and adds the system default ones.<BR><B>This procedure is irreversible</B><BR>Do you want to proceed?</qt>"))==KMessageBox::Yes)
+	if (KMessageBox::warningContinueCancel(m_parent, i18n("<qt>This removes all your entries from the sidebar and adds the system default ones.<BR><B>This procedure is irreversible</B><BR>Do you want to proceed?</qt>"))==KMessageBox::Continue)
 	{
 		KStandardDirs *dirs = KGlobal::dirs();
 		QString loc=dirs->saveLocation("data","konqsidebartng/" + m_currentProfile + "/",true);