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

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/commands
From:       Marc Mutz <mutz () kde ! org>
Date:       2008-05-07 8:33:24
Message-ID: 1210149204.248630.24779.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 804963 by mutz:

Fix KUIT

 M  +8 -4      refreshopenpgpcertscommand.cpp  
 M  +14 -11    refreshx509certscommand.cpp  


--- trunk/KDE/kdepim/kleopatra/commands/refreshopenpgpcertscommand.cpp #804962:804963
@@ -70,7 +70,8 @@
 bool RefreshOpenPGPCertsCommand::preStartHook( QWidget * parent ) const {
     if ( !haveKeyserverConfigured() )
         if ( KMessageBox::warningContinueCancel( parent,
-                                                 i18n( "<para>No OpenPGP directory \
services have been configured.</para>" +                                              \
i18nc("@info", +                                                       "<para>No \
                OpenPGP directory services have been configured.</para>"
                                                        "<para>If not all of the \
                certificates carry the name of their preferred "
                                                        "certificate server (few do), \
                a fallback server is needed to fetch from.</para>"
                                                        "<para>Since none is \
configured, <application>Kleopatra</application> will use " @@ -85,7 +86,8 @@
              != KMessageBox::Continue )
             return false;
     return KMessageBox::warningContinueCancel( parent,
-                                               i18n("<para>Refreshing OpenPGP \
certificates implies downloading all certificates anew, " +                           \
i18nc("@info", +                                                    "<para>Refreshing \
                OpenPGP certificates implies downloading all certificates anew, "
                                                     "to check if any of them have \
                been revoked in the meantime.</para>"
                                                     "<para>This can put a severe \
                strain on your own as well as other people's network "
                                                     "connection, and can take up to \
an hour or more to complete, depending on " @@ -115,13 +117,15 @@
 }
 
 QString RefreshOpenPGPCertsCommand::crashExitMessage( const QStringList & args ) \
                const {
-    return i18n( "<para>The GPG process that tried to refresh OpenPGP certificates "
+    return i18nc("@info",
+                 "<para>The GPG process that tried to refresh OpenPGP certificates "
                  "ended prematurely because of an unexpected error.</para>"
                  "<para>Please check the output of <icode>%1</icode> for \
details.</para>", args.join( " " ) ) ;  }
 
 QString RefreshOpenPGPCertsCommand::errorExitMessage( const QStringList & args ) \
                const {
-    return i18n( "<para>An error occurred while trying to refresh OpenPGP \
certificates.</para> " +    return i18nc("@info",
+                 "<para>An error occurred while trying to refresh OpenPGP \
                certificates.</para> "
                  "<para>The output from <command>%1</command> was: \
<message>%2</message></para>",  args[0], errorString() );
 }
--- trunk/KDE/kdepim/kleopatra/commands/refreshx509certscommand.cpp #804962:804963
@@ -58,12 +58,13 @@
 
 bool RefreshX509CertsCommand::preStartHook( QWidget * parent ) const {
     return KMessageBox::warningContinueCancel( parent,
-                                               i18n("<para>Refreshing X.509 \
                certificates implies downloading CRLs for all certificates, "
-                                                    "even if they might otherwise \
                still be valid.</para>"
-                                                    "<para>This can put a severe \
                strain on your own as well as other people's network "
-                                                    "connection, and can take up to \
                an hour or more to complete, depending on "
-                                                    "your network connection, and \
                the number of certificates to check.</para> "
-                                                    "<para>Are you sure you want to \
continue?</para>"), +                                               i18nc("@info",
+                                                     "<para>Refreshing X.509 \
certificates implies downloading CRLs for all certificates, " +                       \
"even if they might otherwise still be valid.</para>" +                               \
"<para>This can put a severe strain on your own as well as other people's network " + \
"connection, and can take up to an hour or more to complete, depending on " +         \
"your network connection, and the number of certificates to check.</para> " +         \
                "<para>Are you sure you want to continue?</para>"),
                                                i18n("X.509 Certitifcate Refresh"),
                                                KStandardGuiItem::cont(), \
                KStandardGuiItem::cancel(),
                                                QLatin1String( \
"warn-refresh-x509-expensive" ) ) @@ -83,14 +84,16 @@
 }
 
 QString RefreshX509CertsCommand::crashExitMessage( const QStringList & args ) const \
                {
-    return i18n( "<para>The GpgSM process that tried to refresh X.509 certificates "
-                 "ended prematurely because of an unexpected error.</para>"
-                 "<para>Please check the output of <icode>%1</icode> for \
details.</para>", args.join( " " ) ) ; +    return i18nc( "@info",
+                  "<para>The GpgSM process that tried to refresh X.509 certificates \
" +                  "ended prematurely because of an unexpected error.</para>"
+                  "<para>Please check the output of <icode>%1</icode> for \
details.</para>", args.join( " " ) ) ;  }
 
 QString RefreshX509CertsCommand::errorExitMessage( const QStringList & args ) const \
                {
-    return i18n( "<para>An error occurred while trying to refresh X.509 \
                certificates.</para>"
-                 "<para>The output from <command>%1</command> was: \
<message>%2</message></para>", +    return i18nc( "@info",
+                  "<para>An error occurred while trying to refresh X.509 \
certificates.</para>" +                  "<para>The output from <command>%1</command> \
was: <message>%2</message></para>",  args[0], errorString() );
 }
 


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