Bump to 3.1.2

Changelog

@@ -1,3 +1,8 @@
+* Tue Nov 05 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.2
+    - BUGFIX: Fix WebUI gzip compression. Closes #1037. (sledgehammer999)
+    - BUGFIX: Fix compilation with qt < 4.8.0. Closes #1043. (sledgehammer999)
+    - OTHER: Updated translations.
+
 * Mon Oct 28 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.1
     - FEATURE: Show external IP in the log. Closes #968. (sledgehammer999)
     - FEATURE: Enable gzip compression in the webui. It should be faster now. (sledgehammer999)

src/lang/qbittorrent_cs.ts

@@ -1363,7 +1363,7 @@ Další upozornění již nebudou zobrazena.</translation>
         <location filename="../mainwindow.cpp" line="151"/>
         <location filename="../mainwindow.cpp" line="418"/>
         <source>Clear the password</source>
-        <translation type="unfinished"/>
+        <translation>Vymazat heslo</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="186"/>
@@ -1414,7 +1414,7 @@ Chcete asociovat qBittorrent se soubory .torrent a Magnet odkazy?</translation>
     <message>
         <location filename="../mainwindow.cpp" line="418"/>
         <source>Are you sure you want to clear the password?</source>
-        <translation type="unfinished"/>
+        <translation>Opravdu chcete vymazat heslo?</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="445"/>
@@ -4087,7 +4087,7 @@ Nainstalujte jej prosím ručně.</translation>
     <message>
         <location filename="../properties/trackerlist.cpp" line="421"/>
         <source>Force reannounce to all trackers</source>
-        <translation type="unfinished"/>
+        <translation>Vynutit oznámení všem trackerům</translation>
     </message>
     <message>
         <location filename="../properties/trackerlist.cpp" line="416"/>
@@ -4154,13 +4154,13 @@ Nainstalujte jej prosím ručně.</translation>
         <location filename="../transferlistdelegate.h" line="95"/>
         <source>Downloading metadata</source>
         <comment>used when loading a magnet link</comment>
-        <translation type="unfinished"/>
+        <translation>Stahuji metadata</translation>
     </message>
     <message>
         <location filename="../transferlistdelegate.h" line="98"/>
         <source>Allocating</source>
         <comment>qBittorrent is allocating the files on disk</comment>
-        <translation type="unfinished"/>
+        <translation>Přiděluji místo</translation>
     </message>
     <message>
         <location filename="../transferlistdelegate.h" line="102"/>
@@ -4195,13 +4195,13 @@ Nainstalujte jej prosím ručně.</translation>
         <location filename="../transferlistdelegate.h" line="120"/>
         <source>Queued for checking</source>
         <comment>i.e. torrent is queued for hash checking</comment>
-        <translation type="unfinished"/>
+        <translation>Ve frontě pro haš</translation>
     </message>
     <message>
         <location filename="../transferlistdelegate.h" line="123"/>
         <source>Checking resume data</source>
         <comment>used when loading the torrents from disk after qbt is launched. It checks the correctness of the .fastresume file. Normally it is completed in a fraction of a second, unless loading many many torrents.</comment>
-        <translation type="unfinished"/>
+        <translation>Kontroluji data rychlého obnovení</translation>
     </message>
     <message>
         <location filename="../transferlistdelegate.h" line="137"/>

src/lang/qbittorrent_eu.ts

@@ -2153,7 +2153,7 @@ Nahi duzu qBittorrent %1 bertsiora eguneratzea?</translation>
     <message>
         <location filename="../preferences/options.ui" line="586"/>
         <source>Save files to location:</source>
-        <translation>Gorde agirak kokalekuan:</translation>
+        <translation>Gorde agiriak kokaleku honetan:</translation>
     </message>
     <message>
         <location filename="../preferences/options.ui" line="634"/>

src/lang/qbittorrent_fi.ts

