From kde-i18n-doc  Wed Feb 22 22:02:22 2006
From: Nicolas Goutte <nicolasg () snafu ! de>
Date: Wed, 22 Feb 2006 22:02:22 +0000
To: kde-i18n-doc
Subject: branches/KDE/3.5/kdesdk/kbabel/kbabel
Message-Id: <1140645742.618898.11355.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-i18n-doc&m=114064577816332

SVN commit 512568 by goutte:

Clean up the messages for the msgfmt check.
(As the message boxes were changed to use the list versions of the message
boxes, the messages were not right anymore.)
CCMAIL:kde-i18n-doc@kde.org


 M  +29 -14    kbabelview.cpp  


--- branches/KDE/3.5/kdesdk/kbabel/kbabel/kbabelview.cpp #512567:512568
@@ -1650,14 +1650,16 @@
       case Msgfmt::HeaderError:
       case Msgfmt::SyntaxError:
       {
-          QString msg= result==Msgfmt::SyntaxError ? i18n("msgfmt detected a syntax error.\n\n\
-Output of \"msgfmt --statistics\":\n") : i18n("msgfmt detected a header syntax error.\n\n\
-Output of \"msgfmt --statistics\":\n");
+          QString msg = ( result == Msgfmt::SyntaxError )
+              ? i18n("msgfmt detected a syntax error.\n")
+              : i18n("msgfmt detected a header syntax error.\n");
 
           if(question)
           {
-              switch( KMessageBox::warningContinueCancelList( this,
-                    msg+i18n("\nDo you want to continue or cancel and edit the file again?"),
+              msg += i18n("\nDo you want to continue or cancel and edit the file again?");
+              msg += "\n\n";
+              msg += i18n("Output of \"msgfmt --statistics\":\n");
+              switch( KMessageBox::warningContinueCancelList( this, msg,
                     outputLines, i18n("Warning"), KStdGuiItem::cont()) )
               {
                     case KMessageBox::Continue:
@@ -1670,9 +1672,17 @@
           else
           {
 #if KDE_IS_VERSION ( 3, 4, 0 )
-              KMessageBox::errorList( this, msg+i18n("\nPlease edit the file again."), outputLines );
+              msg += "\n";
+              msg += i18n("Please edit the file again.");
+              msg += "\n\n";
+              msg += i18n("Output of \"msgfmt --statistics\":\n");
+              KMessageBox::errorList( this, msg, outputLines );
 #else
-              KMessageBox::error( this, msg+output+i18n("\nPlease edit the file again.") );
+              msg += i18n("Output of \"msgfmt --statistics\":\n");
+              msg += output;
+              msg += "\n\n";
+              msg += i18n("Please edit the file again.");
+              KMessageBox::error( this, msg );
 #endif
               returnCode=false;
           }
@@ -1681,13 +1691,13 @@
       case Msgfmt::NoExecutable:
       case Msgfmt::Error:
       {
-            QString msg=i18n("While trying to check syntax with msgfmt an error occurred.\n\
-Please make sure that you have installed\n\
-the GNU gettext package properly.");
+            QString msg = i18n("While trying to check syntax with msgfmt an error occurred.\n"
+                "Please make sure that you have installed\n"
+                "the GNU gettext package properly.");
             if(question)
             {
-                switch( KMessageBox::warningContinueCancelList( this,
-		msg+i18n("\nDo you want to continue or cancel and edit the file again?"),
+                msg += i18n("\nDo you want to continue or cancel and edit the file again?");
+                switch( KMessageBox::warningContinueCancelList( this, msg,
                 outputLines, i18n("Warning"), KStdGuiItem::cont() ))
                 {
                     case KMessageBox::Continue:
@@ -1700,9 +1710,14 @@
             else
             {
 #if KDE_IS_VERSION ( 3, 4, 0 )
-                 KMessageBox::errorList( this, msg+i18n("\nPlease edit the file again."), outputLines );
+                 msg += "\n";
+                 msg += i18n("Please edit the file again.");
+                 KMessageBox::errorList( this, msg, outputLines );
 #else
-                 KMessageBox::error( this, msg+output+i18n("\nPlease edit the file again.") );
+                 msg += output;
+                 msg += "\n\n";
+                 msg += i18n("Please edit the file again.");
+                 KMessageBox::error( this, msg );
 #endif
                  returnCode=false;
             }