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

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/commands
From:       Bertjan Broeksema <b.broeksema () home ! nl>
Date:       2009-07-09 22:01:01
Message-ID: 1247176861.286756.19998.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 994012 by bbroeksema:

Krazy fixes: validity of i18n calls.


 M  +3 -3      adduseridcommand.cpp  
 M  +3 -3      changepassphrasecommand.cpp  
 M  +1 -1      dumpcertificatecommand.cpp  
 M  +1 -1      dumpcrlcachecommand.cpp  
 M  +5 -5      exportopenpgpcertstoservercommand.cpp  
 M  +3 -3      exportsecretkeycommand.cpp  
 M  +1 -1      importcertificatescommand.cpp  
 M  +3 -2      lookupcertificatescommand.cpp  
 M  +5 -5      refreshopenpgpcertscommand.cpp  
 M  +4 -4      refreshx509certscommand.cpp  


--- trunk/KDE/kdepim/kleopatra/commands/adduseridcommand.cpp #994011:994012
@@ -212,13 +212,13 @@
                              "<para>An error occurred while trying to add the \
user-id: "  "<message>%1</message></para>",
                              QString::fromLocal8Bit( err.asString() ) ),
-                        i18n("Add User-ID Error") );
+                        i18nc("@title:window", "Add User-ID Error") );
 }
 
 void AddUserIDCommand::Private::showSuccessDialog() {
     KMessageBox::information( parentWidgetOrView(),
-                              i18n("User-ID successfully added."),
-                              i18n("Add User-ID Succeeded") );
+                              i18nc("@info", "User-ID successfully added."),
+                              i18nc("@title:window", "Add User-ID Succeeded") );
 }
 
 #undef d
--- trunk/KDE/kdepim/kleopatra/commands/changepassphrasecommand.cpp #994011:994012
@@ -76,11 +76,11 @@
 }
 
 QString ChangePassphraseCommand::errorCaption() const {
-    return i18n( "Passphrase Change Error" );
+    return i18nc( "@title:window", "Passphrase Change Error" );
 }
 
 QString ChangePassphraseCommand::successCaption() const {
-    return i18n( "Passphrase Change Finished" );
+    return i18nc( "@title:window", "Passphrase Change Finished" );
 }
 
 QString ChangePassphraseCommand::crashExitMessage( const QStringList & args ) const \
{ @@ -98,7 +98,7 @@
 }
 
 QString ChangePassphraseCommand::successMessage( const QStringList & ) const {
-    return i18n( "Passphrase changed successfully." );
+    return i18nc( "@info", "Passphrase changed successfully." );
 }
 
 #include "moc_changepassphrasecommand.cpp"
--- trunk/KDE/kdepim/kleopatra/commands/dumpcertificatecommand.cpp #994011:994012
@@ -87,7 +87,7 @@
 
             explicit Ui( DumpCertificateDialog * q )
                 : logTextWidget( q ),
-                  updateButton( i18n("&Update"), q ),
+                  updateButton( i18nc("@action:button Update the log text widget", \
"&Update"), q ),  closeButton( KStandardGuiItem::close(), q ),
                   vlay( q ),
                   hlay()
--- trunk/KDE/kdepim/kleopatra/commands/dumpcrlcachecommand.cpp #994011:994012
@@ -84,7 +84,7 @@
 
             explicit Ui( DumpCrlCacheDialog * q )
                 : logTextWidget( q ),
-                  updateButton( i18n("&Update"), q ),
+                  updateButton( i18nc("@action:button Update the log text widget", \
"&Update"), q ),  closeButton( KStandardGuiItem::close(), q ),
                   vlay( q ),
                   hlay()
--- trunk/KDE/kdepim/kleopatra/commands/exportopenpgpcertstoservercommand.cpp \
#994011:994012 @@ -90,7 +90,7 @@
                                                        "configuration \
                dialog.</para>"
                                                        "<para>Do you want to \
                continue with <resource>keys.gnupg.net</resource> "
                                                        "as the server to export \
                to?</para>" ),