@@ -799,7 +799,7 @@ Sinun pitäisi löytää nämä tiedot web-selaimesi asetuksista.</translation>
     <message>
         <location filename="../downloadthread.cpp" line="274"/>
         <source>The access to the remote content was denied (401)</source>
-        <translation type="unfinished"/>
+        <translation>Etäsisällön käyttö estettiin (401)</translation>
     </message>
     <message>
         <location filename="../downloadthread.cpp" line="276"/>
@@ -814,7 +814,7 @@ Sinun pitäisi löytää nämä tiedot web-selaimesi asetuksista.</translation>
     <message>
         <location filename="../downloadthread.cpp" line="280"/>
         <source>The remote server requires authentication to serve the content but the credentials provided were not accepted</source>
-        <translation type="unfinished"/>
+        <translation>Etäpalvelin vaatii tunnistautumisen sisällön jakamista varten, mutta annettua käyttäjätunnusta ja salanaa ei hyväksytty</translation>
     </message>
     <message>
         <location filename="../downloadthread.cpp" line="282"/>
@@ -839,7 +839,7 @@ Sinun pitäisi löytää nämä tiedot web-selaimesi asetuksista.</translation>
     <message>
         <location filename="../downloadthread.cpp" line="290"/>
         <source>An unknown error related to the remote content was detected</source>
-        <translation type="unfinished"/>
+        <translation>Havaittiin etäsisältöön liittyvä tuntematon virhe</translation>
     </message>
     <message>
         <location filename="../downloadthread.cpp" line="292"/>
@@ -1363,7 +1363,7 @@ Muita varoituksia ei anneta.</translation>
         <location filename="../mainwindow.cpp" line="151"/>
         <location filename="../mainwindow.cpp" line="418"/>
         <source>Clear the password</source>
-        <translation type="unfinished"/>
+        <translation>Tyhjennä salasana</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="186"/>
@@ -1414,7 +1414,7 @@ Haluatko määrittää torrent-tiedostot ja Magnet-linkit qBittorrentille?</tran
     <message>
         <location filename="../mainwindow.cpp" line="418"/>
         <source>Are you sure you want to clear the password?</source>
-        <translation type="unfinished"/>
+        <translation>Haluatko varmasti tyhjentää salasanan?</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="445"/>
@@ -1460,12 +1460,12 @@ Haluatko määrittää torrent-tiedostot ja Magnet-linkit qBittorrentille?</tran
     <message>
         <location filename="../mainwindow.cpp" line="608"/>
         <source>Recursive download confirmation</source>
-        <translation type="unfinished"/>
+        <translation>Rekursiivinen latausvahvistus</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="608"/>
         <source>The torrent %1 contains torrent files, do you want to proceed with their download?</source>
-        <translation type="unfinished"/>
+        <translation>Torrent %1 sisältää torrent-tiedostoja, haluatko jatkaa niiden lataamisella?</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="609"/>
@@ -1492,7 +1492,7 @@ Haluatko määrittää torrent-tiedostot ja Magnet-linkit qBittorrentille?</tran
     <message>
         <location filename="../mainwindow.cpp" line="625"/>
         <source>Couldn&apos;t download file at url: %1, reason: %2.</source>
-        <translation type="unfinished"/>
+        <translation>Tiedoston lataaminen epäonnistui osoitteesta: %1, syy: %2.</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="636"/>
@@ -2224,7 +2224,7 @@ Haluatko päivittää qBittorrentin versioon %1?</translation>
     <message>
         <location filename="../preferences/options.ui" line="1097"/>
         <source>Use UPnP / NAT-PMP port forwarding from my router</source>
-        <translation type="unfinished"/>
+        <translation>Käytä UPnP-/NAT-PMP-portinohjausta reitittimeltä</translation>
     </message>
     <message>
         <location filename="../preferences/options.ui" line="1107"/>
