File 4_3_BRANCH.diff of Package kdeutils4

Overview Repositories Revisions Requests Users Attributes Meta

File 4_3_BRANCH.diff of Package kdeutils4 (Revision 5f1974fffa4865bdaac72547a8bd46cc)

Currently displaying revision 5f1974fffa4865bdaac72547a8bd46cc , Show latest

package: kdeutils-4.2.85.tar.bz2
kdemod: kdeutils
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
+current HEAD: 968459
+svn di between //tags/KDE/4.2.85/kdeutils and //trunk/KDE/kdeutils
--- kfloppy/KFloppy.desktop	
+++ kfloppy/KFloppy.desktop	
@@ -59,8 +59,8 @@
 GenericName[uz@cyrillic]=Дискетни форматлагич
 GenericName[vi]=Trình Định Dạng Đĩa Mềm
 GenericName[wa]=Usteye po-z abwesner des plaketes
-GenericName[x-test]=xxFloppy Formatterxx
 GenericName[xh]=Floppy formata
+GenericName[x-test]=xxFloppy Formatterxx
 GenericName[zh_CN]=软盘格式化程序
 GenericName[zh_TW]=軟碟格式化程式
 Name=KFloppy
--- okteta/gui/bytearrayrowview_p.cpp	
+++ okteta/gui/bytearrayrowview_p.cpp	
@@ -1101,6 +1101,7 @@
     if( !mOverWrite ) emit q->cutAvailable( mTableRanges->hasSelection() );
     emit q->copyAvailable( mTableRanges->hasSelection() );
     emit q->selectionChanged( mTableRanges->hasSelection() );
+    emit q->selectionChanged( mTableRanges->selection() );
 }
 
 
@@ -1205,6 +1206,8 @@
 
     unpauseCursor();
     emit q->cursorPositionChanged( cursorPosition() );
+    emit q->selectionChanged( mTableRanges->hasSelection() );
+    emit q->selectionChanged( mTableRanges->selection() );
 }
 
 
--- okteta/gui/abstractbytearrayview.h	
+++ okteta/gui/abstractbytearrayview.h	
@@ -329,6 +329,7 @@
     void readOnlyChanged( bool isReadOnly );
     /** selection has changed */
     void selectionChanged( bool hasSelection );
+    void selectionChanged( const KHE::Section& selection );
     /** there is a cut available or not */
     void cutAvailable( bool Really );
     /** there is a copy available or not */
--- okteta/gui/abstractbytearrayview_p.cpp	
+++ okteta/gui/abstractbytearrayview_p.cpp	
@@ -519,9 +519,11 @@
     unpauseCursor();
 
     const bool hasSelection = mTableRanges->hasSelection();
+    const KHE::Section selection = mTableRanges->selection();
     if( !mOverWrite ) emit q->cutAvailable( hasSelection );
     emit q->copyAvailable( hasSelection );
     emit q->selectionChanged( hasSelection );
+    emit q->selectionChanged( selection );
     emit q->cursorPositionChanged( cursorPosition() );
     q->viewport()->setCursor( isEffectiveReadOnly() ? Qt::ArrowCursor : Qt::IBeamCursor );
 }
@@ -547,9 +549,11 @@
         q->viewport()->setCursor( isEffectiveReadOnly() ? Qt::ArrowCursor : Qt::IBeamCursor );
 
         const bool hasSelection = mTableRanges->hasSelection();
+        const KHE::Section selection = mTableRanges->selection();
         if( !mOverWrite ) emit q->cutAvailable( hasSelection );
         emit q->copyAvailable( hasSelection );
         emit q->selectionChanged( hasSelection );
+        emit q->selectionChanged( selection );
     }
     ensureCursorVisible();
 
@@ -746,6 +750,7 @@
     }
 
     emit q->selectionChanged( mTableRanges->hasSelection() );
+    emit q->selectionChanged( mTableRanges->selection() );
 }
 
 
--- okteta/gui/bytearraycolumnview_p.cpp	
+++ okteta/gui/bytearraycolumnview_p.cpp	
@@ -1136,6 +1136,7 @@
     if( !mOverWrite ) emit q->cutAvailable( mTableRanges->hasSelection() );
     emit q->copyAvailable( mTableRanges->hasSelection() );
     emit q->selectionChanged( mTableRanges->hasSelection() );
+    emit q->selectionChanged( mTableRanges->selection() );
 }
 
 
@@ -1240,6 +1241,8 @@
 
     unpauseCursor();
     emit q->cursorPositionChanged( cursorPosition() );
+    emit q->selectionChanged( mTableRanges->hasSelection() );
+    emit q->selectionChanged( mTableRanges->selection() );
 }
 
 
--- okteta/program/program.cpp	
+++ okteta/program/program.cpp	
@@ -51,8 +51,8 @@
 #include <QtCore/QList>
 
 
-static const char OffsetOptionId[] = "offset";
-static const char OffsetOptionShortId[] = "o";
+// static const char OffsetOptionId[] = "offset";
+// static const char OffsetOptionShortId[] = "o";
 
 
 OktetaProgram::OktetaProgram( int argc, char *argv[] )
--- okteta/program/about.cpp	
+++ okteta/program/about.cpp	
@@ -30,7 +30,7 @@
 
 // Program
 static const char ProgramId[] =          "okteta";
-static const char ProgramVersion[] =     "0.2.80";
+static const char ProgramVersion[] =     "0.3.0";
 static const char ProgramHomepage[] =    "http://utils.kde.org/projects/okteta";
 // Author
 static const char FWHKEmailAddress[] =   "kossebau@kde.org";
--- okteta/program/oktetakakao/controllers/view/checksum/checksumtool.cpp	
+++ okteta/program/oktetakakao/controllers/view/checksum/checksumtool.cpp	
@@ -187,6 +187,18 @@
     emit isApplyableChanged( isApplyable() );
 }
 
+// TODO: hack!
+// better would be to store the parameter set used for the source and compare if equal
+// this hack does the same, except for that the source will never be uptodate
+void ChecksumTool::resetSourceTool()
+{
+    mSourceAlgorithmId = -1;
+
+    checkUptoDate();
+    emit uptodateChanged( mChecksumUptodate );
+    emit isApplyableChanged( isApplyable() );
+}
+
 void ChecksumTool::onSelectionChanged( bool hasSelection )
 {
 // TODO: could be quicker
--- okteta/program/oktetakakao/controllers/view/checksum/checksumtool.h	
+++ okteta/program/oktetakakao/controllers/view/checksum/checksumtool.h	
@@ -70,6 +70,8 @@
     void calculateChecksum();
 
     void setAlgorithm( int algorithmId );
+    // TODO: hack, see checksum source
+    void resetSourceTool();
 
   Q_SIGNALS:
     void checksumChanged( const QString& checksum );
--- okteta/program/oktetakakao/controllers/view/checksum/checksumview.cpp	
+++ okteta/program/oktetakakao/controllers/view/checksum/checksumview.cpp	
@@ -155,7 +155,10 @@
 {
     QWidget* oldWidget = mParameterSetEditStack->currentWidget();
     if( oldWidget )
+    {
         oldWidget->disconnect( this );
+        oldWidget->disconnect( mTool );
+    }
 
     mTool->setAlgorithm( index );
     mParameterSetEditStack->setCurrentIndex( index );
@@ -166,6 +169,9 @@
     {
         connect( parametersetEdit, SIGNAL(validityChanged( bool )),
                  SLOT(onValidityChanged( bool )) );
+        // TODO: hack, see checksum source
+        connect( parametersetEdit, SIGNAL(valuesChanged()),
+                 mTool, SLOT(resetSourceTool()) );
         onValidityChanged( parametersetEdit->isValid() );
     }
 }
--- okteta/program/oktetakakao/controllers/view/libbytearraychecksum/abstractbytearraychecksumparametersetedit.h	
+++ okteta/program/oktetakakao/controllers/view/libbytearraychecksum/abstractbytearraychecksumparametersetedit.h	
@@ -47,6 +47,8 @@
 
   Q_SIGNALS:
     void validityChanged( bool isValid );
+    // TODO: hack, see checksum source
+    void valuesChanged();
 
   protected:
     class Private;
--- okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsum64bytearraychecksumalgorithm.h	
+++ okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsum64bytearraychecksumalgorithm.h	
@@ -40,6 +40,10 @@
     virtual AbstractByteArrayChecksumParameterSet* parameterSet();
 
   protected:
+    quint64 calculateModSumWithMachineEndianness( const KHECore::AbstractByteArrayModel* model, const KHE::Section& section ) const;
+    quint64 calculateModSumWithNonMachineEndianness( const KHECore::AbstractByteArrayModel* model, const KHE::Section& section ) const;
+
+  protected:
     ModSumByteArrayChecksumParameterSet mParameterSet;
 };
 
--- okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsumbytearraychecksumparametersetedit.h	
+++ okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsumbytearraychecksumparametersetedit.h	
@@ -26,7 +26,7 @@
 // lib
 #include "abstractbytearraychecksumparametersetedit.h"
 
-class QSpinBox;
+class KComboBox;
 
 
 class ModSumByteArrayChecksumParameterSetEdit : public AbstractByteArrayChecksumParameterSetEdit
@@ -42,12 +42,8 @@
     virtual void getParameterSet( AbstractByteArrayChecksumParameterSet* parameterSet ) const;
     virtual bool isValid() const;
 
-  protected Q_SLOTS:
-//     void onValueChanged( int value );
-
   protected:
-//     QSpinBox *mGroupSizeSpinBox;
-//     QSpinBox *mMoveBitWidthSpinBox;
+    KComboBox* mEndiannessComboBox;
 };
 
 #endif
--- okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsum8bytearraychecksumalgorithm.cpp	
+++ okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsum8bytearraychecksumalgorithm.cpp	
@@ -45,7 +45,7 @@
     int nextBlockEnd = section.start() + CalculatedByteCountSignalLimit;
     for( int i = section.start(); i<=section.end(); ++i )
     {
-        modSum += model->datum( i );
+        modSum += (quint8)( model->datum(i) );
 #if 0
         const uchar value = (crcBits & 0xFF) + model->datum( i );
         crcBits >>= 8;
@@ -58,7 +58,7 @@
         }
     }
 
-    *result = QString::number( modSum, 16 );
+    *result = QString::fromLatin1("%1").arg( modSum, 2, 16, QChar::fromLatin1('0') );
     return true;
 }
 
--- okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/adler32bytearraychecksumalgorithm.cpp	
+++ okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/adler32bytearraychecksumalgorithm.cpp	
@@ -58,7 +58,9 @@
         }
     }
 
-    *result = QString::number( (b << 16) | a, 16 );
+    const quint32 sum = (b << 16) | a;
+    *result = QString::fromLatin1("%1").arg( sum, 8, 16, QChar::fromLatin1('0') );
+
     return true;
 }
 
--- okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsum32bytearraychecksumalgorithm.cpp	
+++ okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsum32bytearraychecksumalgorithm.cpp	
@@ -38,22 +38,37 @@
 bool ModSum32ByteArrayChecksumAlgorithm::calculateChecksum( QString* result,
                                                             const KHECore::AbstractByteArrayModel* model, const KHE::Section& section ) const
 {
+    const bool useMachineEndianess = ( mParameterSet.endianess() == ThisMachineEndianness );
+    const quint32 modSum = useMachineEndianess ?
+        calculateModSumWithMachineEndianness( model, section ) :
+        calculateModSumWithNonMachineEndianness( model, section );
+
+    *result = QString::fromLatin1("%1").arg( modSum, 8, 16, QChar::fromLatin1('0') );
+    return true;
+}
+
+quint32 ModSum32ByteArrayChecksumAlgorithm::calculateModSumWithMachineEndianness( const KHECore::AbstractByteArrayModel* model, const KHE::Section& section ) const
+{
     quint32 modSum = 0x000000;
     int nextBlockEnd = section.start() + CalculatedByteCountSignalLimit;
 
     // TODO: move padding checks into extra code before and after loop
     for( int i = section.start(); i<=section.end(); ++i )
     {
-        quint32 value = model->datum( i ) << 24;
-        ++i;
-        if( i<=section.end() )
-            value += model->datum( i ) << 16;
-        ++i;
-        if( i<=section.end() )
-            value += model->datum( i ) << 8;
+        quint32 value = (quint8)( model->datum(i) ) << 24;
         ++i;
         if( i<=section.end() )
-            value += model->datum( i );
+        {
+            value += (quint8)( model->datum(i) ) << 16;
+            ++i;
+            if( i<=section.end() )
+            {
+                value += (quint8)( model->datum(i) ) << 8;
+                ++i;
+                if( i<=section.end() )
+                    value += (quint8)( model->datum(i) );
+            }
+        }
 
         modSum += value;
 #if 0
@@ -68,8 +83,42 @@
         }
     }
 
-    *result = QString::number( modSum, 16 );
-    return true;
+    return modSum;
+}
+
+quint32 ModSum32ByteArrayChecksumAlgorithm::calculateModSumWithNonMachineEndianness( const KHECore::AbstractByteArrayModel* model, const KHE::Section& section ) const
+{
+    quint32 modSum = 0x000000;
+    int nextBlockEnd = section.start() + CalculatedByteCountSignalLimit;
+
+    // TODO: move padding checks into extra code before and after loop
+    for( int i = section.start(); i<=section.end(); ++i )
+    {
+        quint32 value = (quint8)( model->datum(i) );
+        ++i;
+        if( i<=section.end() )
+        {
+            value += (quint8)( model->datum(i) ) << 8;
+            ++i;
+            if( i<=section.end() )
+            {
+                value += (quint8)( model->datum(i) ) << 16;
+                ++i;
+                if( i<=section.end() )
+                    value += (quint8)( model->datum(i) ) << 24;
+            }
+        }
+
+        modSum += value;
+
+        if( i >= nextBlockEnd )
+        {
+            nextBlockEnd += CalculatedByteCountSignalLimit;
+            emit calculatedBytes( section.localIndex(i)+1 );
+        }
+    }
+
+    return modSum;
 }
 
 ModSum32ByteArrayChecksumAlgorithm::~ModSum32ByteArrayChecksumAlgorithm() {}
--- okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsumbytearraychecksumparameterset.cpp	
+++ okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsumbytearraychecksumparameterset.cpp	
@@ -27,17 +27,15 @@
 
 
 ModSumByteArrayChecksumParameterSet::ModSumByteArrayChecksumParameterSet()
+  : mEndianess( ThisMachineEndianness )
 {}
 
 QString ModSumByteArrayChecksumParameterSet::id() const { return QString::fromLatin1("ModSum"); }
 