-                                                 i18n("OpenPGP Certificate Export"),
+                                                 i18nc("@title:window", "OpenPGP \
                Certificate Export"),
                                                  KStandardGuiItem::cont(), \
                KStandardGuiItem::cancel(),
                                                  QLatin1String( \
                "warn-export-openpgp-missing-keyserver" ) )
              != KMessageBox::Continue )
@@ -102,7 +102,7 @@
                                                      "<para>Before exporting your \
                certificate to a public directory server, make sure that you "
                                                      "have created a revocation \
                certificate so you can revoke the certificate if needed \
                later.</para>"
                                                      "<para>Are you sure you want to \
                continue?</para>"),
-                                               i18n("OpenPGP Certificate Export"),
+                                               i18nc("@title:window", "OpenPGP \
                Certificate Export"),
                                                KStandardGuiItem::cont(), \
                KStandardGuiItem::cancel(),
                                                QLatin1String( \
"warn-export-openpgp-nonrevocable" ) )  == KMessageBox::Continue;
@@ -120,11 +120,11 @@
 }
 
 QString ExportOpenPGPCertsToServerCommand::errorCaption() const {
-    return i18n( "OpenPGP Certificate Export Error" );
+    return i18nc( "@title:window", "OpenPGP Certificate Export Error" );
 }
 
 QString ExportOpenPGPCertsToServerCommand::successCaption() const {
-    return i18n( "OpenPGP Certificate Export Finished" );
+    return i18nc( "@title:window", "OpenPGP Certificate Export Finished" );
 }
 
 QString ExportOpenPGPCertsToServerCommand::crashExitMessage( const QStringList & \
args ) const { @@ -142,7 +142,7 @@
 }
 
 QString ExportOpenPGPCertsToServerCommand::successMessage( const QStringList & ) \
                const {
-    return i18n( "OpenPGP certificates exported successfully." );
+    return i18nc( "@info", "OpenPGP certificates exported successfully." );
 }
 
 #include "moc_exportopenpgpcertstoservercommand.cpp"
--- trunk/KDE/kdepim/kleopatra/commands/exportsecretkeycommand.cpp #994011:994012
@@ -126,11 +126,11 @@
 }
 
 QString ExportSecretKeyCommand::errorCaption() const {
-    return i18n( "Secret Key Export Error" );
+    return i18nc( "@title:window", "Secret Key Export Error" );
 }
 
 QString ExportSecretKeyCommand::successCaption() const {
-    return i18n( "Secret Key Export Finished" );
+    return i18nc( "@title:window", "Secret Key Export Finished" );
 }
 
 QString ExportSecretKeyCommand::crashExitMessage( const QStringList & args ) const {
@@ -148,7 +148,7 @@
 }
 
 QString ExportSecretKeyCommand::successMessage( const QStringList & ) const {
-    return i18n( "Secret key successfully exported." );
+    return i18nc( "@info", "Secret key successfully exported." );
 }
 
 #include "moc_exportsecretkeycommand.cpp"
--- trunk/KDE/kdepim/kleopatra/commands/importcertificatescommand.cpp #994011:994012
@@ -213,7 +213,7 @@
                           Qt::escape( ids.front() ) );
     else
         return i18nc( "@info:tooltip",
-                      "Imported certificates from these sources:<br>%1",
+                      "Imported certificates from these sources:<br/>%1",
                       format_ids( ids ) );
 }
 