@@ -2239,7 +2239,7 @@ Haluatko päivittää qBittorrentin versioon %1?</translation>
     <message>
         <location filename="../preferences/options.ui" line="1368"/>
         <source>Otherwise, the proxy server is only used for tracker connections</source>
-        <translation type="unfinished"/>
+        <translation>Muussa tapauksessa välityspalvelinta käytetään vain seurantapalvelimen yhteyksiin</translation>
     </message>
     <message>
         <location filename="../preferences/options.ui" line="1371"/>
@@ -2280,7 +2280,7 @@ Haluatko päivittää qBittorrentin versioon %1?</translation>
     <message>
         <location filename="../preferences/options.ui" line="1953"/>
         <source>Enable DHT (decentralized network) to find more peers</source>
-        <translation type="unfinished"/>
+        <translation>Käytä DHT:tä (hajautettua verkkoa) useampien vertaisten löytämiseen</translation>
     </message>
     <message>
         <location filename="../preferences/options.ui" line="1962"/>
@@ -2290,7 +2290,7 @@ Haluatko päivittää qBittorrentin versioon %1?</translation>
     <message>
         <location filename="../preferences/options.ui" line="2026"/>
         <source>Enable Peer Exchange (PeX) to find more peers</source>
-        <translation type="unfinished"/>
+        <translation>Käytä PeX:tä useampien vertaisten löytämiseen</translation>
     </message>
     <message>
         <location filename="../preferences/options.ui" line="2036"/>
@@ -2834,7 +2834,7 @@ Haluatko päivittää qBittorrentin versioon %1?</translation>
     <message>
         <location filename="../qtlibtorrent/qbtsession.cpp" line="397"/>
         <source>HTTP user agent is %1</source>
-        <translation type="unfinished"/>
+        <translation>HTTP-käyttäjätunniste (user agent) on %1</translation>
     </message>
     <message>
         <location filename="../qtlibtorrent/qbtsession.cpp" line="424"/>
@@ -2875,7 +2875,7 @@ Haluatko päivittää qBittorrentin versioon %1?</translation>
     <message>
         <location filename="../qtlibtorrent/qbtsession.cpp" line="530"/>
         <source>Restart is required to toggle PeX support</source>
-        <translation type="unfinished"/>
+        <translation>PeX-tuen ottaminen tai poistaminen käytöstä vaatii uudelleenkäynnistyksen</translation>
     </message>
     <message>
         <location filename="../qtlibtorrent/qbtsession.cpp" line="538"/>
@@ -2998,7 +2998,7 @@ Haluatko päivittää qBittorrentin versioon %1?</translation>
         <location filename="../qtlibtorrent/qbtsession.cpp" line="2642"/>
         <source>External IP: %1</source>
         <comment>e.g. External IP: 192.168.0.1</comment>
-        <translation type="unfinished"/>
+        <translation>Ulkoinen IP-osoite: %1</translation>
     </message>
     <message>
         <location filename="../qtlibtorrent/qbtsession.cpp" line="2891"/>
@@ -3841,12 +3841,12 @@ Asenna se itse.</translation>
         <location filename="../torrentimportdlg.cpp" line="95"/>
         <source>Please provide the location of %1</source>
         <comment>%1 is a file name</comment>
-        <translation type="unfinished"/>
+        <translation>Määritä tiedoston %1 sijainti</translation>
     </message>
     <message>
         <location filename="../torrentimportdlg.cpp" line="130"/>
         <source>Please point to the location of the torrent: %1</source>
-        <translation type="unfinished"/>
+        <translation>Määritä torrentin sijainti: %1</translation>
     </message>
     <message>
         <location filename="../torrentimportdlg.cpp" line="235"/>

src/lang/qbittorrent_ro.ts

@@ -658,7 +658,7 @@
     <message>
         <location filename="../rss/cookiesdlg.ui" line="14"/>
         <source>Cookies management</source>