-#if 0
-int ModSumByteArrayChecksumParameterSet::groupSize() const { return mGroupSize; }
-int ModSumByteArrayChecksumParameterSet::moveBitWidth() const { return mMoveBitWidth; }
-
-void ModSumByteArrayChecksumParameterSet::setGroupSize( int groupSize ) { mGroupSize = groupSize; }
-void ModSumByteArrayChecksumParameterSet::setMoveBitWidth( int moveBitWidth ) { mMoveBitWidth = moveBitWidth; }
-#endif
+Endianess ModSumByteArrayChecksumParameterSet::endianess() const { return mEndianess; }
+
+void ModSumByteArrayChecksumParameterSet::setEndianess( Endianess endianess ) { mEndianess = endianess; }
+
 
 ModSumByteArrayChecksumParameterSet::~ModSumByteArrayChecksumParameterSet()
 {
--- okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsum16bytearraychecksumalgorithm.cpp	
+++ okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsum16bytearraychecksumalgorithm.cpp	
@@ -38,16 +38,27 @@
 bool ModSum16ByteArrayChecksumAlgorithm::calculateChecksum( QString* result,
                                                             const KHECore::AbstractByteArrayModel* model, const KHE::Section& section ) const
 {
+    const bool useMachineEndianess = ( mParameterSet.endianess() == ThisMachineEndianness );
+    const quint16 modSum = useMachineEndianess ?
+        calculateModSumWithMachineEndianness( model, section ) :
+        calculateModSumWithNonMachineEndianness( model, section );
+
+    *result = QString::fromLatin1("%1").arg( modSum, 4, 16, QChar::fromLatin1('0') );
+    return true;
+}
+
+quint16 ModSum16ByteArrayChecksumAlgorithm::calculateModSumWithMachineEndianness( const KHECore::AbstractByteArrayModel* model, const KHE::Section& section ) const
+{
     quint16 modSum = 0x0000;
     int nextBlockEnd = section.start() + CalculatedByteCountSignalLimit;
 
     // TODO: move padding checks into extra code before and after loop
     for( int i = section.start(); i<=section.end(); ++i )
     {
-        int value = model->datum( i ) << 8;
+        quint16 value = (quint8)( model->datum(i) ) << 8;
         ++i;
         if( i<=section.end() )
-            value += model->datum( i );
+            value += (quint8)( model->datum(i) );
 
         modSum += value;
 #if 0
@@ -62,8 +73,32 @@
         }
     }
 
-    *result = QString::number( modSum, 16 );
-    return true;
+    return modSum;
+}
+
+quint16 ModSum16ByteArrayChecksumAlgorithm::calculateModSumWithNonMachineEndianness( const KHECore::AbstractByteArrayModel* model, const KHE::Section& section ) const
+{
+    quint16 modSum = 0x0000;
+    int nextBlockEnd = section.start() + CalculatedByteCountSignalLimit;
+
+    // TODO: move padding checks into extra code before and after loop
+    for( int i = section.start(); i<=section.end(); ++i )
+    {
+        quint16 value = (quint8)( model->datum(i) );
+        ++i;
+        if( i<=section.end() )
+            value += (quint8)( model->datum(i) ) << 8;
+
+        modSum += value;
+
+        if( i >= nextBlockEnd )
+        {
+            nextBlockEnd += CalculatedByteCountSignalLimit;
+            emit calculatedBytes( section.localIndex(i)+1 );
+        }
+    }
+
+    return modSum;
 }
 
 ModSum16ByteArrayChecksumAlgorithm::~ModSum16ByteArrayChecksumAlgorithm() {}
--- okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/crc32bytearraychecksumalgorithm.cpp	
+++ okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/crc32bytearraychecksumalgorithm.cpp	
@@ -105,7 +105,7 @@
     }
     crcBits ^= 0xffffffff;
 
-    *result = QString::number( crcBits, 16 );
+    *result = QString::fromLatin1("%1").arg( crcBits, 8, 16, QChar::fromLatin1('0') );
     return true;
 }
 
--- okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsum64bytearraychecksumalgorithm.cpp	
+++ okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsum64bytearraychecksumalgorithm.cpp	
@@ -38,34 +38,116 @@
 bool ModSum64ByteArrayChecksumAlgorithm::calculateChecksum( QString* result,
                                                             const KHECore::AbstractByteArrayModel* model, const KHE::Section& section ) const
 {
+    const bool useMachineEndianess = ( mParameterSet.endianess() == ThisMachineEndianness );
+    const quint64 modSum = useMachineEndianess ?
+        calculateModSumWithMachineEndianness( model, section ) :
+        calculateModSumWithNonMachineEndianness( model, section );
+
+    *result = QString::fromLatin1("%1").arg( modSum, 16, 16, QChar::fromLatin1('0') );
+    return true;
+}
+
+quint64 ModSum64ByteArrayChecksumAlgorithm::calculateModSumWithMachineEndianness( const KHECore::AbstractByteArrayModel* model, const KHE::Section& section ) const
+{
     quint64 modSum = 0x00000000;
     int nextBlockEnd = section.start() + CalculatedByteCountSignalLimit;
 
     // TODO: move padding checks into extra code before and after loop
     for( int i = section.start(); i<=section.end(); ++i )
     {
-        quint64 value = quint64( model->datum(i) ) << 56;
-        ++i;
-        if( i<=section.end() )
-            value += quint64( model->datum(i) ) << 48;
-        ++i;
-        if( i<=section.end() )
-            value += quint64( model->datum(i) ) << 40;
-        ++i;
-        if( i<=section.end() )
-            value += quint64( model->datum(i) ) << 32;
+        quint64 value = (quint64)( (quint8)(model->datum( i )) ) << 56;
         ++i;
         if( i<=section.end() )
-            value += model->datum( i ) << 24;
-        ++i;
-        if( i<=section.end() )
-            value += model->datum( i ) << 16;
-        ++i;
-        if( i<=section.end() )
-            value += model->datum( i ) << 8;
+        {
+            value += (quint64)( (quint8)(model->datum( i )) ) << 48;
+            ++i;
+            if( i<=section.end() )
+            {
+                value += (quint64)( (quint8)(model->datum( i )) ) << 40;
+                ++i;
+                if( i<=section.end() )
+                {
+                    value += (quint64)( (quint8)(model->datum( i )) ) << 32;
+                    ++i;
+                    if( i<=section.end() )
+                    {
+                        value += (quint8)( model->datum(i) ) << 24;
+                        ++i;
+                        if( i<=section.end() )
+                        {
+                            value += (quint8)( model->datum(i) ) << 16;
+                            ++i;
+                            if( i<=section.end() )
+                            {
+                                value += (quint8)( model->datum(i) ) << 8;
+                                ++i;
+                                if( i<=section.end() )
+                                    value += (quint8)( model->datum(i) );
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        modSum += value;
+#if 0
+        const uchar value = (crcBits & 0xFF) + model->datum( i );
+        crcBits >>= 8;
+        crcBits ^= lookupTable[value];
+#endif
+        if( i >= nextBlockEnd )
+        {
+            nextBlockEnd += CalculatedByteCountSignalLimit;
+            emit calculatedBytes( section.localIndex(i)+1 );
+        }
+    }
+
+    return modSum;
+}
+
+quint64 ModSum64ByteArrayChecksumAlgorithm::calculateModSumWithNonMachineEndianness( const KHECore::AbstractByteArrayModel* model, const KHE::Section& section ) const
+{
+    quint64 modSum = 0x00000000;
+    int nextBlockEnd = section.start() + CalculatedByteCountSignalLimit;
+
+    // TODO: move padding checks into extra code before and after loop
+    for( int i = section.start(); i<=section.end(); ++i )
+    {
+        quint64 value = (quint8)( model->datum(i) );
         ++i;
         if( i<=section.end() )
-            value += model->datum( i );
+        {
+            value += (quint8)( model->datum(i) ) << 8;
+            ++i;
+            if( i<=section.end() )
+            {
+                value += (quint8)( model->datum(i) ) << 16;
+                ++i;
+                if( i<=section.end() )
+                {
+                    value += (quint8)( model->datum(i) ) << 24;
+                    ++i;
+                    if( i<=section.end() )
+                    {
+                        value += (quint64)( (quint8)(model->datum( i )) ) << 32;
+                        ++i;
+                        if( i<=section.end() )
+                        {
+                            value += (quint64)( (quint8)(model->datum( i )) ) << 40;
+                            ++i;
+                            if( i<=section.end() )
+                            {
+                                value += (quint64)( (quint8)(model->datum( i )) ) << 48;
+                                ++i;
+                                if( i<=section.end() )
+                                    value += (quint64)( (quint8)(model->datum( i )) ) << 56;
+                            }
+                        }
+                    }
+                }
+            }
+        }
 
         modSum += value;
 #if 0
@@ -80,8 +162,7 @@
         }
     }
 
-    *result = QString::number( modSum, 16 );
-    return true;
+    return modSum;
 }
 
 ModSum64ByteArrayChecksumAlgorithm::~ModSum64ByteArrayChecksumAlgorithm() {}
--- okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsum32bytearraychecksumalgorithm.h	
+++ okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsum32bytearraychecksumalgorithm.h	
@@ -40,6 +40,10 @@
     virtual AbstractByteArrayChecksumParameterSet* parameterSet();
 
   protected:
+    quint32 calculateModSumWithMachineEndianness( const KHECore::AbstractByteArrayModel* model, const KHE::Section& section ) const;
+    quint32 calculateModSumWithNonMachineEndianness( const KHECore::AbstractByteArrayModel* model, const KHE::Section& section ) const;
+
+  protected:
     ModSumByteArrayChecksumParameterSet mParameterSet;
 };
 
--- okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsumbytearraychecksumparameterset.h	
+++ okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsumbytearraychecksumparameterset.h	
@@ -25,6 +25,7 @@
 
 // lib
 #include "abstractbytearraychecksumparameterset.h"
+#include "endianness.h"
 
 
 class ModSumByteArrayChecksumParameterSet : public AbstractByteArrayChecksumParameterSet
@@ -37,16 +38,13 @@
     virtual QString id() const;
 
   public:
-//     void setGroupSize( int groupSize );
-//     void setMoveBitWidth( int moveBitWidth );
+    void setEndianess( Endianess endianess );
 
   public:
-//     int groupSize() const;
-//     int moveBitWidth() const;
+    Endianess endianess() const;
 
   protected:
-//     int mGroupSize;
-//     int mMoveBitWidth;
+    Endianess mEndianess;
 };
 
 #endif
--- okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsumbytearraychecksumparametersetedit.cpp	
+++ okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsumbytearraychecksumparametersetedit.cpp	
@@ -26,83 +26,46 @@
 #include "modsumbytearraychecksumparameterset.h"
 // KDE
 #include <KLocale>
+#include <KComboBox>
 // Qt
 #include <QtGui/QLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QSpinBox>
 
 
 ModSumByteArrayChecksumParameterSetEdit::ModSumByteArrayChecksumParameterSetEdit( QWidget* parent )
   : AbstractByteArrayChecksumParameterSetEdit( parent )
 {
-#if 0
-    QVBoxLayout *baseLayout = new QVBoxLayout( this );
+    QVBoxLayout* baseLayout = new QVBoxLayout( this );
     baseLayout->setMargin( 0 );
 
-    mGroupSizeSpinBox = new QSpinBox( this );
-    mGroupSizeSpinBox->setRange( 1, INT_MAX );
+    // TODO KDE4.4: add label
+    mEndiannessComboBox = new KComboBox( this );
+    mEndiannessComboBox->addItem( i18nc("@item:inlistbox","Little-endian") ); // add first for index
+    mEndiannessComboBox->addItem( i18nc("@item:inlistbox","Big-endian") );    // add second for index
+    connect( mEndiannessComboBox, SIGNAL(activated( int )),
+             SIGNAL(valuesChanged()) );
 
-    QLabel *label = new QLabel( i18nc("@label:spinbox number of bytes the rotation is done within",
-                                      "&Group size [bytes]"),
-                                this );
-    label->setBuddy( mGroupSizeSpinBox );
-    const QString groupSizeWhatsThis =
-        i18nc( "@info:whatsthis",
-               "Control the number of bytes within which each rotation is made." );
-    label->setWhatsThis( groupSizeWhatsThis );
-    mGroupSizeSpinBox->setWhatsThis( groupSizeWhatsThis );
-
-    baseLayout->addWidget( label );
-    baseLayout->addWidget( mGroupSizeSpinBox );
-
-    mMoveBitWidthSpinBox = new QSpinBox( this );
-    mMoveBitWidthSpinBox->setRange( INT_MIN, INT_MAX );
-    connect( mMoveBitWidthSpinBox, SIGNAL(valueChanged( int )), SLOT(onValueChanged( int )) );
-
-    label = new QLabel( i18nc("@label:spinbox","S&hift width [bits]"), this );
-    label->setBuddy( mMoveBitWidthSpinBox );
-    const QString moveBitWidthWhatsThis =
-        i18nc( "@info:whatsthis",
-               "Control the width of the shift. Positive numbers move the bits to the right, negative to the left." );
-    label->setWhatsThis( moveBitWidthWhatsThis );
-    mMoveBitWidthSpinBox->setWhatsThis( moveBitWidthWhatsThis );
-
-    baseLayout->addWidget( label );
-    baseLayout->addWidget( mMoveBitWidthSpinBox );
+    baseLayout->addWidget( mEndiannessComboBox );
     baseLayout->addStretch( 10 );
-#endif
 }
 
-bool ModSumByteArrayChecksumParameterSetEdit::isValid() const { return true; } //mMoveBitWidthSpinBox->value() != 0; }
+bool ModSumByteArrayChecksumParameterSetEdit::isValid() const { return true; }
 
-void ModSumByteArrayChecksumParameterSetEdit::setParameterSet( const AbstractByteArrayChecksumParameterSet *parameterSet )
+void ModSumByteArrayChecksumParameterSetEdit::setParameterSet( const AbstractByteArrayChecksumParameterSet* parameterSet )
 {
-#if 0
-    const RotateByteArrayFilterParameterSet *rotateParameterSet =
-        static_cast<const RotateByteArrayFilterParameterSet *>( parameterSet );
-
-    mGroupSizeSpinBox->setValue( rotateParameterSet->groupSize() );
-    mMoveBitWidthSpinBox->setValue( rotateParameterSet->moveBitWidth() );
-#endif
+    const ModSumByteArrayChecksumParameterSet* modSumParameterSet =
+        static_cast<const ModSumByteArrayChecksumParameterSet *>( parameterSet );
+
+    mEndiannessComboBox->setCurrentIndex( modSumParameterSet->endianess() );
 }
 
 void ModSumByteArrayChecksumParameterSetEdit::getParameterSet( AbstractByteArrayChecksumParameterSet* parameterSet ) const
 {
-#if 0
-    RotateByteArrayFilterParameterSet *rotateParameterSet =
-        static_cast<RotateByteArrayFilterParameterSet *>( parameterSet );
-
-    rotateParameterSet->setGroupSize( mGroupSizeSpinBox->value() );
-    rotateParameterSet->setMoveBitWidth( mMoveBitWidthSpinBox->value() );
-#endif
-}
+    ModSumByteArrayChecksumParameterSet* modSumParameterSet =
+        static_cast<ModSumByteArrayChecksumParameterSet *>( parameterSet );
 
-#if 0
-void ModSumByteArrayChecksumParameterSetEdit::onValueChanged( int value )
-{
-    emit validityChanged( value != 0 );
+    modSumParameterSet->setEndianess( static_cast<Endianess>( mEndiannessComboBox->currentIndex() ) );
 }
-#endif
+
 
 ModSumByteArrayChecksumParameterSetEdit::~ModSumByteArrayChecksumParameterSetEdit()
 {}
--- okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsum16bytearraychecksumalgorithm.h	
+++ okteta/program/oktetakakao/controllers/view/libbytearraychecksum/algorithm/modsum16bytearraychecksumalgorithm.h	
@@ -40,6 +40,10 @@
     virtual AbstractByteArrayChecksumParameterSet* parameterSet();
 
   protected:
+    quint16 calculateModSumWithMachineEndianness( const KHECore::AbstractByteArrayModel* model, const KHE::Section& section ) const;
+    quint16 calculateModSumWithNonMachineEndianness( const KHECore::AbstractByteArrayModel* model, const KHE::Section& section ) const;
+
+  protected:
     ModSumByteArrayChecksumParameterSet mParameterSet;
 };
 
--- okteta/program/oktetakakao/controllers/view/libbytearraychecksum/endianness.h	
+++ okteta/program/oktetakakao/controllers/view/libbytearraychecksum/endianness.h	
@@ -0,0 +1,44 @@
+/*
+    This file is part of the Okteta Kakao module, part of the KDE project.
+
+    Copyright 2009 Friedrich W. H. Kossebau <kossebau@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) version 3, or any
+    later version accepted by the membership of KDE e.V. (or its
+    successor approved by the membership of KDE e.V.), which shall
+    act as a proxy defined in Section 6 of version 3 of the license.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef ENDIANESS_H
+#define ENDIANESS_H
+
+// Qt
+#include <QtCore/Qt>
+
+
+enum Endianess
+{
+    LittleEndian = 0, // Intel, Alpha, ...
+    BigEndian =    1 // Sun, Motorola, ...
+};
+
+
+static const Endianess ThisMachineEndianness =
+#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+    LittleEndian;
+#else
+    BigEndian;
+#endif
+
+#endif
--- okteta/program/TODO	
+++ okteta/program/TODO	
@@ -171,9 +171,16 @@
 * turned Goto, Search and Replace utils into kind of tools/controllers (first step, needs more refinement)
 * added a checksum calculator tool (using also QCA2, but got just MD5 and SHA-1 from it for now, hm)
 
+Fixed after 0.3 Beta 1:
+-----------------------
+* fixed: ensure unsigned values if calculating modsum
+* fixed: make modsum algorithms endianness aware (controlled by parameter endianess)
+* fixed: make change of selection also emitted on mouse move with pressed button
+
 Next to work on:
 ----------------------------------
 Important:
+* bookmark is not painted correctly if cursor moves from it
 * width calculation for resize seems to need to include some margins
 * old wrong sized cursor picture gets painted on zoom change
 * QActionGroups are cleared on setupGui, e.g. if toolbar gets edited
--- okteta/program/libkakao/controllers/documentsystem/filesystembrowser/filesystembrowserview.cpp	
+++ okteta/program/libkakao/controllers/documentsystem/filesystembrowser/filesystembrowserview.cpp	
@@ -45,8 +45,6 @@
     layout->setSpacing( 0 );
 
     // tool bar
-    mActionCollection = new KActionCollection( this );
-
     mToolbar = new KToolBar( this );
     mToolbar->setMovable( false );
     mToolbar->setToolButtonStyle( Qt::ToolButtonIconOnly );
@@ -69,22 +67,24 @@
 
     // fill toolbar
     static const char* const ToolbarActionNames[] =
-    { "up", "back", "forward", "home", "short view", "detailed view", "tree view"  };
+    { "back", "forward", "up", "home", "short view", "detailed view", "tree view"  };
     static const int ToolbarActionNamesCount = sizeof(ToolbarActionNames) / sizeof(ToolbarActionNames[0]);
 
+    const KActionCollection* dirOperatorActionCollection = mDirOperator->actionCollection();
     for( int i = 0; i<ToolbarActionNamesCount; ++i )
     {
-        QAction* action = mDirOperator->actionCollection()->action( ToolbarActionNames[i] );
+        QAction* action = dirOperatorActionCollection->action( ToolbarActionNames[i] );
         if( action )
             mToolbar->addAction( action );
     }
+
+    mActionCollection = new KActionCollection( this );
     QAction* syncDirAction = mActionCollection->addAction( "sync_dir" );
-    syncDirAction->setIcon( KIcon("curfiledir") );
-    syncDirAction->setText( i18nc("", "Folder of Current Document") );
+    syncDirAction->setIcon( KIcon("dirsync") );
+    syncDirAction->setText( i18nc("@action:intoolbar", "Folder of Current Document") );
     connect( syncDirAction, SIGNAL(triggered()), SLOT(syncCurrentDocumentDirectory()) );
     connect( mTool, SIGNAL(hasCurrentUrlChanged( bool )), syncDirAction, SLOT(setEnabled( bool )) );
     syncDirAction->setEnabled( mTool->hasCurrentUrl() );
-
     mToolbar->addAction( syncDirAction );
 }
 
--- kcharselect/KCharSelect.desktop	
+++ kcharselect/KCharSelect.desktop	
@@ -57,8 +57,8 @@
 GenericName[uz@cyrillic]=Ҳарф танлагич
 GenericName[vi]=Trình Chọn Kí Tự 
 GenericName[wa]=Tchoezixheu di caracteres
-GenericName[x-test]=xxCharacter Selectorxx
 GenericName[xh]=Umkhethi womsebenzi
+GenericName[x-test]=xxCharacter Selectorxx
 GenericName[zh_CN]=字符选择器
 GenericName[zh_TW]=字元選擇器
 Exec=kcharselect -caption "%c"
@@ -82,8 +82,8 @@
 Name[ta]= கேஎழுத்துதேர்வு 
 Name[tg]=KИнтихобгари Аломатҳо
 Name[th]=เลือกอักขระ-K
-Name[x-test]=xxKCharSelectxx
 Name[xh]=Itshati yokukheta i K
+Name[x-test]=xxKCharSelectxx
 Name[zh_TW]=KDE 字元選擇
 X-KDE-StartupNotify=true
 X-DBUS-StartupType=Multi
--- ktimer/ktimer.desktop	
+++ ktimer/ktimer.desktop	
@@ -63,8 +63,8 @@
 Name[ta]= Kநேரம் காட்டி
 Name[tg]=KВақтсанҷ
 Name[th]=ตั้งเวลาทำงาน-K
-Name[x-test]=xxKTimerxx
 Name[xh]=Umjongi Wexesha
+Name[x-test]=xxKTimerxx
 Name[zh_TW]=KDE 計時器
 X-KDE-StartupNotify=true
 X-DBUS-StartupType=Multi
--- kwallet/kwalletmanager.cpp	
+++ kwallet/kwalletmanager.cpp	
@@ -67,7 +67,7 @@
         _tray->setStatus( Experimental::KNotificationItem::Passive );
 		_tray->setIcon("wallet-closed");
 		_tray->setToolTip( "wallet-closed", i18n("KDE Wallet"), i18n("No wallets open."));
-		connect(_tray, SIGNAL(quitSelected()), SLOT(shuttingDown()));
+		//connect(_tray, SIGNAL(quitSelected()), SLOT(shuttingDown()));
 		const QStringList wl = KWallet::Wallet::walletList();
 		bool isOpen = false;
 		for (QStringList::ConstIterator it = wl.begin(); it != wl.end(); ++it) {
--- kdf/kwikdisk.desktop	
+++ kdf/kwikdisk.desktop	
@@ -71,8 +71,8 @@
 GenericName[tr]=Çıkartılabilir Aygıt
 GenericName[uk]=Утиліта змінних носіїв
 GenericName[wa]=Usteye po les bodjåves sopoirts
-GenericName[x-test]=xxRemovable Media Utilityxx
 GenericName[xh]=Umdlali wezoSasazo
+GenericName[x-test]=xxRemovable Media Utilityxx
 GenericName[zh_CN]=可移动介质工具
 GenericName[zh_TW]=可移動媒體公用程式
 Terminal=false
--- kdf/kcmdf.desktop	
+++ kdf/kcmdf.desktop	
@@ -69,8 +69,8 @@
 Name[uz@cyrillic]=Сақлаш ускуналари
 Name[vi]=Các Thiết Bị Lưu Trữ
 Name[wa]=Éndjins di wårdaedje
-Name[x-test]=xxStorage Devicesxx
 Name[xh]=Amacebo Okugcina
+Name[x-test]=xxStorage Devicesxx
 Name[zh_CN]=存储设备
 Name[zh_TW]=儲存裝置
 X-DocPath=kcontrol/blockdevices/index.html
--- kdf/kdf.desktop	
+++ kdf/kdf.desktop	
@@ -73,8 +73,8 @@
 GenericName[uk]=Перегляд використання диску
 GenericName[vi]=Xem đĩa trống 
 GenericName[wa]=Vey l' eployaedje del deure plake
-GenericName[x-test]=xxView Disk Usagexx
 GenericName[xh]=Jonga Ukusebenziseka KweDiskic
+GenericName[x-test]=xxView Disk Usagexx
 GenericName[zh_CN]=查看磁盘使用状况
 GenericName[zh_TW]=檢視磁碟使用情形
 Terminal=false
--- printer-applet/printer-applet.notifyrc	
+++ printer-applet/printer-applet.notifyrc	
@@ -59,6 +59,7 @@
 Comment[tr]=Yazıcı Programcığı
 Comment[uk]=Аплет принтера
 Comment[x-test]=xxPrinter Appletxx
+Comment[zh_CN]=打印机小程序
 Comment[zh_TW]=印表機小程式
 
 [Event/New Printer]
@@ -81,6 +82,7 @@
 Name[tr]=Yeni Yazıcı
 Name[uk]=Новий принтер
 Name[x-test]=xxNew Printerxx
+Name[zh_CN]=新打印机
 Name[zh_TW]=新增印表機
 Comment=Configuring New Printer
 Comment[de]=Neuen Drucker einrichten
@@ -101,6 +103,7 @@
 Comment[tr]=Yeni Yazıcı Yapılandırılıyor
 Comment[uk]=Налаштування нового принтера
 Comment[x-test]=xxConfiguring New Printerxx
+Comment[zh_CN]=配置新打印机
 Comment[zh_TW]=設定新印表機
 Action=Popup
 
@@ -123,6 +126,7 @@
 Name[tr]=Yazıcı Eklendi
 Name[uk]=Додано принтер
 Name[x-test]=xxPrinter Addedxx
+Name[zh_CN]=已添加打印机
 Name[zh_TW]=已新增印表機
 Comment=Printer Added
 Comment[de]=Drucker hinzugefügt
@@ -143,6 +147,7 @@
 Comment[tr]=Yazıcı Eklendi
 Comment[uk]=Додано принтер
 Comment[x-test]=xxPrinter Addedxx
+Comment[zh_CN]=已添加打印机
 Comment[zh_TW]=已新增印表機
 Action=Popup
 
@@ -166,6 +171,7 @@
 Name[tr]=Yazıcı Sürücüsü Yok
 Name[uk]=Немає драйвера принтера
 Name[x-test]=xxMissing Printer Driverxx
+Name[zh_CN]=缺失打印机驱动
 Name[zh_TW]=遺失印表機驅動程式
 Comment=Missing Printer Driver
 Comment[de]=Fehlender Druckertreiber
@@ -186,6 +192,7 @@
 Comment[tr]=Yazıcı Sürücüsü Yok
 Comment[uk]=Немає драйвера принтера
 Comment[x-test]=xxMissing Printer Driverxx
+Comment[zh_CN]=缺失打印机驱动
 Comment[zh_TW]=遺失印表機驅動程式
 Action=Popup
 
@@ -209,6 +216,7 @@
 Name[tr]=Diğer
 Name[uk]=Інше
 Name[x-test]=xxOtherxx
+Name[zh_CN]=其它
 Name[zh_TW]=其他
 Comment=Other
 Comment[de]=Andere
@@ -229,5 +237,6 @@
 Comment[tr]=Diğer
 Comment[uk]=Інше
 Comment[x-test]=xxOtherxx
+Comment[zh_CN]=其它
 Comment[zh_TW]=其他
 Action=Popup
--- printer-applet/printer-applet.desktop	
+++ printer-applet/printer-applet.desktop	
@@ -43,6 +43,7 @@
 Comment[ar]=الأيقونة المصغرة لرسائل عمل الطباعة
 Comment[bg]=Икона в системния панел за задачите на принтера
 Comment[ca]=Icona de la safata del sistema per gestionar els treballs d'impressió
+Comment[cs]=Ikona v systémové části panelu pro správu úloh tisku
 Comment[da]=statusikon til håndtering af udskriftsjob
 Comment[de]=Symbol für die Druckerverwaltung, dargestellt im Systemabschnitt der Kontrollleiste
 Comment[el]=Εικονίδιο πλαισίου συστήματος για διαχείριση εργασιών εκτύπωσης
--- kdelirc/kcmlirc/kcm_lirc.desktop	
+++ kdelirc/kcmlirc/kcm_lirc.desktop	
@@ -25,6 +25,7 @@
 Name[cy]=Rheolyddion Pell
 Name[de]=Fernsteuerungen
 Name[eo]=Teleregiloj
+Name[es]=Mandos a distancia
 Name[et]=Kaugjuhtimine
 Name[eu]=Urruneko Aginteak
 Name[fa]=کنترلهای از راه دور
@@ -36,10 +37,12 @@
 Name[kk]=Қашықтан басқару
 Name[lt]=Nuotolinis valdymas
 Name[mk]=Далечински управувачи
+Name[nb]=Fjernkontroll
 Name[nds]=Feernbedeners
 Name[ne]=टाढाको नियन्त्रण
 Name[nl]=Afstandsbediening
 Name[nn]=Fjernkontrollar
+Name[pt]=Comandos à Distância
 Name[pt_BR]=Controles remotos
 Name[ro]=Telecomenzi
 Name[sl]=Daljinski upravljalci
@@ -49,6 +52,7 @@
 Name[tr]=Uzaktan Kontroller
 Name[uk]=Елементи дистанційного керування
 Name[vi]=Các Điều Khiển Từ Xa
+Name[zh_CN]=远程控制
 Name[zh_TW]=遙控鍵
 
 Comment=Configure your remote controls for use with applications
@@ -56,6 +60,7 @@
 Comment[cs]=Nastavení dálkových ovladačů
 Comment[cy]=Ffurfweddu eich rheolyddion pell ar gyfer ddefnydd efo cymhwysiadau
 Comment[de]=Einrichtung diverser Applikationen zur Bedienung mit einer Fernsteuerung
+Comment[es]=Configurar sus mandos a distancia para usar con las aplicaciones
 Comment[et]=Kaugjuhtimise seadistamine rakenduste jaoks
 Comment[eu]=Konfiguratu zure urruneko kontrolak aplikazioekin erabiltzeko
 Comment[fa]=برای استفاده با کاربردها، کنترلهای از راه دورتان را پیکربندی کنید
@@ -66,10 +71,12 @@
 Comment[kk]=Қашықтан басқаруды қолданбалармен қолдану үшін баптау
 Comment[lt]=Nuotolinio valdymo programomis konfigūravimas
 Comment[mk]=Конфигурирајте ги вашите далечински управувачи за користење со апликации
+Comment[nb]=Sett opp fjernkontrollene for bruk med programmer
 Comment[nds]=Feernbedeners för den Bruuk mit Programmen instellen
 Comment[ne]=अनुप्रयोगसँग प्रयोग गर्न तपाईंको टाढाको नियन्त्रण कन्फिगर गर्नुहोस्
 Comment[nl]=Uw afstandsbedieningen instellen voor gebruik in KDE
 Comment[nn]=Set opp bruken av fjernkontroll i ulike program
+Comment[pt]=Configure os seus comandos à distância para os usar nas aplicações
 Comment[pt_BR]=Configure seus controles remotos para o uso com aplicativos
 Comment[ro]=Configurează telecomneziile de utilizat cu aplicaţii
 Comment[sl]=Nastavite vaš daljinski upravljalnik za uporabo v programih
--- kdelirc/irkick/irkick.desktop	
+++ kdelirc/irkick/irkick.desktop	
@@ -19,10 +19,12 @@
 GenericName[is]=KDE LIRC þjónn
 GenericName[kk]=KDE LIRC сервері
 GenericName[lt]=KDE LIRC serveris
+GenericName[nb]=KDE LIRC-tjener
 GenericName[nds]=KDE LIRC-Server
 GenericName[ne]=KDE LIRC सर्भर
 GenericName[nl]=KDE LIRC-server
 GenericName[nn]=KDE LIRC-tenar
+GenericName[pt]=Servidor de LIRC para o KDE
 GenericName[pt_BR]=Servidor LIRC do KDE
 GenericName[sl]=Strežnik KDE LIRC
 GenericName[sv]=KDE:s LIRC-server
@@ -31,6 +33,7 @@
 GenericName[uk]=Сервер LIRC для KDE
 GenericName[uz]=KDE LIRC serveri
 GenericName[uz@cyrillic]=KDE LIRC сервери
+GenericName[zh_CN]=KDE LIRC 服务
 GenericName[zh_TW]=KDE LIRC 伺服器
 
 X-KDE-Library=irkick
@@ -48,6 +51,7 @@
 Comment[cs]=Server dálkového ovládání pro KDE.
 Comment[cy]=Gweinydd rheolydd pell isgoch Linux KDE
 Comment[de]=KDE Linux-Infrarot-Fernsteuerungsserver.
+Comment[es]=Servidor de mando a distancia por infrarrojos de Linux KDE.
 Comment[et]=KDE Linuxi infrapuna kaugjuhtimise server.
 Comment[eu]=KDE Linux infrasare urruneko aginte zerbitzaria.
 Comment[fa]=KDE Linuxکارساز کنترل از راه دور مادون قرمز
@@ -57,10 +61,12 @@
 Comment[is]=KDE Linux innrauða fjarstýringarstjórnborðið
 Comment[kk]=KDE Linux инфрақызыл порт арқылы басқару сервері.
 Comment[lt]=KDE Linux infraraudonųjų spindulių sąsajos nuotolinio valdymo serveris
+Comment[nb]=KDE Linux-tjener for infrarød fjernkontroll.
 Comment[nds]=KDE-Linux Infraroot-Feernbedeenkuntrullserver
 Comment[ne]=केडीई लिनक्स अवरक्त टाढाको नियन्त्रण सर्भर ।
 Comment[nl]=KDE-server voor infrarood-afstandsbediening.
 Comment[nn]=KDE-tenar for infraraud fjernkontroll.
+Comment[pt]=Servidor de comandos à distância por infravermelhos para o KDE.
 Comment[pt_BR]=Servidor de controle remoto infravermelho do KDE.
 Comment[ro]=Server de control al telecomenziilor în infraroşu
 Comment[sl]=Strežnik KDE Linux za infrardeči daljninski upravljalnik
@@ -72,5 +78,6 @@
 Comment[uz]=Infraqizil nur bilan masofadan boshqarish serveri
 Comment[uz@cyrillic]=Инфрақизил нур билан масофадан бошқариш сервери
 Comment[vi]=Trình phục vụ điều khiển bằng tia hồng ngoại.
+Comment[zh_CN]=KDE Linux 红外远程控制服务。
 Comment[zh_TW]=KDE Linux 紅外線遙控伺服器。
 
--- kdelirc/irkick/irkick.notifyrc	
+++ kdelirc/irkick/irkick.notifyrc	
@@ -6,38 +6,65 @@
 [Event/global_event]
 Name=Irkick notification
 Name[es]=Notificación de Irkick
+Name[et]=Irkicki märguanne
+Name[nb]=Irkick-varsling
+Name[pt]=Notificação do Irkick
 Name[pt_BR]=Notificação do Irkick
 Name[sv]=Underrättelse från Irkick
 Name[uk]=Сповіщення Irkick
+Name[zh_CN]=Irkick 通知
 Name[zh_TW]=Irkick 通知
 Comment=Irkick global notification event
+Comment[es]=Evento de notificación global de Irkick
+Comment[et]=Irkick globaalne märguandesündmus
+Comment[nb]=Global Irkick varslingshendelse
+Comment[pt]=Evento de notificação global do Irkick
 Comment[pt_BR]=Evento de notificação global do Irkick
 Comment[sv]=Irkick global underrättelsehändelse
 Comment[uk]=Подія загального сповіщення Irkick
+Comment[zh_CN]=Irkick 全局通知事件
 Comment[zh_TW]=Irkick 全域通知事件
 Action=Popup
 
 
 [Event/mode_event]
 Name=Mode event
+Name[et]=Režiimi sündmus
+Name[nb]=Modus-hendelse
+Name[pt]=Evento do modo
 Name[pt_BR]=Evento de modo
 Name[sv]=Lägeshändelse
 Name[uk]=Подія режиму
+Name[zh_CN]=模式事件
 Name[zh_TW]=模式事件
 Comment=Mode has changed
+Comment[es]=El modo ha cambiado
+Comment[et]=Režiimi on muudetud
+Comment[nb]=Modus er endret
+Comment[pt]=O modo foi alterado
 Comment[pt_BR]=O modo foi alterado
 Comment[sv]=Läge har ändrats
 Comment[uk]=Відбулася зміна режиму
+Comment[zh_CN]=模式已更改
 Comment[zh_TW]=模式已變更
 Action=Popup
 
 [Event/app_event]
 Name=Application event
+Name[es]=Evento de aplicación
+Name[et]=Rakenduse sündmus
+Name[nb]=Programhendelse
+Name[pt]=Evento da aplicação
 Name[pt_BR]=Evento do aplicativo
 Name[sv]=Programhändelse
 Name[uk]=Подія програми
+Name[zh_CN]=应用程序事件
 Name[zh_TW]=應用程式事件
 Comment=Irkick has triggered an application
+Comment[es]=Irkick ha lanzado una aplicación
+Comment[et]=Irkick on käivitanud rakenduse
+Comment[nb]=Irkick har utløst et program.
+Comment[pt]=O Irkick despoletou uma aplicação
 Comment[pt_BR]=O Irkick disparou um aplicativo
 Comment[sv]=Irkick har utlöst ett program
 Comment[uk]=Irkick увімкнула програму
--- kdelirc/irkick/irkick.cpp	
+++ kdelirc/irkick/irkick.cpp	
@@ -58,6 +58,7 @@
         QTimer::singleShot(10000, this, SLOT(checkLirc()));
     }
     theFlashOff = new QTimer(theTrayIcon);
+    theFlashOff->setSingleShot(true);
     connect(theFlashOff, SIGNAL(timeout()), SLOT(flashOff()));
 
     theResetCount = 0;
--- kdelirc/remotes/AsusDH.remote.xml	
+++ kdelirc/remotes/AsusDH.remote.xml	
@@ -3,7 +3,7 @@
 
 <remote id="AsusDH">
         <name>Asus Digital Home</name>
-        <author>Gioacchino Mazzurco</author>
+        <author>Gioacchino Mazzurco [gmazzurco89@gmail.com]</author>
         <information>Bundled with all Asus Digital Home motherboard series</information>
         <button id="POWER" class="off"><name>Power off</name></button>
         <button id="QUICK_POWER" class="on"><name>Quick Power</name></button>
--- kcalc/kcalc.desktop	
+++ kcalc/kcalc.desktop	
@@ -76,8 +76,8 @@
 GenericName[uz@cyrillic]=Илмий калкулятор
 GenericName[vi]=Máy Tính Khoa Học 
 GenericName[wa]=Carculete syintifike
-GenericName[x-test]=xxScientific Calculatorxx
 GenericName[xh]=Umatshini Wokubala Ezenzululwazi
+GenericName[x-test]=xxScientific Calculatorxx
 GenericName[zh_CN]=科学计算器
 GenericName[zh_TW]=科學計算機
 Terminal=false
--- ark/app/mainwindow.h	
+++ ark/app/mainwindow.h	
@@ -2,6 +2,7 @@
  * ark -- archiver for the KDE project
  *
  * Copyright (C) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (C) 2008 Harald Hvaal <haraldhv@stud.ntnu.no>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
--- ark/app/extractHereDndPlugin.cpp	
+++ ark/app/extractHereDndPlugin.cpp	
@@ -1,3 +1,24 @@
+/*
+ * ark -- archiver for the KDE project
+ *
+ * Copyright (C) 2009 Harald Hvaal <haraldhv (at@at) stud.ntnu.no>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
 #include "extractHereDndPlugin.h"
 #include <QMenu>
 #include <krun.h>
@@ -8,6 +29,7 @@
 #include <KPluginLoader>
 #include <KApplication>
 #include <KLocale>
+#include <kfileitemlistproperties.h>
 
 using Kerfuffle::BatchExtract;
 
@@ -24,7 +46,7 @@
 	batchJob->setAutoSubfolder(true);
 	batchJob->setDestinationFolder(m_dest.path());
 	batchJob->setPreservePaths(true);
-	foreach(const KUrl& url, m_info.urlList()) {
+	foreach(const KUrl& url, m_urls) {
 		batchJob->addInput(url);
 	}
 
@@ -46,24 +68,22 @@
 	kDebug() << "plugin setup";
 	QString extractHereMessage = i18n("Extract here");
 
-#if 0
 	if (!Kerfuffle::supportedMimeTypes().contains(popupMenuInfo.mimeType())) {
 		kDebug(1601) << "Unsupported file" << popupMenuInfo.mimeType() << Kerfuffle::supportedMimeTypes();
 		return;
 	}
 
-	//kDebug() << "Plugin executed" 
+	kDebug() << "Plugin executed";
 		//<< popupMenuInfo.mimeGroup()
 		//<< popupMenuInfo.mimeType();
 
-	KAction *action = new KAction("&Extract here", menu);
+	KAction *action = new KAction(KIcon("archive-extract"), extractHereMessage, NULL);
 	connect(action, SIGNAL(triggered()),
 			this, SLOT(slotTriggered()));
 
-	menu->addAction(action);
+	userActions.append(action);
 	m_dest = destination;
-	m_info = popupMenuInfo;
-#endif
+	m_urls = popupMenuInfo.urlList();
 
 }
 
--- ark/app/ark.desktop	
+++ ark/app/ark.desktop	
@@ -59,8 +59,8 @@
 GenericName[uz@cyrillic]=Архивлаш воситаси
 GenericName[vi]=Công Cụ Nén
 GenericName[wa]=Usteye d' årtchivaedje
-GenericName[x-test]=xxArchiving Toolxx
 GenericName[xh]=Isixhobo Sokuphatha i Archive
+GenericName[x-test]=xxArchiving Toolxx
 GenericName[zh_CN]=压缩归档工具
 GenericName[zh_TW]=壓縮工具
 Name=Ark
--- ark/app/ark_dndextract.desktop	
+++ ark/app/ark_dndextract.desktop	
@@ -3,4 +3,13 @@
 X-KDE-ServiceTypes=KonqDndPopupMenu/Plugin
 X-KDE-Library=libextracthere
 Name=Ark Extract Here
-MimeType=application/x-compressed-tar;
+Name[es]=Extraer aquí con Ark
+Name[et]=Paki siia lahti
+Name[nb]=Pakk ut arkivet her med Ark
+Name[pt]=Extrair para Aqui
+Name[pt_BR]=Extrair com o Ark aqui
+Name[sv]=Packa upp arkiv här
+Name[uk]=Видобути архів сюди з Ark
+Name[zh_CN]=Ark 在此解压缩
+Name[zh_TW]=在此解壓縮
+MimeType=application/x-gzip;application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/zip;application/x-bzip;application/x-rar;application/x-tarz;application/x-bzip2;application/x-java-archive;application/x-deb;application/x-ace;application/x-7z-compressed;application/x-compress;application/x-zip-compressed;application/x-lzma;
--- ark/app/main.cpp	
+++ ark/app/main.cpp	
@@ -2,6 +2,7 @@
  * ark -- archiver for the KDE project
  *
  * Copyright (C) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (C) 2008-2009 Harald Hvaal <haraldhv@stud.ntnu.no>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
--- ark/app/ark_addtoservicemenu.desktop	
+++ ark/app/ark_addtoservicemenu.desktop	
@@ -48,11 +48,13 @@
 Name=Here
 Name[es]=Aquí
 Name[et]=Siia
+Name[nb]=Her
 Name[pt]=Aqui
 Name[pt_BR]=Aqui
 Name[sv]=Här
 Name[tr]=Buraya
 Name[uk]=Сюди
+Name[zh_CN]=这里
 Name[zh_TW]=這裡
 Icon=utilities-file-archiver
 Exec=ark --changetofirstpath --add --autofilename tar.gz %F
@@ -61,11 +63,13 @@
 Name=As ZIP Archive
 Name[es]=Como archivo comprimido ZIP
 Name[et]=ZIP-arhiivina
+Name[nb]=Som ZIP-arkiv
 Name[pt]=Como Pacote ZIP
 Name[pt_BR]=Como arquivo ZIP
 Name[sv]=Som ZIP-arkiv
 Name[tr]=ZIP Arşivi Olarak
 Name[uk]=Як архів ZIP
+Name[zh_CN]=为 ZIP 归档
 Name[zh_TW]=成 ZIP 壓縮檔
 Icon=utilities-file-archiver
 Exec=ark --changetofirstpath --add --autofilename zip %F
@@ -74,11 +78,13 @@
 Name=As RAR Archive
 Name[es]=Como archivo comprimido RAR
 Name[et]=RAR-arhiivina
+Name[nb]=Som RAR-arkiv
 Name[pt]=Como Pacote RAR
 Name[pt_BR]=Como arquivo RAR
 Name[sv]=Som RAR-arkiv
 Name[tr]=RAR Arşivi Olarak
 Name[uk]=Як архів RAR
+Name[zh_CN]=为 RAR 归档
 Name[zh_TW]=成 RAR 壓縮檔
 Icon=utilities-file-archiver
 Exec=ark --changetofirstpath --add --autofilename rar %F
@@ -87,16 +93,27 @@
 Name=As ZIP/TAR Archive
 Name[es]=Como archivo comprimido ZIP/TAR
 Name[et]=ZIP/TAR-arhiivina
+Name[nb]=Som ZIP/TAR-arkiv
 Name[pt]=Como Pacote ZIP/TAR
 Name[pt_BR]=Como arquivo ZIP/TAR
 Name[sv]=Som ZIP/TAR-arkiv
 Name[tr]=ZIP/TAR Arşivi Olarak
 Name[uk]=Як архів ZIP/TAR
+Name[zh_CN]=为 ZIP/TAR 归档
 Name[zh_TW]=成 ZIP 壓縮檔
 Icon=utilities-file-archiver
 Exec=ark --changetofirstpath --add --autofilename tar.gz %F
 
 [Desktop Action compressTo]
 Name=Compress To...
+Name[es]=Comprimir en...
+Name[et]=Paki asukohta...
+Name[nb]=Komprimer til …
+Name[pt]=Comprimir Para...
+Name[pt_BR]=Comprimir para...
+Name[sv]=Komprimera till...
+Name[uk]=Стиснути до...
+Name[zh_CN]=压缩到...
+Name[zh_TW]=壓縮為...
 Icon=utilities-file-archiver
 Exec=ark --add --changetofirstpath --dialog %F
--- ark/app/extractHereDndPlugin.h	
+++ ark/app/extractHereDndPlugin.h	
@@ -1,3 +1,24 @@
+/*
+ * ark -- archiver for the KDE project
+ *
+ * Copyright (C) 2009 Harald Hvaal <haraldhv (at@at) stud.ntnu.no>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
 #ifndef _EXTRACTHEREDNDPLUGIN_H_
 #define _EXTRACTHEREDNDPLUGIN_H_
 
@@ -23,7 +44,7 @@
 				QList<QAction*>& userActions);
 	private:
 		KUrl m_dest;
-		KonqPopupMenuInformation m_info;
+		QList<KUrl> m_urls;
 };
 
 #endif /* _EXTRACTHEREDNDPLUGIN_H_ */
--- ark/app/ark_servicemenu.desktop	
+++ ark/app/ark_servicemenu.desktop	
@@ -12,17 +12,28 @@
 Name=Extract Archive Here
 Name[es]=Extraer archivo comprimido aquí
 Name[et]=Paki arhiiv siia lahti
+Name[nb]=Pakk ut arkivet her
 Name[pt]=Extrair o Pacote para Aqui
 Name[pt_BR]=Extrair arquivo aqui
 Name[sv]=Packa upp arkiv här
 Name[tr]=Arşivi Buraya Aç
 Name[uk]=Видобути архів сюди
+Name[zh_CN]=在此解压缩归档
 Name[zh_TW]=在此解壓縮
 Icon=utilities-file-archiver
 Exec=ark --batch --autodestination %F
 
 [Desktop Action arkExtractTo]
 Name=Extract Archive To...
+Name[es]=Extraer archivo comprimido en...
+Name[et]=Paki arhiiv lahti...
+Name[nb]=Pakk ut arkivet til …
+Name[pt]=Extrair o Pacote Para...
+Name[pt_BR]=Extrair arquivo para...
+Name[sv]=Packa upp arkiv i...
+Name[uk]=Видобути архів до...
+Name[zh_CN]=解压缩归档到...
+Name[zh_TW]=解壓縮到...
 Icon=utilities-file-archiver
 Exec=ark --batch --autodestination --dialog %F
 
@@ -30,11 +41,13 @@
 Name=Extract Archive Here, Autodetect Subfolder
 Name[es]=Extraer archivo comprimido aquí, autodetectar subcarpeta
 Name[et]=Paki arhiiv siia lahti, tuvasta automaatselt alamkataloog
+Name[nb]=Pakk ut arkivet her, finn undermapper automatisk
 Name[pt]=Extrair o Pacote Aqui com Detecção da Sub-Pasta
 Name[pt_BR]=Extrair arquivo aqui, detectar automaticamente a subpasta
 Name[sv]=Packa upp arkiv här, detektera underkatalog automatiskt
 Name[tr]=Arşivi Buraya Aç, Dizin Yapısını Koru
 Name[uk]=Видобути архів сюди, автоматично визначити підтеку
+Name[zh_CN]=在此解压缩归档，自动探测子文件夹
 Name[zh_TW]=在此解壓縮，自動偵測子資料夾
 Icon=utilities-file-archiver
 Exec=ark --batch --autodestination --autosubfolder %F
--- ark/app/CMakeLists.txt	
+++ ark/app/CMakeLists.txt	
@@ -12,7 +12,6 @@
 install( TARGETS ark  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 ########### konqueror ark_extract_here plugin ###############
-if( false )
 find_package(LibKonq REQUIRED)
 set(extracthere_SRCS extractHereDndPlugin.cpp)
 kde4_add_plugin(extracthere WITH_PREFIX ${extracthere_SRCS})
@@ -20,7 +19,6 @@
 include_directories(${LIBKONQ_INCLUDE_DIR})
 install( TARGETS extracthere DESTINATION ${PLUGIN_INSTALL_DIR} )
 install( FILES ark_dndextract.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-endif( false )
 ########### install files ###############
 install(FILES ark_addtoservicemenu.desktop ark_servicemenu.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus)
 install( FILES ark.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
--- ark/app/mainwindow.cpp	
+++ ark/app/mainwindow.cpp	
@@ -1,9 +1,10 @@
 /*
  * ark -- archiver for the KDE project
  *
- * Copyright (C) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
- * Copyright (C) 2003: Helio Chissini de Castro <helio@conectiva.com>
  * Copyright (C) 2002-2003: Georg Robbers <Georg.Robbers@urz.uni-hd.de>
+ * Copyright (C) 2003: Helio Chissini de Castro <helio@conectiva.com>
+ * Copyright (C) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (C) 2008 Harald Hvaal <haraldhv@stud.ntnu.no>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
--- ark/plugins/rarplugin/kerfuffle_rar.desktop	
+++ ark/plugins/rarplugin/kerfuffle_rar.desktop	
@@ -19,6 +19,7 @@
 Comment[ar]=Kerfuffle ملحق لـ rar
 Comment[bg]=Приставка RAR за Kerfuffle
 Comment[ca]=Connector del rar pel Kerfuffle
+Comment[cs]=rar modul pro Kerfuffle
 Comment[da]=rar-plugin til Kerfuffle
 Comment[de]=RAR-Modul für Kerfuffle
 Comment[el]=πρόσθετο rar για τη Kerfuffle
--- ark/plugins/cliplugin/kerfuffle_cli.desktop	
+++ ark/plugins/cliplugin/kerfuffle_cli.desktop	
@@ -27,5 +27,6 @@
 Name[tr]=TODO arşivi eklentisi
 Name[uk]=Ще не створений додаток архівів
 Name[x-test]=xxTODO archive pluginxx
+Name[zh_CN]=TODO 归档插件
 Name[zh_TW]=TODO 歸檔外掛程式
 MimeType=TODO;
--- ark/plugins/cli7zplugin/kerfuffle_7z.desktop	
+++ ark/plugins/cli7zplugin/kerfuffle_7z.desktop	
@@ -29,5 +29,6 @@
 Name[tr]=7zip arşivi eklentisi
 Name[uk]=Додаток для архівів 7zip
 Name[x-test]=xx7zip archive pluginxx
+Name[zh_CN]=7zip 归档插件
 Name[zh_TW]=7zip 壓縮檔外掛程式
 MimeType=application/x-7z-compressed;
--- ark/plugins/cli7zplugin/cliplugin.cpp	
+++ ark/plugins/cli7zplugin/cliplugin.cpp	
@@ -51,10 +51,22 @@
 		p[ListProgram] = p[ExtractProgram] = p[DeleteProgram] = p[AddProgram] = "7z";
 
 		p[ListArgs] = QStringList() << "l" << "-slt" << "$Archive";
-		p[ExtractArgs] = QStringList() << "$PreservePathSwitch" << "$RootNodeSwitch" << "$Archive" << "$Files";
+		p[ExtractArgs] = QStringList() << "$PreservePathSwitch" << "$PasswordSwitch" << "$RootNodeSwitch" << "$Archive" << "$Files";
 		p[PreservePathSwitch] = QStringList() << "x" << "e";
 		p[RootNodeSwitch] = QStringList() << "-w$Path";
-		p[FileExistsExpression] = "^(.+) already exists. Overwrite it";
+		p[PasswordSwitch] = QStringList() << "-p$Password";
+		p[FileExistsExpression] = "already exists. Overwrite with";
+		p[WrongPasswordPatterns] = QStringList() << "Wrong password";
+		p[AddArgs] = QStringList() << "a" << "$Archive" << "$Files";
+		p[DeleteArgs] = QStringList() << "d" << "$Archive" << "$Files";
+
+		p[FileExistsInput] = QStringList()
+			<< "Y" //overwrite
+			<< "N" //skip
+			<< "A" //overwrite all
+			<< "S" //autoskip
+			<< "Q" //cancel
+			;
 
 	}
 
--- ark/plugins/libsinglefileplugin/kerfuffle_libbz2.desktop	
+++ ark/plugins/libsinglefileplugin/kerfuffle_libbz2.desktop	
@@ -18,10 +18,12 @@
 Comment[el]=πρόσθετο libz2 για τo Kerfuffle
 Comment[es]=Complemento libbz2 para Kerfuffle
 Comment[et]=Kerfuffle'i libbz2 plugin
+Comment[nb]=libbz2 pprogramtillegg for Kerfuffle
 Comment[pt]='Plugin' da 'libbz2' para o Kerfuffle
 Comment[pt_BR]=Plug-in libbz2 para o Kerfuffle
 Comment[sv]=Libbz2-insticksprogram för Kerfuffle
 Comment[tr]=Kerfuffle için libbz2 eklentisi
 Comment[uk]=Додаток libbz2 для Kerfuffle
+Comment[zh_CN]=Kerfuffle 的 libbz2 插件
 Comment[zh_TW]=Kerfuffle 的 libbz2 外掛程式
 MimeType=application/x-bzip;
--- ark/plugins/libsinglefileplugin/kerfuffle_libgz.desktop	
+++ ark/plugins/libsinglefileplugin/kerfuffle_libgz.desktop	
@@ -18,6 +18,7 @@
 Comment=libgz plugin for Kerfuffle
 Comment[bg]=Приствка libgz за Kerfuffle
 Comment[ca]=Connector del libgz pel Kerfuffle
+Comment[cs]=libgz modul pro Kerfuffle
 Comment[da]=libgz-plugin til Kerfuffle
 Comment[de]=libgz Modul für Kerfuffle
 Comment[el]=πρόσθετο libgz για τη Kerfuffle
--- ark/plugins/libsinglefileplugin/kerfuffle_libxz.desktop	
+++ ark/plugins/libsinglefileplugin/kerfuffle_libxz.desktop	
@@ -18,10 +18,12 @@
 Comment[el]=πρόσθετο libxz για τo Kerfuffle
 Comment[es]=Complemento libxz para Kerfuffle
 Comment[et]=Kerfuffle'i libxz plugin
+Comment[nb]=libxz pprogramtillegg for Kerfuffle
 Comment[pt]='Plugin' da 'libxz' para o Kerfuffle
 Comment[pt_BR]=Plug-in libxz para o Kerfuffle
 Comment[sv]=Libxz-insticksprogram för Kerfuffle
 Comment[tr]=Kerfuffle için libxz eklentisi
 Comment[uk]=Додаток libxz для Kerfuffle
+Comment[zh_CN]=Kerfuffle 的 libxz 插件
 Comment[zh_TW]=Kerfuffle 的 libxz 外掛程式
 MimeType=application/x-lzma;application/x-xz;
--- ark/plugins/7zipplugin/kerfuffle_7zip.desktop	
+++ ark/plugins/7zipplugin/kerfuffle_7zip.desktop	
@@ -18,6 +18,7 @@
 Comment=7zip plugin for Kerfuffle
 Comment[bg]=Приставка 7zip за Kerfuffle
 Comment[ca]=Connector del 7zip per al Kerfuffle
+Comment[cs]=7zip modul pro Kerfuffle
 Comment[da]=7zip-plugin til Kerfuffle
 Comment[de]=7zip Modul für Kerfuffle
 Comment[el]=πρόσθετο 7zip για τη Kerfuffle
--- ark/plugins/libarchive/libarchivehandler.cpp	
+++ ark/plugins/libarchive/libarchivehandler.cpp	
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (c) 2008-2009 Harald Hvaal <haraldhv@stud.ntnu.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -24,7 +25,6 @@
  */
 
 #include "libarchivehandler.h"
-//#include "settings.h"
 #include "kerfuffle/archivefactory.h"
 #include "kerfuffle/queries.h"
 #include <QDirIterator>
--- ark/plugins/libarchive/kerfuffle_libarchive.desktop	
+++ ark/plugins/libarchive/kerfuffle_libarchive.desktop	
@@ -20,6 +20,7 @@
 Comment[ar]=LibArchive ملحق لـ Kerfuffle
 Comment[bg]=Приставка LibArchive за Kerfuffle
 Comment[ca]=Connector del LibArchive pel Kerfuffle
+Comment[cs]=LibArchive modul pro Kerfuffle
 Comment[da]=LibArchive-plugin til Kerfuffle
 Comment[de]=LibArchive Modul für Kerfuffle
 Comment[el]=πρόσθετο LibArchive για τη Kerfuffle
--- ark/plugins/libarchive/libarchivehandler.h	
+++ ark/plugins/libarchive/libarchivehandler.h	
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (c) 2008-2009 Harald Hvaal <haraldhv@stud.ntnu.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
--- ark/plugins/libzipplugin/kerfuffle_libzip.desktop	
+++ ark/plugins/libzipplugin/kerfuffle_libzip.desktop	
@@ -20,6 +20,7 @@
 Comment[ar]=libzip ملحق لـ Kerfuffle
 Comment[bg]=Притсвака libzip за Kerfuffle
 Comment[ca]=Connector del libzip pel Kerfuffle
+Comment[cs]=libzip modul pro Kerfuffle
 Comment[da]=libzip-plugin til Kerfuffle
 Comment[de]=libzip Modul für Kerfuffle
 Comment[el]=πρόσθετο libzip για τη Kerfuffle
--- ark/plugins/clizipplugin/cliplugin.cpp	
+++ ark/plugins/clizipplugin/cliplugin.cpp	
@@ -18,12 +18,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
+
 #include "kerfuffle/cliinterface.h"
 #include "kerfuffle/archivefactory.h"
 
 #include <QDir>
+#include <QLatin1String>
 #include <QString>
 #include <QStringList>
+
 #include <KDebug>
 
 using namespace Kerfuffle;
@@ -33,7 +36,7 @@
 	public:
 		explicit CliPlugin( const QString & filename, QObject *parent = 0 )
 			: CliInterface( filename, parent ),
-			m_incontent(false)
+			m_status(Header)
 		{
 
 		}
@@ -49,30 +52,30 @@
 			if (p.isEmpty()) {
 
 				p[CaptureProgress] = false;
-				p[ListProgram] = p[ExtractProgram] = "unzip";
+				p[ListProgram] = "zipinfo";
+				p[ExtractProgram] = "unzip";
 				p[DeleteProgram] = p[AddProgram] = "zip";
 
-				p[ListArgs] = QStringList() << "-l" << "-v" << "$Archive";
-				p[ExtractArgs] = QStringList() << "-p-" << "$PreservePathSwitch" << "$PasswordSwitch" << "$RootNodeSwitch" << "$Archive" << "$Files";
-				p[PreservePathSwitch] = QStringList() << "x" << "e";
-				p[RootNodeSwitch] = QStringList() << "-ap$Path";
-				p[PasswordSwitch] = QStringList() << "-p$Password";
+				p[ListArgs] = QStringList() << "-l" << "$Archive";
+				p[ExtractArgs] = QStringList() << "$PreservePathSwitch" << "$PasswordSwitch" << "$Archive" << "$Files";
+				p[PreservePathSwitch] = QStringList() << "" << "-j";
+				p[PasswordSwitch] = QStringList() << "-P$Password";
 
-				p[DeleteArgs] = QStringList() << "d" << "$Archive" << "$Files";
+				p[DeleteArgs] = QStringList() << "-d" << "$Archive" << "$Files";
 
-				p[FileExistsExpression] = "^(.+) already exists. Overwrite it";
+				p[FileExistsExpression] = "^replace (.+)?";
 				p[FileExistsInput] = QStringList()
-					<< "Y" //overwrite
-					<< "N" //skip
+					<< "y" //overwrite
+					<< "n" //skip
 					<< "A" //overwrite all
-					<< "E" //autoskip
-					<< "Q" //cancel
+					<< "N" //autoskip
+					<< "N" //cancel
 					;
 
-				p[AddArgs] = QStringList() << "a" << "$Archive" << "$Files";
+				p[AddArgs] = QStringList() << "-r" << "$Archive" << "$Files";
 
-				p[WrongPasswordPatterns] = QStringList() << "password incorrect";
-				p[ExtractionFailedPatterns] = QStringList() << "CRC failed";
+				p[WrongPasswordPatterns] = QStringList() << "incorrect password";
+				//p[ExtractionFailedPatterns] = QStringList() << "CRC failed";
 			}
 			return p;
 		}
@@ -80,59 +83,59 @@
 
 
 
-		bool m_isFirstLine, m_incontent, m_isPasswordProtected;
 		QString m_entryFilename, m_internalId;
+		ArchiveEntry m_currentEntry;
+		
+		enum ReadStatus {
+			Header = 0,
+			Entry
+		};
+		
+		ReadStatus m_status;
 
 		bool readListLine(QString line)
 		{
+			static QRegExp entryPattern(
+					"^(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(.+)$");
 
-			const QString m_headerString = "--------";
-			// skip the heading
-			if (!m_incontent){
-				if (line.startsWith(m_headerString) )
-					m_incontent = true;
-				return true;
-			}
-			// catch final line
-			if (line.startsWith(m_headerString) ) {
-				m_incontent = false;
-				return true;
+			int i;
+			switch (m_status) {
+				case Header:
+					m_status = Entry;
+					break;
+				case Entry:
+					i = entryPattern.indexIn(line);
+					if (i != -1) {
+						ArchiveEntry e;
+						e[Permissions] = entryPattern.cap(1);
+						e[Owner] = entryPattern.cap(3);
+						e[Size] = entryPattern.cap(4).toInt();
+						QString status = entryPattern.cap(5);
+						if (status[0].isUpper())
+							e[IsPasswordProtected] = true;
+						e[CompressedSize] = entryPattern.cap(6).toInt();
+						e[FileName] = e[InternalID] = entryPattern.cap(10);
+						entry(e);
+					}
+					break;
 			}
+			return true;
+		}
 
-			// rar gives one line for the filename and a line after it with some file properties
-			if ( m_isFirstLine ) {
-				m_internalId = line.trimmed();
-				//m_entryFilename.chop(1); // handle newline
-				if (!m_internalId.isEmpty() && m_internalId.at(0) == '*')
-				{
-					m_isPasswordProtected = true;
-					m_internalId.remove( 0, 1 ); // and the spaces in front
-				}
-				else
-					m_isPasswordProtected = false;
+		void handleDataLine(QString line)
+		{
+			static QRegExp pattern("^(.+):\\s+(.+)$");
 
-				m_isFirstLine = false;
-				return true;
-			}
+			if (pattern.indexIn(line) == -1)
+				return;
 
-			QStringList fileprops = line.split(' ', QString::SkipEmptyParts);
-			m_internalId = QDir::fromNativeSeparators(m_internalId);
-			bool isDirectory = (bool)(fileprops[ 5 ].contains('d', Qt::CaseInsensitive));
-
-			QDateTime ts (QDate::fromString(fileprops[ 3 ], "dd-MM-yy"),
-					QTime::fromString(fileprops[ 4 ], "hh:mm"));
-			// rar output date with 2 digit year but QDate takes is as 19??
-			// let's take 1950 is cut-off; similar to KDateTime
-			if (ts.date().year() < 1950)
-				ts = ts.addYears(100);
-
-			m_entryFilename = m_internalId;
-			if (isDirectory && !m_internalId.endsWith('/'))
-			{
-				m_entryFilename += '/';
-			}
+			QString field = pattern.cap(1);
+			QString value = pattern.cap(2);
+
+			if (line.startsWith(QLatin1String("compressed size")))
+				m_currentEntry[CompressedSize] = 100;
 
-			//kDebug( 1601 ) << m_entryFilename << " : " << fileprops ;
+#if 0
 			ArchiveEntry e;
 			e[ FileName ] = m_entryFilename;
 			e[ InternalID ] = m_internalId;
@@ -146,11 +149,7 @@
 			e[ Method ] = fileprops[ 7 ];
 			e[ Version ] = fileprops[ 8 ];
 			e[ IsPasswordProtected] = m_isPasswordProtected;
-			kDebug( 1601 ) << "Added entry: " << e ;
-
-			entry(e);
-			m_isFirstLine = true;
-			return true;
+#endif
 		}
 };
 
--- ark/plugins/clizipplugin/kerfuffle_clizip.desktop	
+++ ark/plugins/clizipplugin/kerfuffle_clizip.desktop	
@@ -14,10 +14,12 @@
 Name=ZIP archive plugin
 Name[es]=Complemento de archivo comprimido ZIP
 Name[et]=ZIP-arhiivi plugin
+Name[nb]=Programtillegg for ZIP-arkiv
 Name[pt]='Plugin' de pacotes ZIP
 Name[pt_BR]=Plug-in de arquivos ZIP
 Name[sv]=Insticksprogram för ZIP-arkiv
 Name[tr]=ZIP arşivi eklentisi
 Name[uk]=Додаток для архівів ZIP
+Name[zh_CN]=ZIP 归档插件
 Name[zh_TW]=ZIP 壓縮檔外掛程式
 MimeType=application/x-java-archive;application/x-jar;application/zip;application/x-zip-compressed;
--- ark/plugins/clirarplugin/kerfuffle_clirar.desktop	
+++ ark/plugins/clirarplugin/kerfuffle_clirar.desktop	
@@ -30,5 +30,6 @@
 Name[tr]=RAR arşivi eklentisi
 Name[uk]=Додаток для архівів RAR
 Name[x-test]=xxRAR archive pluginxx
+Name[zh_CN]=RAR 归档插件
 Name[zh_TW]=RAR 壓縮檔外掛程式
 MimeType=application/x-rar;
--- ark/plugins/karchiveplugin/kerfuffle_karchive.desktop	
+++ ark/plugins/karchiveplugin/kerfuffle_karchive.desktop	
@@ -19,6 +19,7 @@
 Comment[ar]=KArchive ملحق لـ Kerfuffle
 Comment[bg]=Приставка KArchive за Kerfuffle
 Comment[ca]=Connector del KArchive pel Kerfuffle
+Comment[cs]=KArchive modul pro Kerfuffle
 Comment[da]=KArchive-plugin til Kerfuffle
 Comment[de]=KArchive Modul für Kerfuffle
 Comment[el]=πρόσθετο KArchive για τη Kerfuffle
--- ark/plugins/unace/unaceplugin.h	
+++ ark/plugins/unace/unaceplugin.h	
@@ -2,6 +2,7 @@
  * unace plugin for ark -- archiver for the KDE project
  *
  * Copyright (C) 2009 Rafał Rzepecki <divided.mind@gmail.com>
+ * Copyright (C) 2009 Harald Hvaal <haraldhv@stud.ntnu.no>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,22 +23,21 @@
 #ifndef _UNACE_PLUGIN_H_
 #define _UNACE_PLUGIN_H_
 
-#include <kerfuffle/archiveinterface.h>
+#include <kerfuffle/archivefactory.h>
+#include <kerfuffle/cliinterface.h>
 
 using namespace Kerfuffle;
 
-class UnAceInterface : public ReadOnlyArchiveInterface
+class UnAceInterface : public CliInterface
 {
 	Q_OBJECT
 	public:
 		explicit UnAceInterface( const QString & filename, QObject *parent = 0 );
-		virtual ~UnAceInterface();
 
-		virtual bool list();
-		virtual bool copyFiles( const QList<QVariant> & files, const QString & destinationDirectory, ExtractionOptions options );
+		bool readListLine(QString line);
+		virtual ParameterList parameterList() const;
 
 	private:
-		bool processListLine( const QByteArray &bytes );
 		bool m_hadHeader;
 };
 
--- ark/plugins/unace/unaceplugin.cpp	
+++ ark/plugins/unace/unaceplugin.cpp	
@@ -2,6 +2,7 @@
  * unace plugin for ark -- archiver for the KDE project
  *
  * Copyright (C) 2009 Rafał Rzepecki <divided.mind@gmail.com>
+ * Copyright (C) 2009 Harald Hvaal <haraldhv@stud.ntnu.no>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -21,131 +22,92 @@
 
 #include "unaceplugin.h"
 
-#include <QEventLoop>
-#include <QThread>
-
 #include <KDebug>
 #include <KLocale>
-#include <KProcess>
 
 #include <kerfuffle/archive.h>
 #include <kerfuffle/archivefactory.h>
 
 UnAceInterface::UnAceInterface( const QString & filename, QObject *parent )
-		: ReadOnlyArchiveInterface( filename, parent )
-{}
-
-UnAceInterface::~UnAceInterface()
-{}
-
-bool UnAceInterface::list()
+		: CliInterface ( filename, parent ),
+		m_hadHeader(false)
 {
-	KProcess unace;
-	QStringList args;
-	args << "l" << filename();
-	unace.setProgram( "unace", args );
-	unace.setOutputChannelMode( KProcess::OnlyStdoutChannel );
-
-	m_hadHeader = false;
-	unace.start();
-	bool started = unace.waitForStarted();
-	while ( unace.state() == KProcess::Running ) {
-		unace.waitForReadyRead();
-		while ( unace.canReadLine() ) {
-			char buf[1024];
-			qint64 lineLength = unace.readLine( buf, sizeof(buf) );
-
-			if ( buf[lineLength - 1] == '\n' )
-				lineLength--;
-
-			const QByteArray bytes( buf, lineLength );
-			if ( !processListLine( bytes ) )
-				return false;
-		}
-	}
-
-  if ( !started )
-    error( i18n( "Unable to launch <tt>unace</tt>. Make sure you have that tool installed and available." ) );
 
-	return started && (unace.exitStatus() == QProcess::NormalExit) && (unace.exitCode() == 0);
 }
 
-bool UnAceInterface::processListLine( const QByteArray &bytes )
+bool UnAceInterface::readListLine( QString line )
 {
-	const QList<QByteArray> fields( bytes.split('\xb3') );
-	if ( fields.size() != 6 )
-		// this is not the listing yet
-		return true;
+	static QRegExp header(
+			"^\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+$");
+
+	static QRegExp pattern(
+			"^(\\S+\\s\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+$");
+	kDebug() << line << pattern.indexIn(line) << header.indexIn(line);
 
-	const char* const EXPECTED_HEADER[] = { "Date    ", "Time ", "Packed     ", "Size     ", "Ratio", "File            " };
+	const char* const EXPECTED_HEADER[] = { "Date", "Time", "Packed", "Size", "Ratio", "File" };
 
 	if ( !m_hadHeader ) { // header should follow, let's check if it's as expected
-		for ( int i = 0; i < 6; i++ )
-			if ( fields[i] != EXPECTED_HEADER[i] ) {
+		if ( header.indexIn(line) == -1 )
+			// this is not the listing yet
+			return true;
+
+		for ( int i = 1; i <= 6; i++ )
+			if ( header.cap(i) != EXPECTED_HEADER[i - 1] ) {
 				error( i18n( "Unexpected output from the unace process." ) );
 				return false;
 			}
+		kDebug() << "foudn header";
 		m_hadHeader = true;
 		return true;
 	}
 
+	if ( pattern.indexIn(line) == -1 )
+		// this is not the listing yet
+		return true;
+
 	ArchiveEntry the_entry;
-	const QString timestamp = QString::fromAscii( fields[0] ) + ' ' +	QString::fromAscii(fields[1]);
+	const QString timestamp = pattern.cap(1);
 
 	the_entry[Timestamp] = QDateTime::fromString( timestamp, "dd.MM.yy HH:mm" );
-	the_entry[CompressedSize] = QString::fromAscii( fields[2] ).toLongLong();
-	the_entry[Size] = QString::fromAscii( fields[3] ).toLongLong();
-	the_entry[Ratio] = QString::fromAscii( fields[4] ).left( fields[4].size() - 1 ).toInt();
-	the_entry[FileName] = QString::fromUtf8( fields[5] ).mid( 1 );
+	the_entry[CompressedSize] = pattern.cap(2).toLongLong();
+	the_entry[Size] = pattern.cap(3).toLongLong();
+	the_entry[Ratio] = pattern.cap(4).left( pattern.cap(4).size() - 1 ).toInt();
+	the_entry[FileName] = the_entry[InternalID] = pattern.cap(5);
 
 	entry( the_entry );
 	return true;
 }
 
-bool UnAceInterface::copyFiles( const QList<QVariant> & files, const QString & destinationDirectory, ExtractionOptions options )
+ParameterList UnAceInterface::parameterList() const
 {
-	if ( files.size() > 0 ) { // TODO
-		error( i18n( "Only extracting full archive is currently supported." ) );
-		return false;
-	}
-
-	if ( !options.contains( "PreservePaths" ) || !options["PreservePaths"].toBool() ) { // TODO
-		error( i18n( "Only extracting while preserving paths is currently supported." ) );
-		return false;
-	}
+	static ParameterList p;
+	if (p.isEmpty()) {
 
-	if ( options.contains( "RootNode" ) ) { // TODO
-		error( i18n( "Extracting with root node other than default is not currently supported." ) );
-		return false;
-	}
-
-	KProcess unace;
-	QStringList args;
-	args << "x" << filename();
-	unace.setProgram( "unace", args );
-	unace.setOutputChannelMode( KProcess::SeparateChannels );
-	unace.setWorkingDirectory( destinationDirectory );
-
-	unace.start();
-	bool started = unace.waitForStarted();
-	if ( !started ) {
-		error( i18n( "Unable to launch <tt>unace</tt>. Make sure you have that tool installed and available." ) );
-		return false;
-	}
+		p[CaptureProgress] = false;
+		p[ListProgram] = p[ExtractProgram] = p[DeleteProgram] = p[AddProgram] = "unace";
 
-	unace.waitForFinished();
+		p[ListArgs] = QStringList() << "l" << "$Archive";
+		p[ExtractArgs] = QStringList() << "$PreservePathSwitch" << "$Archive" << "$Files";
+		p[PreservePathSwitch] = QStringList() << "x" << "e";
+		p[RootNodeSwitch] = QStringList() << "";
+		p[PasswordSwitch] = QStringList() << "";
+
+		p[DeleteArgs] = QStringList() << "";
+		p[AddArgs] = QStringList() << "";
+		p[ExtractionFailedPatterns] = QStringList() << "CRC failed";
+
+		p[FileExistsExpression] = "^\\s+File already exists: (.+)$";
+		p[FileExistsInput] = QStringList()
+			<< "Y" //overwrite
+			<< "N" //skip
+			<< "A" //overwrite all
+			<< "N" //autoskip
+			<< "C" //cancel
+			;
 
-	if ( unace.exitStatus() != QProcess::NormalExit ) {
-		error( i18n( "<tt>unace</tt> crashed unexpectedly." ) );
-		return false;
 	}
+	return p;
 
-	if ( unace.exitCode() != 0 ) {
-		error( i18n( "<tt>unace</tt> has encountered error when extracting:<pre>%1</pre>", QString::fromUtf8( unace.readAllStandardError() ) ) );
-		return false;
-	}
-
-	return true;
 }
 
 #include "unaceplugin.moc"
--- ark/plugins/unace/kerfuffle_unace.desktop	
+++ ark/plugins/unace/kerfuffle_unace.desktop	
@@ -29,6 +29,7 @@
 Name[tr]=Kerfuffle için unACE
 Name[uk]=unACE для Kerfuffle
 Name[x-test]=xxunACE for Kerfufflexx
+Name[zh_CN]=Kerfuffle 的 unACE
 Name[zh_TW]=Kerfuffle 的 unACE 程式
 Comment=plugin for unpacking ACE archives
 Comment[el]=πρόσθετο αποσυμπίεσης αρχειοθηκών ACE
@@ -48,5 +49,6 @@
 Comment[tr]=ACE arşivlerini açmak için eklenti
 Comment[uk]=Додаток для розпакування архівів ACE
 Comment[x-test]=xxplugin for unpacking ACE archivesxx
+Comment[zh_CN]=解压缩 ACE 归档的插件
 Comment[zh_TW]=Kerfuffle 的 ACE 解壓縮外掛程式
 MimeType=application/x-ace;
--- ark/plugins/bk/kerfuffle_bk.desktop	
+++ ark/plugins/bk/kerfuffle_bk.desktop	
@@ -20,6 +20,7 @@
 Comment[ar]=bkisofs ملحق لـ Kerfuffle
 Comment[bg]=Приставка bkisofs за Kerfuffle
 Comment[ca]=Connector del bkisofs pel Kerfuffle
+Comment[cs]=bkisofs modul pro Kerfuffle
 Comment[da]=bkisofs-plugin til Kerfuffle
 Comment[de]=bkisofs Modul für Kerfuffle
 Comment[el]=πρόσθετο bkisofs για τη Kerfuffle
--- ark/plugins/CMakeLists.txt	
+++ ark/plugins/CMakeLists.txt	
@@ -1,17 +1,17 @@
 macro_optional_find_package(LibArchive)
-macro_optional_find_package(LibZip)
+#macro_optional_find_package(LibZip)
 
 macro_log_feature(LIBARCHIVE_FOUND "LibArchive" "A library for dealing with a wide variety of archive file formats" "http://people.freebsd.org/~kientzle/libarchive/" FALSE "" "Required for among others tar, tar.gz, tar.bz2 formats in Ark. Make sure it is compiled with gzip support.")
 
-macro_log_feature(LIBZIP_FOUND "LibZip" "A library for reading, creating, and modifying ZIP archives" "http://www.nih.at/libzip" FALSE "" "Required for building ZIP support into Ark.")
+#macro_log_feature(LIBZIP_FOUND "LibZip" "A library for reading, creating, and modifying ZIP archives" "http://www.nih.at/libzip" FALSE "" "Required for building ZIP support into Ark.")
 
 if (LIBARCHIVE_FOUND)
 	add_subdirectory( libarchive )
 endif (LIBARCHIVE_FOUND)
 
-if (LIBZIP_FOUND)
-	add_subdirectory( libzipplugin )
-endif (LIBZIP_FOUND)
+#if (LIBZIP_FOUND)
+#add_subdirectory( libzipplugin )
+#endif (LIBZIP_FOUND)
 
 add_subdirectory( clirarplugin )
 add_subdirectory( cli7zplugin )
--- ark/part/arkviewer.cpp	
+++ ark/part/arkviewer.cpp	
@@ -1,7 +1,7 @@
 /*
  * ark: A program for modifying archives via a GUI.
  *
- * Copyright (C) 2004, Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (C) 2004-2008 Henrique Pinto <henrique.pinto@kdemail.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
--- ark/part/archivemodel.cpp	
+++ ark/part/archivemodel.cpp	
@@ -2,6 +2,7 @@
  * ark -- archiver for the KDE project
  *
  * Copyright (C) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (C) 2008-2009 Harald Hvaal <haraldhv@stud.ntnu.no>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
--- ark/part/arkviewer.h	
+++ ark/part/arkviewer.h	
@@ -1,10 +1,7 @@
-#ifndef ARKVIEWER_H
-#define ARKVIEWER_H
-
 /*
  * ark: A program for modifying archives via a GUI.
  *
- * Copyright (C) 2004-2007, Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (C) 2004-2008, Henrique Pinto <henrique.pinto@kdemail.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +19,9 @@
  *
  */
 
+#ifndef ARKVIEWER_H
+#define ARKVIEWER_H
+
 #include <KDialog>
 #include <KParts/BrowserExtension>
 #include <KParts/ReadOnlyPart>
--- ark/part/part.cpp	
+++ ark/part/part.cpp	
@@ -2,6 +2,7 @@
  * ark -- archiver for the KDE project
  *
  * Copyright (C) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (C) 2008-2009 Harald Hvaal <haraldhv@stud.ntnu.no>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
--- ark/part/archivemodel.h	
+++ ark/part/archivemodel.h	
@@ -2,6 +2,7 @@
  * ark -- archiver for the KDE project
  *
  * Copyright (C) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (C) 2008-2009 Harald Hvaal <haraldhv@stud.ntnu.no>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
--- ark/part/part.h	
+++ ark/part/part.h	
@@ -2,6 +2,7 @@
  * ark -- archiver for the KDE project
  *
  * Copyright (C) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (C) 2008-2009 Harald Hvaal <haraldhv@stud.ntnu.no>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
--- ark/part/archiveview.cpp	
+++ ark/part/archiveview.cpp	
@@ -1,7 +1,7 @@
 /*
  * ark -- archiver for the KDE project
  *
- * Copyright (C) 2008 Harald Hvaal <haraldhv (at@at) stud.ntnu.no>
+ * Copyright (C) 2008-2009 Harald Hvaal <haraldhv (at@at) stud.ntnu.no>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
--- ark/part/jobtracker.cpp	
+++ ark/part/jobtracker.cpp	
@@ -2,6 +2,7 @@
  * ark -- archiver for the KDE project
  *
  * Copyright (C) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (C) 2008 Harald Hvaal <haraldhv@stud.ntnu.no>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
--- ark/part/ark_part.desktop	
+++ ark/part/ark_part.desktop	
@@ -56,8 +56,8 @@
 Name[uz@cyrillic]=Архивлагич
 Name[vi]=Trình Lưu Trữ
 Name[wa]=Årtchiveu
-Name[x-test]=xxArchiverxx
 Name[xh]=Umenzi woshicilelo lukawonke-wonke noxwebhu lweMbali
+Name[x-test]=xxArchiverxx
 Name[zh_CN]=压缩存档工具
 Name[zh_TW]=壓縮檔處理器
 Comment=Archive Handling Tool
@@ -119,8 +119,8 @@
 Comment[uz@cyrillic]=Архив учун восита
 Comment[vi]=Công Cụ Xử Lý Các Tập Tin Nén
 Comment[wa]=Usteye po-z apougnî les årtchives
-Comment[x-test]=xxArchive Handling Toolxx
 Comment[xh]=Isixhobo sokuphatha i Archive
+Comment[x-test]=xxArchive Handling Toolxx
 Comment[zh_CN]=压缩归档处理工具
 Comment[zh_TW]=壓縮檔處理工具
 X-KDE-ServiceTypes=Browser/View
--- ark/part/jobtracker.h	
+++ ark/part/jobtracker.h	
@@ -2,6 +2,7 @@
  * ark -- archiver for the KDE project
  *
  * Copyright (C) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (C) 2008 Harald Hvaal <haraldhv@stud.ntnu.no>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
--- ark/kerfuffle/extractiondialog.cpp	
+++ ark/kerfuffle/extractiondialog.cpp	
@@ -1,7 +1,7 @@
 /*
  * ark -- archiver for the KDE project
  *
- * Copyright (C) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (C) 2009 Harald Hvaal <haraldhv@stud.ntnu.no>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
--- ark/kerfuffle/archiveinterface.cpp	
+++ ark/kerfuffle/archiveinterface.cpp	
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (c) 2008-2009 Harald Hvaal <haraldhv@stud.ntnu.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
--- ark/kerfuffle/jobs.h	
+++ ark/kerfuffle/jobs.h	
@@ -1,5 +1,7 @@
 /*
  * Copyright (c) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (c) 2008-2009 Harald Hvaal <haraldhv )@@@( stud(dot)ntnu.no>
+ * Copyright (c) 2009 Raphael Kubo da Costa <kubito@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
--- ark/kerfuffle/extractiondialog.h	
+++ ark/kerfuffle/extractiondialog.h	
@@ -2,6 +2,7 @@
  * ark -- archiver for the KDE project
  *
  * Copyright (C) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (C) 2008 Harald Hvaal <haraldhv@stud.ntnu.no>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
--- ark/kerfuffle/archiveinterface.h	
+++ ark/kerfuffle/archiveinterface.h	
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (c) 2008-2009 Harald Hvaal <haraldhv@stud.ntnu.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
--- ark/kerfuffle/adddialog.cpp	
+++ ark/kerfuffle/adddialog.cpp	
@@ -1,8 +1,7 @@
 /*
  * ark -- archiver for the KDE project
  *
- * Copyright (C) 2008 Harald Hvaal
- * <haraldhv atatatat stud.ntnu.no>
+ * Copyright (C) 2008 Harald Hvaal <haraldhv atatatat stud.ntnu.no>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
--- ark/kerfuffle/batchextract.cpp	
+++ ark/kerfuffle/batchextract.cpp	
@@ -21,13 +21,10 @@
 
 #include "batchextract.h"
 
+#include "archive.h"
 #include "extractiondialog.h"
-
-#include <kwidgetjobtracker.h>
-#include <KDebug>
-#include <KLocale>
-#include <KMessageBox>
-#include <KGlobal>
+#include "jobs.h"
+#include "queries.h"
 
 #include <QFileInfo>
 #include <QDir>
@@ -35,6 +32,13 @@
 #include <QApplication>
 #include <QDesktopWidget>
 
+#include <KDebug>
+#include <KGlobal>
+#include <KLocale>
+#include <KMessageBox>
+#include <KIO/RenameDialog>
+#include <kwidgetjobtracker.h>
+
 namespace Kerfuffle
 {
 	BatchExtract::BatchExtract() 
@@ -52,8 +56,7 @@
 		KIO::getJobTracker()->unregisterJob(this);
 	}
 
-
-	void BatchExtract::addExtraction(Kerfuffle::Archive* archive,bool preservePaths, QString destinationFolder)
+	void BatchExtract::addExtraction(Kerfuffle::Archive* archive, bool preservePaths, QString destinationFolder)
 	{
 		kDebug( 1601 );
 
@@ -61,15 +64,16 @@
 
 		if (autoSubfolders) {
 			if (!archive->isSingleFolderArchive()) {
+				QDir destinationDir(destinationFolder);
+				QString subfolderName = archive->subfolderName();
 
-				QString subfolder = archive->subfolderName();
+				if (destinationDir.exists(subfolderName))
+					subfolderName = KIO::RenameDialog::suggestName(destinationFolder, subfolderName);
 
-				kDebug( 1601 ) << "Creating subfolder" << subfolder << "under" << destinationFolder;
-				QDir dest(destinationFolder);
-				dest.mkdir(subfolder);
-
-				autoDestination = destinationFolder + '/' + subfolder;
+				kDebug( 1601 ) << "Auto-creating subfolder" << subfolderName << "under" << destinationFolder;
+				destinationDir.mkdir(subfolderName);
 
+				autoDestination = destinationFolder + '/' + subfolderName;
 			}
 		}
 
@@ -83,12 +87,10 @@
 				options
 				);
 
-		connect(job, SIGNAL(userQuery(Query*)),
-				this, SLOT(slotUserQuery(Query*)));
+		connect(job, SIGNAL(userQuery(Query*)), this, SLOT(slotUserQuery(Query*)));
 
 		kDebug( 1601 ) << QString("Registering job from archive %1, to %2, preservePaths %3").arg(archive->fileName()).arg(autoDestination).arg(preservePaths);
 
-
 		addSubjob(job);
 		fileNames[job] = qMakePair(archive->fileName(), destinationFolder);
 		connect(job, SIGNAL(percent(KJob*, unsigned long)),
@@ -110,7 +112,6 @@
 	{
 		kDebug( 1601 );
 
-
 		if (!subfolder.isEmpty()) {
 			kDebug( 1601 ) << "Creating subfolder" << subfolder;
 			QDir dest(destinationFolder);
@@ -129,6 +130,7 @@
 
 			addExtraction(archive, m_preservePaths, finalDestination);
 		}
+
 		KIO::getJobTracker()->registerJob(this);
 
 		emit description(this,
--- ark/kerfuffle/archivebase.cpp	
+++ ark/kerfuffle/archivebase.cpp	
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (c) 2008-2009 Harald Hvaal <haraldhv@stud.ntnu.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
--- ark/kerfuffle/adddialog.h	
+++ ark/kerfuffle/adddialog.h	
@@ -1,8 +1,7 @@
 /*
  * ark -- archiver for the KDE project
  *
- * Copyright (C) 2008 Harald Hvaal
- * <haraldhv atatatat stud.ntnu.no>
+ * Copyright (C) 2008 Harald Hvaal <haraldhv atatatat stud.ntnu.no>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
--- ark/kerfuffle/queries.cpp	
+++ ark/kerfuffle/queries.cpp	
@@ -1,7 +1,7 @@
 /*
  * ark -- archiver for the KDE project
  *
- * Copyright (C) 2008 Harald Hvaal <haraldhv (at@at) stud.ntnu.no>
+ * Copyright (C) 2008-2009 Harald Hvaal <haraldhv (at@at) stud.ntnu.no>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
--- ark/kerfuffle/kerfufflePlugin.desktop	
+++ ark/kerfuffle/kerfufflePlugin.desktop	
@@ -5,6 +5,7 @@
 Comment[ar]=ملحق للتحكم بهيئات الأرشيف لمكتبة Kerfuffle
 Comment[bg]=Приствка за работа с архиви за Kerfuffle
 Comment[ca]=Connector per gestionar els formats d'arxiu per la biblioteca Kerfuffle
+Comment[cs]=Modul pro správu formátů archivů pro knihovnu Kerfuffle
 Comment[da]=Plugin til håndtering af arkivformater til Kerfuffle-biblioteket
 Comment[de]=Modul zum Umgang mit Archivformaten der Kerfuffle Bibliothek
 Comment[el]=Πρόσθετο χειρισμού μορφών αρχειοθήκης για τη βιβλιοθήκη Kerfuffle
--- ark/kerfuffle/batchextract.h	
+++ ark/kerfuffle/batchextract.h	
@@ -22,25 +22,22 @@
 #ifndef BATCHEXTRACT_H
 #define BATCHEXTRACT_H
 
-#include <KParts/MainWindow>
-#include <KParts/ReadWritePart>
-#include <KUrl>
-#include <KDialog>
-#include <QMap>
-#include <QPair>
-#include <kcompositejob.h>
-#include "jobs.h"
-#include "archive.h"
-#include "queries.h"
 #include "kerfuffle_export.h"
 
-using Kerfuffle::Query;
+#include <QtCore/QMap>
+#include <QtCore/QPair>
+#include <QtCore/QString>
+
+#include <kcompositejob.h>
 
 class Interface;
 class KJobTrackerInterface;
+class KUrl;
 
 namespace Kerfuffle
 {
+	class Archive;
+	class Query;
 
 	class KERFUFFLE_EXPORT BatchExtract : public KCompositeJob
 	{
@@ -49,39 +46,31 @@
 		public:
 			BatchExtract();
 			virtual ~BatchExtract();
-			void addExtraction(Kerfuffle::Archive* archive, bool preservePaths = true, QString destinationFolder = QString());
+			void addExtraction(Archive* archive, bool preservePaths = true, QString destinationFolder = QString());
 			void start();
 			void setAutoSubfolder(bool value);
 			bool addInput( const KUrl& url );
+			bool showExtractDialog();
+			void setDestinationFolder(QString folder);
+			void setSubfolder(QString subfolder);
+			void setPreservePaths(bool value);
 
 		private slots:
 			void forwardProgress(KJob *job, unsigned long percent);
-			void slotResult( KJob *job );
+			void slotResult(KJob *job);
 			void slotUserQuery(Query *query);
 
 		private:
 			int initialJobCount;
-			QMap<class KJob *, QPair<QString,QString> > fileNames;
+			QMap<KJob*, QPair<QString,QString> > fileNames;
 			bool autoSubfolders;
 
-
-			QList<Kerfuffle::Archive*> inputs;
+			QList<Archive*> inputs;
 			KJobTrackerInterface *tracker;
 			QString destinationFolder;
 			QString subfolder;
 			bool m_preservePaths;
-
-		public:
-			bool showExtractDialog();
-			void setDestinationFolder(QString folder);
-			void setSubfolder(QString subfolder);
-			void setPreservePaths(bool value);
-
-		public slots:
-
 	};
-
 }
 
-
 #endif // BATCHEXTRACT_H
--- ark/kerfuffle/archivebase.h	
+++ ark/kerfuffle/archivebase.h	
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (c) 2008-2009 Harald Hvaal <haraldhv@stud.ntnu.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
--- ark/kerfuffle/archive.cpp	
+++ ark/kerfuffle/archive.cpp	
@@ -1,5 +1,7 @@
 /*
  * Copyright (c) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (c) 2008 Harald Hvaal <haraldhv@stud.ntnu.no>
+ * Copyright (c) 2009 Raphael Kubo da Costa <kubito@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
--- ark/kerfuffle/archive.h	
+++ ark/kerfuffle/archive.h	
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ * Copyright (c) 2008 Harald Hvaal <haraldhv@stud.ntnu.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
--- ark/kerfuffle/cliinterface.cpp	
+++ ark/kerfuffle/cliinterface.cpp	
@@ -1,8 +1,7 @@
 /*
  * ark -- archiver for the KDE project
  *
- * Copyright (C) 2009 Harald Hvaal
- * <haraldhv atatatat stud.ntnu.no>
+ * Copyright (C) 2009 Harald Hvaal <haraldhv atatatat stud.ntnu.no>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -53,7 +52,6 @@
 		Q_ASSERT(m_param.contains(ExtractProgram));
 		Q_ASSERT(m_param.contains(ListProgram));
 		Q_ASSERT(m_param.contains(PreservePathSwitch));
-		Q_ASSERT(m_param.contains(RootNodeSwitch));
 		Q_ASSERT(m_param.contains(FileExistsExpression));
 		Q_ASSERT(m_param.contains(FileExistsInput));
 	}
@@ -224,6 +222,7 @@
 			}
 		}
 
+		kDebug(1601) << "Setting current dir to " << destinationDirectory;
 		QDir::setCurrent(destinationDirectory);
 
 		executeProcess(m_program, args);
@@ -238,7 +237,7 @@
 
 		m_mode = Add;
 
-		bool ret = findProgramAndCreateProcess(m_param.value(ListProgram).toString());
+		bool ret = findProgramAndCreateProcess(m_param.value(AddProgram).toString());
 		if (!ret) {
 			failOperation();
 			return false;
@@ -397,21 +396,16 @@
 
 		}
 
-		//first make sure all whole lines left
-		//to handle have been processed
-		readStdout();
-
-		//there should still be a last part left in the output by now, and also
-		//no newline in the data because all lines should have been handled by
-		//the function above. assert this
-		Q_ASSERT(!m_stdOutData.isEmpty());
-		Q_ASSERT(!m_stdOutData.contains('\n'));
-
-		//handle the remaining line
-		handleLine(m_stdOutData);
+		//handle all the remaining data in the process
+		readStdout(true);
 
 		progress(1.0);
 
+		if (m_mode == Add) {
+			list();
+			return;
+		}
+
 		//and we're finished
 		finished(true);
 	}
@@ -419,13 +413,15 @@
 	void CliInterface::failOperation()
 	{
 		kDebug(1601);
-		KProcess *p = m_process;
-		m_process = NULL;
-		if (p) p->terminate();
+		//KProcess *p = m_process;
+		//m_process = NULL;
+		//if (p) p->terminate();
+		if (m_process)
+			m_process->terminate();
 		finished(false);
 	}
 
-	void CliInterface::readStdout()
+	void CliInterface::readStdout(bool handleAll)
 	{
 		//when hacking this function, please remember the following:
 		//- standard output comes in unpredictable chunks, this is why
@@ -460,31 +456,44 @@
 
 		m_stdOutData += dd;
 
-		//if there is no newline, we leave the data like this for now.
-		if (!m_stdOutData.contains('\n')) {
-			//kDebug(1601) << "No new line, we leave it like this for now";
-			return;
-		}
 
-		QList<QByteArray> list = m_stdOutData.split('\n');
+		QList<QByteArray> lines = m_stdOutData.split('\n');
 
-		//since QByteArray::split has no SkipEmptyParts functionality, we will
-		//have to simulate this:
-		for (int i = 0; i < list.size(); ++i) {
-			if (list.at(i).isEmpty()) {
-				list.removeAt(i);
-				--i;
-			}
+		//The reason for this check is that archivers often do not end
+		//queries (such as file exists, wrong password) on a new line, but
+		//freeze waiting for input. So we check for errors on the last line in
+		//all cases.
+		bool foundErrorMessage = 
+				(checkForErrorMessage(lines.last(), WrongPasswordPatterns) ||
+				checkForErrorMessage(lines.last(), ExtractionFailedPatterns) || 
+				checkForFileExistsMessage(lines.last()));
+
+		if (foundErrorMessage)
+			handleAll = true;
+
+		//this is complex, here's an explanation:
+		//if there is no newline, then there is no guaranteed full line to
+		//handle in the output. The exception is that it is supposed to handle
+		//all the data, OR if there's been an error message found in the
+		//partial data.
+		if (lines.size() == 1 && !handleAll) {
+			return;
 		}
 
-		//because the last line might be incomplete we leave it for now
-		QByteArray lastLine = list.takeLast();
-		m_stdOutData = lastLine;
+		if (handleAll) {
+			m_stdOutData.clear();
+		}
+		else {
+			//because the last line might be incomplete we leave it for now
+			//note, this last line may be an empty string if the stdoutdata ends
+			//with a newline
+			m_stdOutData = lines.takeLast();
+		}
 
-		foreach( const QByteArray& line, list) {
+		foreach( const QByteArray& line, lines) {
 
 			if (!line.isEmpty())
-				handleLine(line);
+				handleLine(QString::fromLocal8Bit(line));
 
 		}
 
@@ -509,6 +518,7 @@
 			if (checkForErrorMessage(line, WrongPasswordPatterns)) {
 				kDebug(1601) << "Wrong password!";
 				error(i18n("Incorrect password."));
+				setPassword(QString());
 				failOperation();
 				return;
 			}
@@ -520,7 +530,7 @@
 				return;
 			}
 
-			if (checkForFileExistsMessage(line))
+			if (handleFileExistsMessage(line))
 				return;
 
 		}
@@ -560,40 +570,51 @@
 		if (m_existsPattern.indexIn(line) != -1) {
 			kDebug(1601) << "Detected file existing!! Filename " << m_existsPattern.cap(1);
 
-			Kerfuffle::OverwriteQuery query(QDir::current().path() + '/' + m_existsPattern.cap(1));
-			query.setNoRenameMode(true);
-			userQuery(&query);
-			kDebug(1601) << "Waiting response";
-			query.waitForResponse();
-
-			kDebug(1601) << "Finished response";
-
-			QString responseToProcess;
-			QStringList choices = m_param.value(FileExistsInput).toStringList();
-
-			if (query.responseOverwrite())
-				responseToProcess = choices.at(0);
-			else if (query.responseSkip())
-				responseToProcess = choices.at(1);
-			else if (query.responseOverwriteAll())
-				responseToProcess = choices.at(2);
-			else if (query.responseCancelled())
-				responseToProcess = choices.at(3);
-			else if (query.responseAutoSkip())
-				responseToProcess = choices.at(4);
+			handleFileExistsMessage(m_existsPattern.cap(1));
+			return true;
+		}
+
+		return false;
+	}
+	
+	bool CliInterface::handleFileExistsMessage(const QString& line)
+	{
+		if (!checkForFileExistsMessage(line))
+			return false;
 
-			Q_ASSERT(!responseToProcess.isEmpty());
+		QString filename = m_existsPattern.cap(1);
 
-			responseToProcess += '\n';
+		Kerfuffle::OverwriteQuery query(QDir::current().path() + '/' + filename);
+		query.setNoRenameMode(true);
+		userQuery(&query);
+		kDebug(1601) << "Waiting response";
+		query.waitForResponse();
+
+		kDebug(1601) << "Finished response";
+
+		QString responseToProcess;
+		QStringList choices = m_param.value(FileExistsInput).toStringList();
+
+		if (query.responseOverwrite())
+			responseToProcess = choices.at(0);
+		else if (query.responseSkip())
+			responseToProcess = choices.at(1);
+		else if (query.responseOverwriteAll())
+			responseToProcess = choices.at(2);
+		else if (query.responseCancelled())
+			responseToProcess = choices.at(3);
+		else if (query.responseAutoSkip())
+			responseToProcess = choices.at(4);
 
-			kDebug(1601) << "Writing " << responseToProcess;
+		Q_ASSERT(!responseToProcess.isEmpty());
 
-			m_process->write(responseToProcess.toLocal8Bit());
+		responseToProcess += '\n';
 
-			return true;
-		}
+		kDebug(1601) << "Writing " << responseToProcess;
 
-		return false;
+		m_process->write(responseToProcess.toLocal8Bit());
+		
+		return true;
 	}
 
 	bool CliInterface::checkForErrorMessage(const QString& line, int parameterIndex)
--- ark/kerfuffle/cliinterface.h	
+++ ark/kerfuffle/cliinterface.h	
@@ -1,8 +1,7 @@
 /*
  * ark -- archiver for the KDE project
  *
- * Copyright (C) 2009 Harald Hvaal
- * <haraldhv atatatat stud.ntnu.no>
+ * Copyright (C) 2009 Harald Hvaal <haraldhv atatatat stud.ntnu.no>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -240,6 +239,7 @@
 			bool executeProcess(const QString& path, const QStringList & args);
 			void cacheParameterList();
 			bool checkForFileExistsMessage(const QString& line);
+			bool handleFileExistsMessage(const QString& filename);
 			bool checkForErrorMessage(const QString& line, int parameterIndex);
 			void handleLine(const QString& line);
 
@@ -261,7 +261,7 @@
 
 		private slots:
 			void started();
-			void readStdout();
+			void readStdout(bool handleAll=false);
 			void processFinished( int exitCode, QProcess::ExitStatus exitStatus );
 
 	};
--- ark/kerfuffle/jobs.cpp	
+++ ark/kerfuffle/jobs.cpp	
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
- * Copyright (c) 2008 Harald Hvaal <haraldhv )@@@( stud(dot)ntnu.no>
+ * Copyright (c) 2008-2009 Harald Hvaal <haraldhv )@@@( stud(dot)ntnu.no>
+ * Copyright (c) 2009 Raphael Kubo da Costa <kubito@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
--- superkaramba/plasma/plasma-scriptengine-superkaramba.desktop	
+++ superkaramba/plasma/plasma-scriptengine-superkaramba.desktop	
@@ -12,6 +12,7 @@
 Comment[ar]=سمة كارامبا لسطح المكتب
 Comment[bg]=Теми за Karamba
 Comment[ca]=Tema d'escriptori del Karamba
+Comment[cs]=Motiv plochy Karamba
 Comment[da]=Karamba desktoptema
 Comment[de]=Karamba Arbeitsflächendesign
 Comment[el]=Θέμα επιφάνειας εργασίας του Karamba
--- superkaramba/plasma/plasma-package-superkaramba.desktop	
+++ superkaramba/plasma/plasma-package-superkaramba.desktop	
@@ -3,6 +3,7 @@
 Name[ar]=ملفات  سوبركارامبا
 Name[bg]=Теми за SuperKaramba
 Name[ca]=Fitxers de temes del SuperKaramba
+Name[cs]=Soubory motivu Superkaramba
 Name[da]=SuperKaramba temafiler
 Name[de]=SuperKaramba Design-Dateien
 Name[el]=Αρχεία θεμάτων του SuperKaramba
@@ -43,6 +44,7 @@
 Comment[ar]=سمات كارامبا لسطح المكتب
 Comment[bg]=Теми за Karamba
 Comment[ca]=Temes d'escriptori del Karamba
+Comment[cs]=Motivy plochy Karamba
 Comment[da]=Karamba desktoptemaer
 Comment[de]=Karamba Arbeitsflächendesigns
 Comment[el]=Θέματα επιφάνειας εργασίας του Karamba

Property changes on: .
___________________________________________________________________
Added: svn:externals
   +

Places

File 4_3_BRANCH.diff of Package kdeutils4 (Revision 5f1974fffa4865bdaac72547a8bd46cc)

Places