From 61f3ce1b199653223823c9c91441d764d8acce98 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20Kundr=C3=A1t?= <jkt@gentoo.org>
Date: Wed, 24 Feb 2010 21:42:23 +0000
Subject: [PATCH] Krazy/EBN: fix i18n warnings

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/extragear/graphics/kphotoalbum@1095709 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 DB/ImageSearchInfo.cpp       | 4 ++--
 DB/NewImageFinder.cpp        | 3 +--
 HTMLGenerator/HTMLDialog.cpp | 8 ++++----
 XMLDB/Database.cpp           | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/DB/ImageSearchInfo.cpp b/DB/ImageSearchInfo.cpp
index 2ca27e87..1044b325 100644
--- a/DB/ImageSearchInfo.cpp
+++ b/DB/ImageSearchInfo.cpp
@@ -170,7 +170,7 @@ QString ImageSearchInfo::toString() const
             if ( txt == ImageDB::NONE() )
                 txt = i18nc( "As in No persons, no locations etc. I do realize that translators may have problem with this, "
                             "but I need some how to indicate the category, and users may create their own categories, so this is "
-                            "the best I can do - Jesper.", "No %1" ).arg( it.key() );
+                            "the best I can do - Jesper.", "No %1", it.key() );
 
             if ( txt.contains( QString::fromLatin1("|") ) )
                 txt.replace( QString::fromLatin1( "&" ), QString::fromLatin1( " %1 " ).arg( i18n("and") ) );
@@ -183,7 +183,7 @@ QString ImageSearchInfo::toString() const
             txt.replace( ImageDB::NONE(), i18nc( "As in no other persons, or no other locations. "
                                                 "I do realize that translators may have problem with this, "
                                                 "but I need some how to indicate the category, and users may create their own categories, so this is "
-                                                "the best I can do - Jesper.", "No other %1" ).arg( it.key() ) );
+                                                "the best I can do - Jesper.", "No other %1", it.key() ) );
             txt.simplified();
             res += txt;
         }
diff --git a/DB/NewImageFinder.cpp b/DB/NewImageFinder.cpp
index b8636005..f2d9f6dc 100644
--- a/DB/NewImageFinder.cpp
+++ b/DB/NewImageFinder.cpp
@@ -316,8 +316,7 @@ bool  NewImageFinder::calculateMD5sums(
         i18n("<p><b>Calculating checksum for %1 files<b></p>"
              "<p>By storing a checksum for each image "
              "KPhotoAlbum is capable of finding images "
-             "even when you have moved them on the disk.</p>")
-        .arg(list.size()));
+             "even when you have moved them on the disk.</p>", list.size()));
     dialog.setMaximum(list.size());
     dialog.setMinimumDuration( 1000 );
 
diff --git a/HTMLGenerator/HTMLDialog.cpp b/HTMLGenerator/HTMLDialog.cpp
index 72e49090..a7d02e03 100644
--- a/HTMLGenerator/HTMLDialog.cpp
+++ b/HTMLGenerator/HTMLDialog.cpp
@@ -364,15 +364,15 @@ bool HTMLDialog::checkVars()
     bool ok = KIO::NetAccess::stat( KUrl(baseDir), result, this );
     if ( !ok ) {
         KMessageBox::error( this, i18n("<p>Error while reading information about %1. "
-                                       "This is most likely because the directory does not exist.</p>")
-                            .arg( baseDir ) );
+                                       "This is most likely because the directory does not exist.</p>",
+                                       baseDir ) );
         return false;
     }
 
     KFileItem fileInfo( result, KUrl(baseDir) );
     if ( !fileInfo.isDir() ) {
         KMessageBox::error( this, i18n("<p>%1 does not exist, is not a directory or "
-                                       "cannot be written to.</p>").arg( baseDir ) );
+                                       "cannot be written to.</p>", baseDir ) );
         return false;
     }
 
@@ -383,7 +383,7 @@ bool HTMLDialog::checkVars()
         int answer = KMessageBox::warningYesNo( this,
                                                 i18n("<p>Output directory %1 already exists. "
                                                      "Usually, this means you should specify a new directory.</p>"
-                                                     "<p>Should %2 be deleted first?</p>").arg( outputDir ).arg( outputDir ),
+                                                     "<p>Should %2 be deleted first?</p>", outputDir, outputDir ),
                                                 i18n("Directory Exists"), KStandardGuiItem::yes(), KStandardGuiItem::no(),
                                                 QString::fromLatin1("html_export_delete_original_directory") );
         if ( answer == KMessageBox::Yes ) {
diff --git a/XMLDB/Database.cpp b/XMLDB/Database.cpp
index c6e02144..1119292f 100644
--- a/XMLDB/Database.cpp
+++ b/XMLDB/Database.cpp
@@ -617,7 +617,7 @@ DB::ImageInfoPtr XMLDB::Database::createImageInfo( const QString& fileName, cons
             }
             else {
                 KMessageBox::error( 0, i18n("<p>Unknown tag %1, while reading configuration file.</p>"
-                                            "<p>Expected one of: Options, Drawings</p>" ).arg( childElm.tagName() ) );
+                                            "<p>Expected one of: Options, Drawings</p>", childElm.tagName() ) );
             }
         }
     }
-- 
2.11.4.GIT