-        <translation>Administare cookiuri</translation>
+        <translation>Administrare cookie-uri</translation>
     </message>
     <message>
         <location filename="../rss/cookiesdlg.ui" line="36"/>
@@ -1363,7 +1363,7 @@ Nu vor mai fi emise alte anunțuri.</translation>
         <location filename="../mainwindow.cpp" line="151"/>
         <location filename="../mainwindow.cpp" line="418"/>
         <source>Clear the password</source>
-        <translation type="unfinished"/>
+        <translation>Înlătură parola</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="186"/>
@@ -1414,7 +1414,7 @@ Doriți să asociați qBittorrent fișierelor torent și legăturilor magnet?</t
     <message>
         <location filename="../mainwindow.cpp" line="418"/>
         <source>Are you sure you want to clear the password?</source>
-        <translation type="unfinished"/>
+        <translation>Sunteți sigur că doriți înlăturarea parolei?</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="445"/>
@@ -3270,7 +3270,7 @@ p, li { spațiu-alb: pre-wrap; }
     <message>
         <location filename="../rss/rss.ui" line="223"/>
         <source>Manage cookies...</source>
-        <translation>Administrează cokiurile...</translation>
+        <translation>Administrează cookie-urile...</translation>
     </message>
     <message>
         <location filename="../rss/rss.ui" line="63"/>
@@ -4087,7 +4087,7 @@ Instalați manual.</translation>
     <message>
         <location filename="../properties/trackerlist.cpp" line="421"/>
         <source>Force reannounce to all trackers</source>
-        <translation type="unfinished"/>
+        <translation>Forțează reanunțarea tuturor tracker-elor</translation>
     </message>
     <message>
         <location filename="../properties/trackerlist.cpp" line="416"/>
@@ -4154,13 +4154,13 @@ Instalați manual.</translation>
         <location filename="../transferlistdelegate.h" line="95"/>
         <source>Downloading metadata</source>
         <comment>used when loading a magnet link</comment>
-        <translation type="unfinished"/>
+        <translation>Se descarcă metainformația</translation>
     </message>
     <message>
         <location filename="../transferlistdelegate.h" line="98"/>
         <source>Allocating</source>
         <comment>qBittorrent is allocating the files on disk</comment>
-        <translation type="unfinished"/>
+        <translation>Se alocă</translation>
     </message>
     <message>
         <location filename="../transferlistdelegate.h" line="102"/>
@@ -4195,13 +4195,13 @@ Instalați manual.</translation>
         <location filename="../transferlistdelegate.h" line="120"/>
         <source>Queued for checking</source>
         <comment>i.e. torrent is queued for hash checking</comment>
-        <translation type="unfinished"/>
+        <translation>În coadă pentru verificare</translation>
     </message>
     <message>
         <location filename="../transferlistdelegate.h" line="123"/>
         <source>Checking resume data</source>
         <comment>used when loading the torrents from disk after qbt is launched. It checks the correctness of the .fastresume file. Normally it is completed in a fraction of a second, unless loading many many torrents.</comment>
-        <translation type="unfinished"/>
+        <translation>Verific reluarea datelor</translation>
     </message>
     <message>
         <location filename="../transferlistdelegate.h" line="137"/>

src/lang/qbittorrent_sk.ts

@@ -1364,7 +1364,7 @@ Už vás nebudeme ďalej upozorňovať.</translation>
         <location filename="../mainwindow.cpp" line="151"/>
         <location filename="../mainwindow.cpp" line="418"/>
         <source>Clear the password</source>
-        <translation type="unfinished"/>
+        <translation>Vyčistiť heslo?</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="186"/>
@@ -1415,7 +1415,7 @@ Chcete asociovať qBittorrent so súbormi torrent a odkazmi Magnet?</translation
     <message>
         <location filename="../mainwindow.cpp" line="418"/>
         <source>Are you sure you want to clear the password?</source>
