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

List:       kde-commits
Subject:    branches/KDE/4.0/kdeadmin/kdat
From:       Thomas Reitelbach <tr () erdfunkstelle ! de>
Date:       2008-03-02 21:20:41
Message-ID: 1204492841.565209.15050.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 781439 by reitelbach:

Don't use word-puzzles.


 M  +9 -29     Tape.cpp  


--- branches/KDE/4.0/kdeadmin/kdat/Tape.cpp #781438:781439
@@ -378,15 +378,8 @@
     if( fseek( _fptr, 0, SEEK_SET ) < 0 )
       {
 	clearerr( _fptr );
-#ifdef DEBUG    /* Can't create new i18n strings now, so we'll save this for KDE 3.1 \
                */
-       	        /* Note to translator:  this error checking was added while tracking
-                   down a bug that turns out to be unrelated.  The errors I'm \
                looking
-                   for here haven't happened in real use, so there is no rush to add
-                   these checks in KDE 3.0.  Thanks. - LW */
-	QString msg = i18n("Error during fseek #1 while accessing archive: \"");
-        msg.append( getID() );
-        msg.append( "\": " );
-	msg.append( i18n(strerror( errno )) );
+#ifdef DEBUG
+	QString msg = i18n("Error during fseek #1 while accessing archive: \"%1\": \
%2").arg( getID() ).arg( i18n(strerror( errno )) );  printf("%s\n", msg.toLatin1());  \
  KMessageBox::error(NULL, msg, i18n("File Access Error"));
 #endif /* DEBUG */
@@ -395,11 +388,8 @@
     if( fgets( buf, 4096, _fptr ) == NULL )
       {
 	clearerr( _fptr );
-#ifdef DEBUG    /* Can't create new i18n strings now, so we'll save this for KDE 3.1 \
                */
-	QString msg = i18n("Error while accessing string #1 in archive: \"");
-        msg.append( getID() );
-        msg.append( "\": " );
-	msg.append( i18n(strerror( errno )) );
+#ifdef DEBUG
+	QString msg = i18n("Error while accessing string #1 in archive: \"%1\": %2").arg( \
getID() ).arg( i18n(strerror( errno )) );  printf("%s\n", msg.toLatin1());      
 	KMessageBox::error(NULL, msg, i18n("File Access Error"));
 #endif /* DEBUG */
@@ -408,11 +398,8 @@
     if( fgets( buf, 4096, _fptr ) == NULL )
       {
 	clearerr( _fptr );
-#ifdef DEBUG    /* Can't create new i18n strings now, so we'll save this for KDE 3.1 \
                */
-	QString msg = i18n("Error while accessing string #2 in archive: \"");
-        msg.append( getID() );
-        msg.append( "\": " );
-	msg.append( i18n(strerror( errno )) );
+#ifdef DEBUG
+	QString msg = i18n("Error while accessing string #2 in archive: \"%1\": %1").arg( \
getID() ).arg( i18n(strerror( errno )) );  printf("%s\n", msg.toLatin1());      
 	KMessageBox::error(NULL, msg, i18n("File Access Error"));
 #endif /* DEBUG */
@@ -421,11 +408,8 @@
     if( fseek( _fptr, 12, SEEK_CUR ) < 0 )
       {
 	clearerr( _fptr );
-#ifdef DEBUG    /* Can't create new i18n strings now, so we'll save this for KDE 3.1 \
                */
-	QString msg = i18n("Error during fseek #2 while accessing archive: \"");
-        msg.append( getID() );
-        msg.append( "\": " );
-	msg.append( i18n(strerror( errno )) );
+#ifdef DEBUG
+	QString msg = i18n("Error during fseek #2 while accessing archive: \"%1\": \
%2").arg( getID() ).arg( i18n(strerror( errno )) );  printf("%s\n", msg.toLatin1());  \
  KMessageBox::error(NULL, msg, i18n("File Access Error"));
 #endif /* DEBUG */
@@ -434,13 +418,9 @@
     memset( buf, 0, 4096 );
     memcpy( buf, _name.ascii(), _name.length() > 4095 ? 4095 : _name.length() );
     i = fwrite( buf, sizeof( char ), 4096, _fptr );
-    /* 2002-01-31 LEW */
-    /* Note to translator: I know it's past the deadline, so don't translate this.  \
                I think
-       I fixed the bug that caused this error to occur.  Thanks - LW */
     if( ( i < 4096 ) || ( ferror( _fptr ) != 0 )){
       clearerr( _fptr );
-      QString msg = i18n("Error while updating archive name: ");
-      msg.append( i18n(strerror( errno )) );
+      QString msg = i18n("Error while updating archive name: %1").arg(i18n(strerror( \
errno )));  printf("%s\n", msg.latin1());      
       KMessageBox::error(NULL, msg, i18n("File Access Error"));
       // return;      


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