rev 3419 - trunk/packages/kdeutils/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Wed Mar 29 20:39:39 UTC 2006
Author: chrsmrtn
Date: 2006-03-29 20:39:39 +0000 (Wed, 29 Mar 2006)
New Revision: 3419
Added:
trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r524080.diff
Removed:
trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r502961.diff
trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r507313.diff
Log:
kdeutils branch updates.
Deleted: trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r502961.diff
Deleted: trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r507313.diff
Added: trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r524080.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r524080.diff 2006-03-29 20:39:09 UTC (rev 3418)
+++ trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r524080.diff 2006-03-29 20:39:39 UTC (rev 3419)
@@ -0,0 +1,537 @@
+#DPATCHLEVEL=0
+--- charselectapplet/kcharselectapplet.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ charselectapplet/kcharselectapplet.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -17,6 +17,7 @@
+ Name[fr]=Sélecteur de caractères
+ Name[ga]=Roghnóir Carachtar
+ Name[gl]=Selector de Caracteres
++Name[he]=בוחר תווים
+ Name[hu]=KCharselectApplet
+ Name[id]=Pemilih Karakter
+ Name[is]=Stafaval
+--- kfloppy/floppy_format.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kfloppy/floppy_format.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -14,6 +14,7 @@
+ Name[et]=Vorminda
+ Name[fr]=Formater
+ Name[ga]=Formáid
++Name[he]=פורמט
+ Name[hu]=Formázás
+ Name[is]=Forsníða
+ Name[it]=Formatta
+--- kgpg/kgpg.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kgpg/kgpg.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -23,6 +23,7 @@
+ GenericName[fi]=Salaustyökalu
+ GenericName[fr]=Outil de cryptage
+ GenericName[ga]=Uirlis Chriptithe
++GenericName[he]=כלי הצפנה
+ GenericName[hi]=एनक्रिप्शन औज़ार
+ GenericName[hu]=Titkosítóeszköz
+ GenericName[is]=Dulritunartól
+@@ -66,6 +67,7 @@
+ Comment[fi]=GnuPG-käyttöliittymä
+ Comment[fr]=Une interface à GnuPG
+ Comment[ga]=Comhéadan do GnuPG
++Comment[he]=מנשק גרפי של GnuPG
+ Comment[hi]=एक ग्नू-पीजी फ्रन्टएण्ड
+ Comment[hu]=Grafikus kezelőprogram a GnuPG-hez
+ Comment[is]=Viðmót á GnuPG
+--- kgpg/encryptfolder.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kgpg/encryptfolder.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -15,6 +15,7 @@
+ Name[eu]=Artxibatu eta enkriptatu karpeta
+ Name[fr]=Archiver puis chiffrer le dossier
+ Name[ga]=Cuir Fillteán i gCartlann & Criptigh É
++Name[he]=כלי להצפנה וכיווץ תקייה
+ Name[hu]=Könyvtár titkosítása és archiválása
+ Name[is]=Pakka og dulrita möppu
+ Name[it]=Archivia e cifra cartella
+--- kgpg/encryptfile.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kgpg/encryptfile.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -20,6 +20,7 @@
+ Name[fi]=Salaa tiedosto
+ Name[fr]=Chiffrer le fichier
+ Name[ga]=Criptigh Comhad
++Name[he]=הצפן קובץ
+ Name[hi]=एनक्रिप्ट फ़ाइल
+ Name[hu]=Fájl titkosítása
+ Name[is]=Dulrita skrá
+--- klaptopdaemon/applnk/klaptopdaemon.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ klaptopdaemon/applnk/klaptopdaemon.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -24,6 +24,7 @@
+ Comment[eu]=Magalekoaren bateria begiralea
+ Comment[fi]=Kannettavan koneen akkutarkkailja
+ Comment[fr]=Indicateur de batterie de portable
++Comment[he]=מד סוללה למחשב ברכיים
+ Comment[hu]=A telepek szintjelzője
+ Comment[is]=Rafhlöðueftirlit fyrir ferðavélar
+ Comment[it]=Controllo batteria computer portatile
+--- kedit/KEdit.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kedit/KEdit.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -17,6 +17,7 @@
+ GenericName[fi]=Tekstieditori
+ GenericName[fr]=Éditeur de texte élémentaire
+ GenericName[ga]=Eagarthóir Téacs Simplí
++GenericName[he]=עורך טקסט פשוט
+ GenericName[hi]=सादा पाठ संपादक
+ GenericName[hu]=Egyszerű szövegszerkesztő
+ GenericName[is]=Einfaldur textaritill
+--- ksim/monitors/i8k/i8k.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ ksim/monitors/i8k/i8k.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -46,6 +46,7 @@
+ Icon=hdd_mount
+ Name=Dell I8K
+ Name[fr]=Dell l8K
++Name[he]=Dell l8k
+ Name[hi]=डेल I8K
+ Name[nb]=Dell 18K
+ Name[sr]=Dell-ов I8K
+--- ksim/ksim.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ ksim/ksim.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -76,6 +76,7 @@
+ Comment[eu]=Sistemaren Informazioaren Begiralea (GKrellM estiloa)
+ Comment[fr]=Indicateur d'informations système (dans le style de GKrellM)
+ Comment[ga]=Monatóir Eolais an Chórais (stíl GKrellM)
++Comment[he]=צג מידע מערכת (נוסח GKrellM)
+ Comment[hu]=Rendszermonitor (GKrellM-stílusú)
+ Comment[is]=Kerfisupplýsingavaki (líkur GKrellM)
+ Comment[it]=Controllo delle informazioni di sistema (simile a GKrellM)
+--- kwallet/konfigurator/kwalletconfig.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kwallet/konfigurator/kwalletconfig.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -62,6 +62,7 @@
+ Comment[fi]=KDE-lompakon asetukset
+ Comment[fr]=Configuration du gestionnaire de comptes de KDE
+ Comment[ga]=Cumraíocht KDE Wallet
++Comment[he]=KDE Wallet הגדרות
+ Comment[hi]=केडीई वॉलेट कॉन्फ़िगरेशन
+ Comment[hu]=A KDE digitális noteszeinek beállításai
+ Comment[is]=Stillingar veskisins
+--- khexedit/parts/kpart/khexedit2part.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ khexedit/parts/kpart/khexedit2part.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -15,6 +15,7 @@
+ Name[eu]=Ikusgailu binario txertagarria
+ Name[fi]=Sulautettu binääritiedostojen näytin
+ Name[fr]=Afficheur de binaires intégré
++Name[he]=עורך הקסאדצימלי משובץ
+ Name[hu]=Beágyazott nézegető bináris fájlokhoz
+ Name[is]=Innbyggður tvíundakerfisskoðari
+ Name[it]=Visore binario integrabile
+@@ -50,6 +51,7 @@
+ Comment[eu]=Ikusgailu binario txertagarria
+ Comment[fi]=Sulautettu binääritiedostojen näytin
+ Comment[fr]=Afficheur de binaires intégré
++Comment[he]=עורך הקסאדצימלי משובץ
+ Comment[hu]=Beágyazott fájlmegjelenítő bináris fájlokhoz
+ Comment[is]=Innbyggður tvíundakerfisskoðari
+ Comment[it]=Visore binario integrabile
+--- khexedit/parts/kbytesedit/kbyteseditwidget.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ khexedit/parts/kbytesedit/kbyteseditwidget.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -15,6 +15,7 @@
+ Name[fi]=BytesEdit käyttöliittymäkomponentti
+ Name[fr]=Composant éditeur binaire
+ Name[ga]=Giuirléid BytesEdit
++Name[he]=פריט עורך הביטויים הסדירים
+ Name[hi]=बाइट्स-एडिट विजेट
+ Name[hu]=BytesEdit grafikus elem
+ Name[is]=Græja til að sýsla með bætaskrár
+--- kmilo/thinkpad/kmilo_thinkpad.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kmilo/thinkpad/kmilo_thinkpad.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -16,6 +16,7 @@
+ Name[eu]=Thikpad Plugina
+ Name[fi]=Thinkpad-liitännäinen
+ Name[fr]=Module externe pour les Thinkpad
++Name[he]=תוסף ל-Thinkpad
+ Name[hu]=Thinkpad bővítőmodul
+ Name[is]=Thinkpad íforrit
+ Name[it]=Plugin Thinkpad
+--- kmilo/thinkpad/kcmthinkpad/thinkpad.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kmilo/thinkpad/kcmthinkpad/thinkpad.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -22,6 +22,7 @@
+ Name[eu]=IBM Thinkpad Magalekoa
+ Name[fi]=IBM Thinkpad -kannettava
+ Name[fr]=Portable Thinkpad d'IBM
++Name[he]=מחשב ברכיים מסוג IBM Thinkpad
+ Name[hu]=IBM Thinkpad noteszgép
+ Name[is]=IBM ferðavél
+ Name[it]=Portatile IBM Thinkpad
+--- kmilo/demo/kmilo_demo.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kmilo/demo/kmilo_demo.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -60,6 +60,7 @@
+ Comment[fi]=Tämä liitännäinen ei tee mitään.
+ Comment[fr]=Ce module ne fait rien.
+ Comment[ga]=Ní dhéanann an breiseán seo faic.
++Comment[he]=התוסף הזה לא עושה כלום
+ Comment[hi]=यह प्लगइन कुछ नहीं करता है.
+ Comment[hu]=Ez a bővítőmodul nem csinál semmit
+ Comment[is]=Þetta íforrit gerir ekki neitt.
+--- kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -23,6 +23,7 @@
+ Name[eu]=Sony Vaio Magalekoa
+ Name[fi]=Sony Vaio -liitännäinen
+ Name[fr]=Portable Vaio de Sony
++Name[he]=מחשב ברכיים מסוג Sony Vaio
+ Name[hu]=Sony Vaio noteszgép
+ Name[is]=Sony Vaio kjöltutölva
+ Name[it]=Portatile Sony Vaio
+--- kmilo/kmilo_kvaio/kmilo_kvaio.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kmilo/kmilo_kvaio/kmilo_kvaio.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -18,6 +18,7 @@
+ Name[fi]=Sony Vaio -liitännäinen
+ Name[fr]=Module externe pour les Vaio de Sony
+ Name[ga]=Breiseán Sony Vaio
++Name[he]=תוסף ל-Sony Vaio
+ Name[hi]=सोनी वायो प्लगइन
+ Name[hu]=Sony Vaio bővítőmodul
+ Name[is]=Sony Vaio íforrit
+--- kmilo/powerbook2/kmilo_powerbook.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kmilo/powerbook2/kmilo_powerbook.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -17,6 +17,7 @@
+ Name[fi]=Apple PowerBook -liitännäinen
+ Name[fr]=Module externe Apple PowerBook
+ Name[ga]=Breiseán Apple® PowerBook®
++Name[he]=תוסף ל-Apple PowerBook
+ Name[hi]=एपल पावर-बुक प्लगइन
+ Name[hu]=Apple PowerBook bővítőmodul
+ Name[is]=Apple PowerBook íforrit
+--- kmilo/asus/kmilo_asus.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kmilo/asus/kmilo_asus.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -15,6 +15,7 @@
+ Name[eu]=Asus Laptop plugina
+ Name[fi]=Asus kannettavan koneen liitännäinen
+ Name[fr]=Module externe pour les portables Asus
++Name[he]=תוסף למחשבי ברכיים בעלי ASUS
+ Name[hu]=ASUS modul
+ Name[is]=Asus ferðatölvuíforrit
+ Name[it]=Plugin per portatili Asus
+@@ -49,6 +50,7 @@
+ Comment[eu]=Asus eramangarrien tekla berezientzako euskarria gaitzen du
+ Comment[fi]=Tämä liitännäinen mahdollistaa erikoisnäppäinten tuen Asus-merkkisille kannettaville tietokoneille.
+ Comment[fr]=Ce module active la gestion des touches spéciales des ordinateurs portables Asus
++Comment[he]=מוסיף תמיכה בשביל מקשים מיוחדים של Asus
+ Comment[hu]=Ez a bővítőmodul lehetővé teszi az ASUS noteszgépek speciális billentyűinek használatát
+ Comment[is]=Virkjar stuðning fyrir sérhnappa Asus ferðavéla
+ Comment[it]=Abilita il supporto per i tasti speciali dei portatili Asus
+--- kmilo/delli8k/kmilo_delli8k.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kmilo/delli8k/kmilo_delli8k.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -15,6 +15,7 @@
+ Name[eu]=Dell I8k Laptop Plugina
+ Name[fi]=Dell I8k kannettavan koneen liitännäinen
+ Name[fr]=Module externe pour les Dell I8k
++Name[he]=תוסף למחשבי ברכיים בעלי Dell l8k
+ Name[hu]=Dell I8k modul
+ Name[is]=Dell I8k ferðatölvuíforrit
+ Name[it]=Plugin portatili Dell I8k
+@@ -49,6 +50,7 @@
+ Comment[eu]=Dell eramangarrien tekla berezientzako euskarria gaitzen du
+ Comment[fi]=Tämä liitännäinen mahdollistaa erikoisnäppäinten tuen Dellin kannettaville tietokoneille.
+ Comment[fr]=Ce module active la gestion des touches spéciales des ordinateurs portables Dell
++Comment[he]=מוסיף תמיכה בשביל מקשים מיוחדים של Dell
+ Comment[hu]=Ez a bővítőmodul lehetővé teszi a Dell noteszgépek speciális billentyűinek használatát
+ Comment[is]=Virkjar stuðning fyrir sérhnappa Dell ferðavéla
+ Comment[it]=Abilita il supporto per i tasti speciali dei portatili Dell
+--- kmilo/generic/kmilo_generic.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kmilo/generic/kmilo_generic.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -19,6 +19,7 @@
+ Name[fi]=Yleinen näppäimistöliitännäinen
+ Name[fr]=Module externe de clavier générique
+ Name[ga]=Breiseán Cineálach Méarchláir
++Name[he]=תוסף גנרי למקלדות
+ Name[hi]=जेनेरिक कुंजीपट प्लगइन
+ Name[hu]=Általános billentyűzet-bővítőmodul
+ Name[is]=Almennt lyklaborðsíforrit
+--- kregexpeditor/kregexpeditor.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kregexpeditor/kregexpeditor.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -29,6 +29,7 @@
+ GenericName[fi]=Säännöllisten lausekkeiden muokkain
+ GenericName[fr]=Éditeur d'expressions régulières
+ GenericName[ga]=Eagarthóir Sloinn Ionadaíochta
++GenericName[he]=עורך ביטויים רגולריים
+ GenericName[hi]=रेगुलर एक्सप्रेशन संपादक
+ GenericName[hu]=Kifejezésszerkesztő
+ GenericName[is]=Ritill fyrir reglulegar segðir
+--- kdelirc/kcmlirc/kcmlirc.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kdelirc/kcmlirc/kcmlirc.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -68,6 +68,7 @@
+ Name[fi]=Kauko-ohjaimet
+ Name[fr]=Contrôleurs distants
+ Name[ga]=Cianrialtáin
++Name[he]=שליטה מרחוק
+ Name[hi]=रिमोट नियंत्रण
+ Name[hu]=Távirányító
+ Name[is]=Fjarstýringar
+--- kdelirc/irkick/irkick.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kdelirc/irkick/irkick.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -17,6 +17,7 @@
+ GenericName[fi]=KDE:n LIRC-palvelin
+ GenericName[fr]=Serveur KDE LIRC
+ GenericName[ga]=Freastalaí LIRC KDE
++GenericName[he]=שרת ה-LIRC של KDE
+ GenericName[hu]=KDE LIRC szolgáltatás
+ GenericName[is]=KDE LIRC þjónn
+ GenericName[it]=Server LIRC di KDE
+--- kcalc/kcalcdisplay.cpp (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kcalc/kcalcdisplay.cpp (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -57,8 +57,7 @@
+
+ KCalcDisplay::KCalcDisplay(QWidget *parent, const char *name)
+ :QLabel(parent,name), _beep(false), _groupdigits(false), _button(0), _lit(false),
+- _num_base(NB_DECIMAL),
+- _display_size(DEC_SIZE), _precision(9),
++ _num_base(NB_DECIMAL), _precision(9),
+ _fixed_precision(-1), _display_amount(0),
+ selection_timer(new QTimer)
+ {
+@@ -335,26 +334,21 @@
+ {
+ case NB_HEX:
+ _num_base = NB_HEX;
+- _display_size = HEX_SIZE;
+ _period = false;
+ break;
+ case NB_DECIMAL:
+ _num_base = NB_DECIMAL;
+- _display_size = DEC_SIZE;
+ break;
+ case NB_OCTAL:
+ _num_base = NB_OCTAL;
+- _display_size = OCT_SIZE;
+ _period = false;
+ break;
+ case NB_BINARY:
+ _num_base = NB_BINARY;
+- _display_size = BIN_SIZE;
+ _period = false;
+ break;
+ default: // we shouldn't ever end up here
+ _num_base = NB_DECIMAL;
+- _display_size = DEC_SIZE;
+ }
+
+ setAmount(static_cast<double>(tmp_val));
+@@ -443,13 +437,6 @@
+
+ void KCalcDisplay::newCharacter(char const new_char)
+ {
+- // error or DISPLAY is already full
+- if (text().length() >= _display_size)
+- {
+- if(_beep) KNotifyClient::beep();
+- return;
+- }
+-
+ // test if character is valid
+ switch(new_char)
+ {
+--- kcalc/kcalcdisplay.h (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kcalc/kcalcdisplay.h (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -50,15 +50,8 @@
+ #define PRINT_HEX "%lX"
+ #endif
+
+-#define HEX_SIZE sizeof(KCALC_LONG)*2
+-#define OCT_SIZE (int)(sizeof(KCALC_LONG) * 2.75)
+-// unsure how to properly deside how many decimal digits we can enter
+-// so we'll just go with same as BIN to be safe..
+-#define DEC_SIZE sizeof(KCALC_LONG)*8
+-#define BIN_SIZE sizeof(KCALC_LONG)*8
+-
+ // DSP_SIZE should be == BIN_SIZE as BIN_SIZE is the largest one..
+-#define DSP_SIZE BIN_SIZE // 25
++#define DSP_SIZE 25
+
+ #define NUM_STATUS_TEXT 4
+
+@@ -127,7 +120,6 @@
+ int _button;
+ bool _lit;
+ NumBase _num_base;
+- int _display_size;
+
+ int _precision;
+ int _fixed_precision; // "-1" = no fixed_precision
+--- kcalc/knumber/knumber.cpp (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kcalc/knumber/knumber.cpp (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -659,11 +659,17 @@
+
+ KNumber::operator unsigned long long int(void) const
+ {
+- KNumber tmp_num = this->abs().integerPart();
+- return static_cast<unsigned long int>(*this) +
+- (static_cast<unsigned long long int>(
+- static_cast<unsigned long int>(tmp_num >> KNumber("32"))) << 32) ;
+-
++ KNumber tmp_num1 = this->abs().integerPart();
++ unsigned long long int tmp_num2 = static_cast<unsigned long int>(tmp_num1) +
++ (static_cast<unsigned long long int>(
++ static_cast<unsigned long int>(tmp_num1 >> KNumber("32"))) << 32) ;
++
++#warning the cast operator from KNumber to unsigned long long int is probably buggy, when a sign is involved
++ if (*this > KNumber(0))
++ return tmp_num2;
++ else
++ return static_cast<unsigned long long int> (- static_cast<signed long long int>(tmp_num2));
++
+ }
+
+ KNumber::operator double(void) const
+--- kcalc/knumber/knumber_priv.cpp (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ kcalc/knumber/knumber_priv.cpp (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -736,8 +736,8 @@
+
+ _knumber * _knumerror::power(_knumber const & exponent) const
+ {
+-#warning need to implemented something sensible here
+- return new _knumerror(Infinity);
++ static_cast<void>(exponent);
++ return new _knumerror(UndefinedNumber);
+ }
+
+ _knumber * _knuminteger::power(_knumber const & exponent) const
+@@ -857,9 +857,23 @@
+ }
+ }
+
+-#warning compare _error with _error
+-
+- return 0;
++ switch(_error) {
++ case Infinity:
++ if (dynamic_cast<_knumerror const &>(arg2)._error == Infinity)
++ // Infinity is larger than anything else, but itself
++ return 0;
++ return 1;
++ case MinusInfinity:
++ if (dynamic_cast<_knumerror const &>(arg2)._error == MinusInfinity)
++ // MinusInfinity is smaller than anything else, but itself
++ return 0;
++ return -1;
++ default:
++ if (dynamic_cast<_knumerror const &>(arg2)._error == UndefinedNumber)
++ // Undefined only equal to itself
++ return 0;
++ return -arg2.compare(*this);
++ }
+ }
+
+ int _knuminteger::compare(_knumber const &arg2) const
+--- ark/arch.cpp (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ ark/arch.cpp (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -133,8 +133,8 @@
+
+ if ( !getLastShellOutput().isNull() )
+ {
+- msg += i18n( "\nUse \"Details\" to view the last shell output." );
+- KMessageBox::detailedError( m_gui, msg, getLastShellOutput() );
++ QStringList list = QStringList::split( "\n", getLastShellOutput() );
++ KMessageBox::errorList( m_gui, msg, list );
+ }
+ else
+ {
+@@ -180,8 +180,9 @@
+
+ if ( !getLastShellOutput().isNull() )
+ {
+- msg += i18n( "\nUse \"Details\" to view the last shell output." );
+- KMessageBox::detailedError( m_gui, msg, getLastShellOutput() );
++ //getLastShellOutput() is a QString. errorList is expecting QStringLists to show in multiple lines
++ QStringList list = QStringList::split( "\n", getLastShellOutput() );
++ KMessageBox::errorList( m_gui, msg, list );
+ }
+ else
+ {
+@@ -216,8 +217,8 @@
+
+ if ( !getLastShellOutput().isNull() )
+ {
+- msg += i18n( "\nUse \"Details\" to view the last shell output." );
+- KMessageBox::detailedError( m_gui, msg, getLastShellOutput() );
++ QStringList list = QStringList::split( "\n", getLastShellOutput() );
++ KMessageBox::errorList( m_gui, msg, list );
+ }
+ else
+ {
+--- ark/main.cpp (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ ark/main.cpp (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -94,6 +94,9 @@
+ aboutData.addAuthor( "Robert Palmbos",
+ 0,
+ "palm9744 at kettering.edu" );
++ aboutData.addAuthor( "Haris Kouzinopoulos",
++ 0,
++ "haris at mpa.gr" );
+
+ aboutData.addCredit( "Bryce Corkins",
+ I18N_NOOP( "Icons" ),
+--- ark/arkwidget.cpp (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ ark/arkwidget.cpp (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -493,13 +493,6 @@
+ bool keepGoing = true;
+ if ( !ArkSettings::extractOverwrite() && !alreadyExisting.isEmpty() )
+ {
+- if ( alreadyExisting.count() == m_nNumFiles )
+- {
+- KMessageBox::error( this, i18n( "None of the files in the archive have been\n"
+- "extracted since all of them already exist.") );
+- emit request_file_quit();
+- return;
+- }
+ keepGoing = ( KMessageBox::Continue == KMessageBox::warningContinueCancelList( this,
+ i18n( "The following files will not be extracted\nbecause they "
+ "already exist:" ), alreadyExisting ) );
+@@ -1375,18 +1368,12 @@
+
+ // now report on the contents
+ holdBusy();
+- if (numFilesToReport == 1)
++ if (numFilesToReport != 0)
+ {
+- kdDebug(1601) << "One to report" << endl;
+- strFilename = filesExisting.first();
+- QString message = i18n("%1 will not be extracted because it will overwrite an existing file.\nGo back to the Extraction Dialog?").arg(strFilename);
+- redoExtraction = (KMessageBox::questionYesNo(this, message) == KMessageBox::Yes);
++ redoExtraction = ( KMessageBox::Cancel == KMessageBox::warningContinueCancelList( this,
++ i18n( "The following files will not be extracted\nbecause they "
++ "already exist:" ), filesExisting ) );
+ }
+- else if (numFilesToReport != 0)
+- {
+- QString message = i18n("Some files will not be extracted, because they would overwrite existing files.\nWould you like to go back to the extraction dialog?\n\nThe following files will not be extracted if you choose to continue:");
+- redoExtraction = (KMessageBox::questionYesNoList(this, message, filesExisting) == KMessageBox::Yes);
+- }
+ resumeBusy();
+ return redoExtraction;
+ }
+@@ -1415,7 +1402,9 @@
+ {
+ strFilename = *it;
+ QString strFullName = strDestDir + strFilename;
+- if ( QFile::exists( strFullName ) )
++
++ // if the filename ends with an "/", it means it is a directory
++ if ( QFile::exists( strFullName ) && !strFilename.endsWith("/") )
+ {
+ existingFiles.append( strFilename );
+ }
+--- superkaramba/src/superkaramba.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ superkaramba/src/superkaramba.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -18,6 +18,7 @@
+ Comment[et]=Töölaua lahedate vidinate mootor.
+ Comment[eu]=Mahaigaineko efektu politentzako euskarri bat.
+ Comment[fr]=Un moteur de bureau esthétique et sympathique
++Comment[he]=מנוע שהופך את שולחן העבודה למגניב.
+ Comment[hu]=Keretrendszer grafikus asztali elemek használatához.
+ Comment[is]=Flottar skjáborðsviðbætur.
+ Comment[it]=Un motore per rendere il desktop più gradevole.
+--- superkaramba/mimetypes/x-superkaramba.desktop (.../tags/KDE/3.5.2/kdeutils) (revision 524080)
++++ superkaramba/mimetypes/x-superkaramba.desktop (.../branches/KDE/3.5/kdeutils) (revision 524080)
+@@ -11,6 +11,8 @@
+ Comment[et]=Superkaramba teemafail
+ Comment[eu]=Superkaramba gai-fitxategia
+ Comment[fr]=Fichier de thème SuperKaramba
++Comment[ga]=Comhad Téama Superkaramba
++Comment[he]=ערכת נושא של Superkaramba
+ Comment[hu]=SuperKaramba-témafájl
+ Comment[is]=Súperkaramba þemuskrá
+ Comment[it]=File di tema Superkaramba
More information about the pkg-kde-commits
mailing list