-        <translation type="unfinished"/>
+        <translation>Ste si istý, že chcete vyčistiť heslo?</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="445"/>

src/lang/qbittorrent_uk.ts

@@ -354,7 +354,7 @@
         <location filename="../preferences/advancedsettings.h" line="190"/>
         <source> s</source>
         <comment> seconds</comment>
-        <translation type="unfinished"/>
+        <translation>с</translation>
     </message>
     <message>
         <location filename="../preferences/advancedsettings.h" line="191"/>

src/lang/qbittorrent_vi.ts

@@ -1363,7 +1363,7 @@ Không có phần ghi chú nào về tính pháp lý về vấn đề nội dung
         <location filename="../mainwindow.cpp" line="151"/>
         <location filename="../mainwindow.cpp" line="418"/>
         <source>Clear the password</source>
-        <translation type="unfinished"/>
+        <translation>Xóa phần mật khẩu</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="186"/>
@@ -1414,7 +1414,7 @@ Bạn có muốn qBittorrent đảm nhiệm mặc định cho thao tác mở cá
     <message>
         <location filename="../mainwindow.cpp" line="418"/>
         <source>Are you sure you want to clear the password?</source>
-        <translation type="unfinished"/>
+        <translation>Bạn có chắc bạn muốn xóa đi phần mật khẩu?</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="445"/>

src/mac/Info.plist

@@ -45,7 +45,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.1</string>
+	<string>3.1.2</string>
 	<key>CFBundleSignature</key>
 	<string>qBit</string>
 	<key>CFBundleExecutable</key>

src/webui/httpresponsegenerator.cpp

@@ -35,7 +35,6 @@
 void HttpResponseGenerator::setMessage(const QByteArray& message)
 {
   m_message = message;
-  setContentLength(message.size());
 }
 
 void HttpResponseGenerator::setMessage(const QString& message)
@@ -113,7 +112,7 @@ bool HttpResponseGenerator::gCompress(QByteArray &dest_buffer) {
 
   if (deflate_res != Z_STREAM_END)
     return false;
-  dest_buffer.append(tmp_buf, BUFSIZE);
+  dest_buffer.append(tmp_buf, BUFSIZE - strm.avail_out);
   deflateEnd(&strm);
 
   return true;
@@ -123,10 +122,15 @@ QByteArray HttpResponseGenerator::toByteArray() {
   if (m_gzip) {
     QByteArray dest_buf;
     if (gCompress(dest_buf)) {
-      setValue("Content-Encoding", "gzip");
+      setValue("content-encoding", "gzip");
+#if QT_VERSION < 0x040800
+      m_message = dest_buf;
+#else
       m_message.swap(dest_buf);
+#endif
     }
   }
 
+  setContentLength(m_message.size());
   return QHttpResponseHeader::toString().toUtf8() + m_message;
 }

src/windows/options.nsi

@@ -18,7 +18,7 @@ XPStyle on
 !define CSIDL_APPDATA '0x1A' ;Application Data path
 !define CSIDL_LOCALAPPDATA '0x1C' ;Local Application Data path
 
-!define PROG_VERSION "3.1.1"
+!define PROG_VERSION "3.1.2"
 !define MUI_FINISHPAGE_RUN "$INSTDIR\qbittorrent.exe"
 !define MUI_FINISHPAGE_RUN_TEXT $(launch_qbt)
 

version.pri

@@ -1,5 +1,5 @@
 PROJECT_NAME = qbittorrent
-PROJECT_VERSION = 3.1.1
+PROJECT_VERSION = 3.1.2
 
 os2 {
     DEFINES += VERSION=\'\"v$${PROJECT_VERSION}\"\'
@@ -9,4 +9,4 @@ os2 {
 
 DEFINES += VERSION_MAJOR=3
 DEFINES += VERSION_MINOR=1
-DEFINES += VERSION_BUGFIX=1
+DEFINES += VERSION_BUGFIX=2