Index: conf_windows.pri =================================================================== --- conf_windows.pri (revision 1014) +++ conf_windows.pri (working copy) @@ -1,14 +1,20 @@ # Windows build settings +CONFIG -= debug CONFIG += release -#CONFIG += qca-static +CONFIG += qca-static +CONFIG += psi_plugins # OpenSSL qca-static { DEFINES += HAVE_OPENSSL DEFINES += OSSL_097 - OPENSSL_PREFIX = /local + OPENSSL_PREFIX = C:/OpenSSL INCLUDEPATH += $$OPENSSL_PREFIX/include LIBS += -L$$OPENSSL_PREFIX/lib + LIBS += -LC:\Qt\MinGW\lib + LIBS += -L%windir%\system32 + LIBS += -llibeay32 -lssleay32 + LIBS += -lgdi32 -lwsock32 -lkernel32 } # SASL @@ -19,10 +25,15 @@ #} # ASpell -#DEFINES += HAVE_ASPELL +DEFINES += HAVE_ASPELL contains(DEFINES, HAVE_ASPELL) { - ASPELL_PREFIX = ../../../aspell + ASPELL_PREFIX = C:/Qt/aspell INCLUDEPATH += "$$ASPELL_PREFIX/include" LIBS += -L"$$ASPELL_PREFIX/lib" LIBS += -laspell-15 } + +# Psi plugins +psi_plugins { + DEFINES += PSI_PLUGINS +} Index: iris/libidn.pri =================================================================== --- iris/libidn.pri (revision 1014) +++ iris/libidn.pri (working copy) @@ -5,7 +5,7 @@ unix:{ QMAKE_CFLAGS_WARN_ON -= -W } - win32:{ + win32-msvc|win32-msvc.net|win32-msvc2005:{ QMAKE_CFLAGS += -Zm400 } Index: iris/xmpp-im/types.cpp =================================================================== --- iris/xmpp-im/types.cpp (revision 1014) +++ iris/xmpp-im/types.cpp (working copy) @@ -919,6 +919,7 @@ QList mucInvites; MUCDecline mucDecline; QString mucPassword; + int mucHistoryMaxChars, mucHistoryMaxStanzas, mucHistorySeconds; bool spooled, wasEncrypted; }; @@ -1450,6 +1451,10 @@ QDomElement e = s.createElement("jabber:x:delay", "x"); e.setAttribute("stamp", TS2stamp(d->timeStamp.toUTC())); s.appendChild(e); + + e = s.createElement("urn:xmpp:delay", "x"); + e.setAttribute("stamp", d->timeStamp.toUTC().toString(Qt::ISODate) + "Z"); + s.appendChild(e); } // urls @@ -1684,12 +1689,15 @@ } // timestamp - QDomElement t = root.elementsByTagNameNS("jabber:x:delay", "x").item(0).toElement(); - if(!t.isNull()) { - d->timeStamp = stamp2TS(t.attribute("stamp")); - d->timeStamp = d->timeStamp.addSecs(timeZoneOffset * 3600); + QDomElement t = root.elementsByTagNameNS("urn:xmpp:delay", "x").item(0).toElement(); + if (!t.isNull()) { + d->timeStamp = QDateTime::fromString(t.attribute("stamp").left(19), Qt::ISODate).addSecs(timeZoneOffset * 60); d->spooled = true; } + else if (t = root.elementsByTagNameNS("jabber:x:delay", "x").item(0).toElement(), !t.isNull()) { + d->timeStamp = stamp2TS(t.attribute("stamp")).addSecs(timeZoneOffset * 60); + d->spooled = true; + } else { d->timeStamp = QDateTime::currentDateTime(); d->spooled = false; Index: iris/xmpp-im/xmpp_tasks.cpp =================================================================== --- iris/xmpp-im/xmpp_tasks.cpp (revision 1014) +++ iris/xmpp-im/xmpp_tasks.cpp (working copy) @@ -707,10 +707,16 @@ if(i.hasAttribute("stamp")) { QDateTime dt; if(stamp2TS(i.attribute("stamp"), &dt)) - dt = dt.addSecs(client()->timeZoneOffset() * 3600); + dt = dt.addSecs(client()->timeZoneOffset() * 60); p.setTimeStamp(dt); } } + else if(i.tagName() == "x" && i.attribute("xmlns") == "urn:xmpp:delay") { + if(i.hasAttribute("stamp")) { + QDateTime dt = QDateTime::fromString(i.attribute("stamp").left(19), Qt::ISODate).addSecs(client()->timeZoneOffset() * 60); + p.setTimeStamp(dt); + } + } else if(i.tagName() == "x" && i.attribute("xmlns") == "gabber:x:music:info") { QDomElement t; bool found; Index: lang/qt_pl.ts =================================================================== --- lang/qt_pl.ts (revision 0) +++ lang/qt_pl.ts (revision 0) @@ -0,0 +1,3796 @@ + + + + PPDOptionsModel + + + Name + + + + + Value + + + + + Q3Accel + + + %1, %2 not defined + + + + + Ambiguous %1 not handled + + + + + Q3DataTable + + + True + + + + + False + + + + + Insert + + + + + Update + + + + + Delete + + + + + Q3FileDialog + + + Copy or Move a File + + + + + Read: %1 + + + + + Write: %1 + + + + + Cancel + + + + + All Files (*) + + + + + Name + + + + + Size + + + + + Type + + + + + Date + + + + + Attributes + + + + + &OK + + + + + Look &in: + + + + + File &name: + + + + + File &type: + + + + + Back + + + + + One directory up + + + + + Create New Folder + + + + + List View + + + + + Detail View + + + + + Preview File Info + + + + + Preview File Contents + + + + + Read-write + + + + + Read-only + + + + + Write-only + + + + + Inaccessible + + + + + Symlink to File + + + + + Symlink to Directory + + + + + Symlink to Special + + + + + File + + + + + Dir + + + + + Special + + + + + Open + + + + + Save As + + + + + &Open + + + + + &Save + + + + + &Rename + + + + + &Delete + + + + + R&eload + + + + + Sort by &Name + + + + + Sort by &Size + + + + + Sort by &Date + + + + + &Unsorted + + + + + Sort + + + + + Show &hidden files + + + + + the file + + + + + the directory + + + + + the symlink + + + + + Delete %1 + + + + + <qt>Are you sure you wish to delete %1 "%2"?</qt> + + + + + &Yes + + + + + &No + + + + + New Folder 1 + + + + + New Folder + + + + + New Folder %1 + + + + + Find Directory + + + + + Directories + + + + + Directory: + + + + + Error + + + + + %1 +File not found. +Check path and filename. + + + + + All Files (*.*) + + + + + Open + + + + + Select a Directory + + + + + Q3LocalFs + + + Could not read directory +%1 + + + + + Could not create directory +%1 + + + + + Could not remove file or directory +%1 + + + + + Could not rename +%1 +to +%2 + + + + + Could not open +%1 + + + + + Could not write +%1 + + + + + Q3MainWindow + + + Line up + + + + + Customize... + + + + + Q3NetworkProtocol + + + Operation stopped by the user + + + + + Q3ProgressDialog + + + Cancel + + + + + Q3TabDialog + + + OK + OK + + + + Apply + Zastosuj + + + + Help + Pomoc + + + + Defaults + Przywróć domyślne + + + + Cancel + Anuluj + + + + Q3TextEdit + + + &Undo + &Cofnij + + + + &Redo + &Ponów + + + + Cu&t + &Wytnij + + + + &Copy + &Kopiuj + + + + &Paste + Wkl&ej + + + + Clear + Wyczyść + + + + Select All + Zaznacz wszystko + + + + Q3TitleBar + + + System + + + + + Restore up + Przywróć + + + + Minimize + Minimalizuj + + + + Restore down + + + + + Maximize + Maksymalizuj + + + + Close + Zamknij + + + + Contains commands to manipulate the window + + + + + Puts a minimized back to normal + + + + + Moves the window out of the way + + + + + Puts a maximized window back to normal + + + + + Makes the window full screen + + + + + Closes the window + + + + + Displays the name of the window and contains controls to manipulate it + + + + + Q3ToolBar + + + More... + Więcej... + + + + Q3UrlOperator + + + The protocol `%1' is not supported + + + + + The protocol `%1' does not support listing directories + + + + + The protocol `%1' does not support creating new directories + + + + + The protocol `%1' does not support removing files or directories + + + + + The protocol `%1' does not support renaming files or directories + + + + + The protocol `%1' does not support getting files + + + + + The protocol `%1' does not support putting files + + + + + The protocol `%1' does not support copying or moving files or directories + + + + + (unknown) + + + + + Q3Wizard + + + &Cancel + + + + + < &Back + + + + + &Next > + + + + + &Finish + + + + + &Help + + + + + QAbstractSocket + + + Host not found + + + + + Connection refused + + + + + Socket operation timed out + + + + + Socket is not connected + + + + + QAbstractSpinBox + + + &Step up + + + + + Step &down + + + + + QApplication + + + Activate + + + + + Executable '%1' requires Qt %2, found Qt %3. + + + + + Incompatible Qt Library Error + + + + + QT_LAYOUT_DIRECTION + Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. + + + + + Activates the program's main window + + + + + QAxSelect + + + Select ActiveX Control + + + + + OK + + + + + &Cancel + + + + + COM &Object: + + + + + QCheckBox + + + Uncheck + + + + + Check + + + + + Toggle + + + + + QColorDialog + + + Hu&e: + + + + + &Sat: + + + + + &Val: + + + + + &Red: + + + + + &Green: + + + + + Bl&ue: + + + + + A&lpha channel: + + + + + &Basic colors + + + + + &Custom colors + + + + + &Define Custom Colors >> + + + + + OK + + + + + Cancel + + + + + &Add to Custom Colors + + + + + Select color + + + + + QComboBox + + + Open + + + + + QDB2Driver + + + Unable to connect + + + + + Unable to commit transaction + + + + + Unable to rollback transaction + + + + + Unable to set autocommit + + + + + QDB2Result + + + Unable to execute statement + + + + + Unable to prepare statement + + + + + Unable to bind variable + + + + + Unable to fetch record %1 + + + + + Unable to fetch next + + + + + Unable to fetch first + + + + + QDateTimeEdit + + + AM + + + + + am + + + + + PM + + + + + pm + + + + + QDialog + + + What's This? + + + + + QDialogButtonBox + + + OK + + + + + Save + + + + + Open + + + + + Cancel + + + + + Close + + + + + Apply + + + + + Reset + + + + + Help + + + + + Don't Save + + + + + Discard + + + + + &Yes + + + + + Yes to &All + + + + + &No + + + + + N&o to All + + + + + Save All + + + + + Abort + + + + + Retry + + + + + Ignore + + + + + Restore Defaults + + + + + QDirModel + + + Name + + + + + Size + + + + + Kind + Match OS X Finder + + + + + Type + All other platforms + + + + + Date Modified + + + + + QErrorMessage + + + Debug Message: + + + + + Warning: + + + + + Fatal Error: + + + + + &Show this message again + + + + + &OK + + + + + QFileDialog + + + All Files (*) + + + + + Directories + + + + + &Open + + + + + &Save + + + + + Open + + + + + Save + + + + + %1 already exists. +Do you want to replace it? + + + + + %1 +File not found. +Please verify the correct file name was given. + + + + + My Computer + + + + + Sort + + + + + &Rename + + + + + &Delete + + + + + &Reload + + + + + Sort by &Name + + + + + Sort by &Size + + + + + Sort by &Date + + + + + &Unsorted + + + + + Show &hidden files + + + + + Back + + + + + Parent Directory + + + + + Create New Folder + + + + + List View + + + + + Detail View + + + + + Look in: + + + + + File name: + + + + + Files of type: + + + + + Cancel + + + + + Directory: + + + + + +File not found. +Please verify the correct file name was given + + + + + %1 +Directory not found. +Please verify the correct directory name was given. + + + + + '%1' is write protected. +Do you want to delete it anyway? + + + + + Are sure you want to delete '%1'? + + + + + Could not delete directory. + + + + + All Files (*.*) + + + + + Save As + + + + + Open + + + + + Select a Directory + + + + + Drive + + + + + File + + + + + Unknown + + + + + QFontDialog + + + &Font + + + + + Font st&yle + + + + + &Size + + + + + Effects + + + + + Stri&keout + + + + + &Underline + + + + + Sample + + + + + Wr&iting System + + + + + Select Font + + + + + QFtp + + + Not connected + + + + + Host %1 not found + + + + + Connection refused to host %1 + + + + + Connected to host %1 + + + + + Connection refused for data connection + + + + + Unknown error + + + + + Connecting to host failed: +%1 + + + + + Login failed: +%1 + + + + + Listing directory failed: +%1 + + + + + Changing directory failed: +%1 + + + + + Downloading file failed: +%1 + + + + + Uploading file failed: +%1 + + + + + Removing file failed: +%1 + + + + + Creating directory failed: +%1 + + + + + Removing directory failed: +%1 + + + + + Connection closed + + + + + Host %1 found + + + + + Connection to %1 closed + + + + + Host found + + + + + Connected to host + + + + + QHostInfo + + + Unknown error + + + + + QHostInfoAgent + + + Host not found + + + + + Unknown address type + + + + + Unknown error + + + + + QHttp + + + Unknown error + + + + + Request aborted + + + + + No server set to connect to + + + + + Wrong content length + + + + + Server closed connection unexpectedly + + + + + Connection refused + + + + + Host %1 not found + + + + + HTTP request failed + + + + + Invalid HTTP response header + + + + + Invalid HTTP chunked body + + + + + Host %1 found + + + + + Connected to host %1 + + + + + Connection to %1 closed + + + + + Host found + + + + + Connected to host + + + + + Connection closed + + + + + QIBaseDriver + + + Error opening database + + + + + Could not start transaction + + + + + Unable to commit transaction + + + + + Unable to rollback transaction + + + + + QIBaseResult + + + Unable to create BLOB + + + + + Unable to write BLOB + + + + + Unable to open BLOB + + + + + Unable to read BLOB + + + + + Could not find array + + + + + Could not get array data + + + + + Could not get query info + + + + + Could not start transaction + + + + + Unable to commit transaction + + + + + Could not allocate statement + + + + + Could not prepare statement + + + + + Could not describe input statement + + + + + Could not describe statement + + + + + Unable to close statement + + + + + Unable to execute query + + + + + Could not fetch next item + + + + + Could not get statement info + + + + + QIODevice + + + Permission denied + + + + + Too many open files + + + + + No such file or directory + + + + + No space left on device + + + + + Unknown error + + + + + QInputContext + + + XIM + + + + + XIM input method + + + + + Windows input method + + + + + Mac OS X input method + + + + + QLibrary + + + QLibrary::load_sys: Cannot load %1 (%2) + + + + + QLibrary::unload_sys: Cannot unload %1 (%2) + + + + + QLibrary::resolve_sys: Symbol "%1" undefined in %2 (%3) + + + + + QLineEdit + + + &Undo + &Cofnij + + + + &Redo + &Ponów + + + + Cu&t + &Wytnij + + + + &Copy + &Kopiuj + + + + &Paste + Wkl&ej + + + + Delete + Usuń + + + + Select All + Zaznacz wszystko + + + + QMYSQLDriver + + + Unable to open database ' + + + + + Unable to connect + + + + + Unable to begin transaction + + + + + Unable to commit transaction + + + + + Unable to rollback transaction + + + + + QMYSQLResult + + + Unable to fetch data + + + + + Unable to execute query + + + + + Unable to store result + + + + + Unable to prepare statement + + + + + Unable to reset statement + + + + + Unable to bind value + + + + + Unable to execute statement + + + + + Unable to bind outvalues + + + + + Unable to store statement results + + + + + QMenu + + + Close + + + + + Open + + + + + Execute + + + + + QMessageBox + + + Help + + + + + OK + + + + + About Qt + + + + + <p>This program uses Qt version %1.</p> + + + + + <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://www.trolltech.com/qt/">www.trolltech.com/qt/</a> for more information.</p> + + + + + <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://www.trolltech.com/company/model.html">www.trolltech.com/company/model.html</a> for an overview of Qt licensing.</p> + + + + + Show Details... + + + + + Hide Details... + + + + + QMultiInputContext + + + Select IM + + + + + QMultiInputContextPlugin + + + Multiple input method switcher + + + + + Multiple input method switcher that uses the context menu of the text widgets + + + + + QNativeSocketEngine + + + The remote host closed the connection + + + + + Network operation timed out + + + + + Out of resources + + + + + Unsupported socket operation + + + + + Protocol type not supported + + + + + Invalid socket descriptor + + + + + Network unreachable + + + + + Permission denied + + + + + Connection timed out + + + + + Connection refused + + + + + The bound address is already in use + + + + + The address is not available + + + + + The address is protected + + + + + Unable to send a message + + + + + Unable to receive a message + + + + + Unable to write + + + + + Network error + + + + + Another socket is already listening on the same port + + + + + Unable to initialize non-blocking socket + + + + + Unable to initialize broadcast socket + + + + + Attempt to use IPv6 socket on a platform with no IPv6 support + + + + + Host unreachable + + + + + Datagram was too large to send + + + + + Operation on non-socket + + + + + Unknown error + + + + + QOCIDriver + + + QOCIDriver + Unable to initialize + + + + + Unable to logon + + + + + QOCIResult + + + Unable to bind column for batch execute + + + + + Unable to execute batch statement + + + + + Unable to goto next + + + + + Unable to alloc statement + + + + + Unable to prepare statement + + + + + Unable to bind value + + + + + Unable to execute select statement + + + + + Unable to execute statement + + + + + QODBCDriver + + + Unable to connect + + + + + Unable to connect - Driver doesn't support all needed functionality + + + + + Unable to disable autocommit + + + + + Unable to commit transaction + + + + + Unable to rollback transaction + + + + + Unable to enable autocommit + + + + + QODBCResult + + + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration + + + + + Unable to execute statement + + + + + Unable to fetch next + + + + + Unable to prepare statement + + + + + Unable to bind variable + + + + + QObject + + + False + + + + + True + + + + + QPSQLDriver + + + Unable to connect + + + + + Could not begin transaction + + + + + Could not commit transaction + + + + + Could not rollback transaction + + + + + QPSQLResult + + + Unable to create query + + + + + QPrintDialog + + + locally connected + + + + + Aliases: %1 + + + + + unknown + + + + + Portrait + + + + + Landscape + + + + + A0 (841 x 1189 mm) + + + + + A1 (594 x 841 mm) + + + + + A2 (420 x 594 mm) + + + + + A3 (297 x 420 mm) + + + + + A4 (210 x 297 mm, 8.26 x 11.7 inches) + + + + + A5 (148 x 210 mm) + + + + + A6 (105 x 148 mm) + + + + + A7 (74 x 105 mm) + + + + + A8 (52 x 74 mm) + + + + + A9 (37 x 52 mm) + + + + + B0 (1000 x 1414 mm) + + + + + B1 (707 x 1000 mm) + + + + + B2 (500 x 707 mm) + + + + + B3 (353 x 500 mm) + + + + + B4 (250 x 353 mm) + + + + + B5 (176 x 250 mm, 6.93 x 9.84 inches) + + + + + B6 (125 x 176 mm) + + + + + B7 (88 x 125 mm) + + + + + B8 (62 x 88 mm) + + + + + B9 (44 x 62 mm) + + + + + B10 (31 x 44 mm) + + + + + C5E (163 x 229 mm) + + + + + DLE (110 x 220 mm) + + + + + Executive (7.5 x 10 inches, 191 x 254 mm) + + + + + Folio (210 x 330 mm) + + + + + Ledger (432 x 279 mm) + + + + + Legal (8.5 x 14 inches, 216 x 356 mm) + + + + + Letter (8.5 x 11 inches, 216 x 279 mm) + + + + + Tabloid (279 x 432 mm) + + + + + US Common #10 Envelope (105 x 241 mm) + + + + + OK + + + + + Cancel + + + + + Page size: + + + + + Orientation: + + + + + Paper source: + + + + + Print + + + + + File + + + + + Printer + + + + + Print To File ... + + + + + Print dialog + + + + + Paper format + + + + + Size: + + + + + Properties + + + + + Printer info: + + + + + Browse + + + + + Print to file + + + + + Print range + + + + + Print all + + + + + Pages from + + + + + to + + + + + Selection + + + + + Copies + + + + + Number of copies: + + + + + Collate + + + + + Print last page first + + + + + Other + + + + + Print in color if available + + + + + Double side printing + + + + + File %1 is not writable. +Please choose a different file name. + + + + + %1 already exists. +Do you want to overwrite it? + + + + + QPrintPropertiesDialog + + + PPD Properties + + + + + Save + + + + + OK + + + + + QProgressBar + + + %1% + + + + + QProgressDialog + + + Cancel + + + + + QPushButton + + + Open + + + + + QRadioButton + + + Check + + + + + QRegExp + + + no error occurred + + + + + disabled feature used + + + + + bad char class syntax + + + + + bad lookahead syntax + + + + + bad repetition syntax + + + + + invalid octal value + + + + + missing left delim + + + + + unexpected end + + + + + met internal limit + + + + + QSQLite2Driver + + + Error to open database + + + + + Unable to begin transaction + + + + + Unable to commit transaction + + + + + Unable to rollback Transaction + + + + + QSQLite2Result + + + Unable to fetch results + + + + + Unable to execute statement + + + + + QSQLiteDriver + + + Error opening database + + + + + Error closing database + + + + + Unable to begin transaction + + + + + Unable to commit transaction + + + + + Unable to roll back transaction + + + + + QSQLiteResult + + + Unable to fetch row + + + + + Unable to execute statement + + + + + Unable to reset statement + + + + + Unable to bind parameters + + + + + Parameter count mismatch + + + + + QScrollBar + + + Scroll here + + + + + Left edge + + + + + Top + + + + + Right edge + + + + + Bottom + + + + + Page left + + + + + Page up + + + + + Page right + + + + + Page down + + + + + Scroll left + + + + + Scroll up + + + + + Scroll right + + + + + Scroll down + + + + + Line up + + + + + Position + + + + + Line down + + + + + QShortcut + + + Space + + + + + Esc + + + + + Tab + + + + + Backtab + + + + + Backspace + + + + + Return + + + + + Enter + + + + + Ins + + + + + Del + + + + + Pause + + + + + Print + + + + + SysReq + + + + + Home + + + + + End + + + + + Left + + + + + Up + + + + + Right + + + + + Down + + + + + PgUp + + + + + PgDown + + + + + CapsLock + + + + + NumLock + + + + + ScrollLock + + + + + Menu + + + + + Help + + + + + Back + + + + + Forward + + + + + Stop + + + + + Refresh + + + + + Volume Down + + + + + Volume Mute + + + + + Volume Up + + + + + Bass Boost + + + + + Bass Up + + + + + Bass Down + + + + + Treble Up + + + + + Treble Down + + + + + Media Play + + + + + Media Stop + + + + + Media Previous + + + + + Media Next + + + + + Media Record + + + + + Favorites + + + + + Search + + + + + Standby + + + + + Open URL + + + + + Launch Mail + + + + + Launch Media + + + + + Launch (0) + + + + + Launch (1) + + + + + Launch (2) + + + + + Launch (3) + + + + + Launch (4)