From kde-i18n-doc  Tue Nov 22 21:42:21 2011
From: Allen Winter <winter () kde ! org>
Date: Tue, 22 Nov 2011 21:42:21 +0000
To: kde-i18n-doc
Subject: [kdepim] kleopatra: fix i18n() message that were missing an
Message-Id: <20111122214221.C4C86A60A6 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-i18n-doc&m=132199824006566

Git commit a5db7d5dcbb2cc9db91abaa6132514f180e10250 by Allen Winter.
Committed on 22/11/2011 at 22:39.
Pushed by winterz into branch 'master'.

fix i18n() message that were missing an argument placeholder.

CCMAIL: kde-i18n-doc@kde.org

M  +8    -8    kleopatra/kgpgconf/configreader.cpp
M  +6    -2    kleopatra/selftest/registrycheck.cpp

http://commits.kde.org/kdepim/a5db7d5dcbb2cc9db91abaa6132514f180e10250

diff --git a/kleopatra/kgpgconf/configreader.cpp b/kleopatra/kgpgconf/confi=
greader.cpp
index b886270..b09077b 100644
--- a/kleopatra/kgpgconf/configreader.cpp
+++ b/kleopatra/kgpgconf/configreader.cpp
@@ -52,7 +52,7 @@
 #include <memory>
 =

 namespace {
- =

+
 struct GpgConfResult {
     QByteArray stdOut;
     QByteArray stdErr;
@@ -105,7 +105,7 @@ public:
     ConfigEntry* createEntryFromParsedLine( const QStringList& lst ) const;
     void readConfConf( Config* cfg ) const;
 };
- =

+
 ConfigReader::ConfigReader() : d( new Private )
 {
 }
@@ -121,7 +121,7 @@ Config* ConfigReader::readConfig() const
     std::auto_ptr<Config> cfg( new Config );
     const QMap<QString,QString> componentInfo =3D d->readComponentInfo();
 =

-    Q_FOREACH ( const QString& i, componentInfo.keys() )
+    Q_FOREACH ( const QString& i, componentInfo )
     {
         std::auto_ptr<ConfigComponent> component( new ConfigComponent( i )=
 );
         component->setDescription( componentInfo[i] );
@@ -230,8 +230,8 @@ void ConfigReader::Private::readConfConf( Config* cfg )=
 const
             continue;
 =

         if ( lst.count() < 8 )
-        { =

-            throw MalformedGpgConfOutputException( i18n( "Parse error on g=
pgconf --list-config output:", line ) );
+        {
+            throw MalformedGpgConfOutputException( i18n( "Parse error on g=
pgconf --list-config output: %1", line ) );
         }
         ConfigComponent* const component =3D cfg->component( lst[3] );
         if ( !component )
@@ -251,7 +251,7 @@ void ConfigReader::Private::readConfConf( Config* cfg )=
 const
         }
         if ( !lst[6].isEmpty() )
             entry->setValueFromRawString( lst[6].mid( 1 ) );
-        =

+
         if ( flag =3D=3D QLatin1String( "no-change" ) )
             entry->setMutability( ConfigEntry::NoChange );
         else if ( flag =3D=3D QLatin1String( "change" ) )
@@ -280,7 +280,7 @@ QMap<QString, QString> ConfigReader::Private::readCompo=
nentInfo() const
         if ( lst.count() >=3D 2 ) {
             components[lst[0]] =3D lst[1];
         } else {
-            throw MalformedGpgConfOutputException( i18n( "Parse error on g=
pgconf --list-components. output:", line ) );
+            throw MalformedGpgConfOutputException( i18n( "Parse error on g=
pgconf --list-components. output: %1", line ) );
         }
     }
     return components;
@@ -303,7 +303,7 @@ GpgConfResult ConfigReader::Private::runGpgConf( const =
QStringList& args ) const
 =

     process.waitForStarted();
     process.waitForFinished();
-    =

+
     if ( process.exitStatus() !=3D QProcess::NormalExit ) {
         switch ( process.error() )
         {
diff --git a/kleopatra/selftest/registrycheck.cpp b/kleopatra/selftest/regi=
strycheck.cpp
index 99e3a09..1d1ee2a 100644
--- a/kleopatra/selftest/registrycheck.cpp
+++ b/kleopatra/selftest/registrycheck.cpp
@@ -96,8 +96,12 @@ namespace {
             settings.sync();
 =

             if ( settings.status() !=3D QSettings::NoError ) {
-                KMessageBox::error( 0, i18nc("@info", "Could not delete th=
e registry key <resource>%1\\%2</resource>" ),
-                                    i18nc("@title", "Error Deleting Regist=
ry Key") );
+                KMessageBox::error(
+                    0,
+                    i18nc("@info",
+                          "Could not delete the registry key <resource>%1\=
\%2</resource>",
+                          gnupg_path, gnupg_key ),
+                    i18nc("@title", "Error Deleting Registry Key") );
                 return false;
             }
 =