--- trunk/KDE/kdepim/kleopatra/commands/lookupcertificatescommand.cpp #994011:994012
@@ -304,8 +304,9 @@
 void LookupCertificatesCommand::Private::showError( QWidget * parent, const \
KeyListResult & result ) {  if ( !result.error() )
         return;
-    KMessageBox::information( parent, i18n( "Failed to search on keyserver. The \
                error returned was:\n%1",
-                                            QString::fromLocal8Bit( \
result.error().asString() ) ) ); +    KMessageBox::information( parent, i18nc( \
"@info", +                                             "Failed to search on \
keyserver. The error returned was:\n%1", +                                            \
QString::fromLocal8Bit( result.error().asString() ) ) );  }
 
 void LookupCertificatesCommand::Private::showResult( QWidget * parent, const \
                KeyListResult & result ) {
--- trunk/KDE/kdepim/kleopatra/commands/refreshopenpgpcertscommand.cpp #994011:994012
@@ -80,7 +80,7 @@
                                                        "configuration \
                dialog.</para>"
                                                        "<para>Do you want to \
                continue with <resource>keys.gnupg.net</resource> "
                                                        "as fallback server?</para>" \
                ),
-                                                 i18n("OpenPGP Certificate \
Refresh"), +                                                 i18nc("@title:window", \
                "OpenPGP Certificate Refresh"),
                                                  KStandardGuiItem::cont(), \
                KStandardGuiItem::cancel(),
                                                  QLatin1String( \
                "warn-refresh-openpgp-missing-keyserver" ) )
              != KMessageBox::Continue )
@@ -93,7 +93,7 @@
                                                     "connections, 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("OpenPGP Certificate Refresh"),
+                                               i18nc("@title:window", "OpenPGP \
                Certificate Refresh"),
                                                KStandardGuiItem::cont(), \
                KStandardGuiItem::cancel(),
                                                QLatin1String( \
"warn-refresh-openpgp-expensive" ) )  == KMessageBox::Continue;
@@ -109,11 +109,11 @@
 }
 
 QString RefreshOpenPGPCertsCommand::errorCaption() const {
-    return i18n( "OpenPGP Certificate Refresh Error" );
+    return i18nc( "@title:window", "OpenPGP Certificate Refresh Error" );
 }
 
 QString RefreshOpenPGPCertsCommand::successCaption() const {
-    return i18n( "OpenPGP Certificate Refresh Finished" );
+    return i18nc( "@title:window", "OpenPGP Certificate Refresh Finished" );
 }
 
 QString RefreshOpenPGPCertsCommand::crashExitMessage( const QStringList & args ) \
const { @@ -131,7 +131,7 @@
 }
 
 QString RefreshOpenPGPCertsCommand::successMessage( const QStringList & ) const {
-    return i18n( "OpenPGP certificates refreshed successfully." );
+    return i18nc( "@info", "OpenPGP certificates refreshed successfully." );
     // ### --check-trustdb
 }
 
--- trunk/KDE/kdepim/kleopatra/commands/refreshx509certscommand.cpp #994011:994012
@@ -65,7 +65,7 @@
                                                      "connections, 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 Certificate Refresh"),
+                                               i18nc("@title:window", "X.509 \
                Certificate Refresh"),
                                                KStandardGuiItem::cont(), \
                KStandardGuiItem::cancel(),
                                                QLatin1String( \
"warn-refresh-x509-expensive" ) )  == KMessageBox::Continue;
@@ -76,11 +76,11 @@
 }
 
 QString RefreshX509CertsCommand::errorCaption() const {
-    return i18n( "X.509 Certificate Refresh Error" );
+    return i18nc( "@title:window", "X.509 Certificate Refresh Error" );
 }
 
 QString RefreshX509CertsCommand::successCaption() const {
-    return i18n( "X.509 Certificate Refresh Finished" );
+    return i18nc( "@title:window", "X.509 Certificate Refresh Finished" );
 }
 
 QString RefreshX509CertsCommand::crashExitMessage( const QStringList & args ) const \
{ @@ -98,7 +98,7 @@
 }
 
 QString RefreshX509CertsCommand::successMessage( const QStringList & ) const {
-    return i18n( "X.509 certificates refreshed successfully." );
+    return i18nc( "@info", "X.509 certificates refreshed successfully." );
 }
 
 #include "moc_refreshx509certscommand.cpp"


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

Configure | About | News | Add a list | Sponsored by KoreLogic