Bump to 3.1.11

Conflicts:
	src/torrentcreator/torrentcreatorthread.cpp

.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[qbittorrent.qbittorrent_ents]
+[qbittorrent.qbittorrent_v3_1_x]
 file_filter = src/lang/qbittorrent_<lang>.ts
 source_file = src/lang/qbittorrent_en.ts
 source_lang = en
@@ -10,7 +10,7 @@ minimum_perc = 23
 mode = developer
 
 
-[qbittorrent.qbittorrentdesktop]
+[qbittorrent.qbittorrentdesktop_master]
 source_file = src/Icons/qBittorrent.desktop
 source_lang = en
 type = DESKTOP

AUTHORS

@@ -81,7 +81,7 @@ Translations authors:
 * files: src/lang/*.ts
 * file: src/Icons/qBittorrent.desktop
   copyright:
-  - Arabic: SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)
+  - Arabic: SDERAWI (abz8868@msn.com), sn51234 (nesseyan@gmail.com) and  Ibrahim Saed ibraheem_alex(Transifex)
   - Armenian: Hrant Ohanyan (hrantohanyan@mail.am)
   - Basque: Xabier Aramendi (azpidatziak@gmail.com)
   - Belarusian: Mihas Varantsou (meequz@gmail.com)
@@ -90,11 +90,13 @@ Translations authors:
   - Chinese (Simplified): Guo Yue (yue.guo0418@gmail.com)
   - Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com) and 冥王歐西里斯 s8321414(Transifex)
   - Croatian: Oliver Mucafir (oliver.untwist@gmail.com)
-  - Czech: Jirka Vilim (web@tets.cz)
+  - Czech: Jirka Vilim (web@tets.cz) and Petr Cernobila abr(Transifex)
   - Danish: Mathias Nielsen (comoneo@gmail.com)
   - Dutch: Pieter Heyvaert (pieter_heyvaert@hotmail.com)
   - English: Christophe Dumez (chris@qbittorrent.org)
-  - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net)
+  - English(Australia): Robert Readman readmanr(Transifex)
+  - English(United Kingdom): Robert Readman readmanr(Transifex)
+  - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net), Pekka Niemi (pekka.niemi@iki.fi) and Jiri Grönroos artnay(Transifex)
   - French: Christophe Dumez (chris@qbittorrent.org)
   - Galician: Marcos Lans (marcoslansgarza@gmail.com) and antiparvos(Transifex)
   - Georgian: Beqa Arabuli (arabulibeqa@yahoo.com)
@@ -110,12 +112,12 @@ Translations authors:
   - Polish: Mariusz Fik (fisiu@opensuse.org)
   - Portuguese: Sérgio Marques smarquespt(Transifex)
   - Portuguese(Brazil): Nick Marinho (nickmarinho@gmail.com)
-  - Romanian: Obada Denis (obadadenis@users.sourceforge.net)
+  - Romanian: Obada Denis (obadadenis@users.sourceforge.net), Adrian Gabor Adriannho(Transifex) and Mihai Coman z0id(Transifex)
   - Russian: Nick Khazov (m2k3d0n at users.sourceforge.net), Alexey Morsov (samurai@ricom.ru), Nick Tiskov Dayman(daymansmail (at) gmail (dot) com), Dmitry DmitryKX(Transifex) and kraleksandr kraleksandr(Transifex)
   - Serbian: Anaximandar Milet (anaximandar at operamail.com)
   - Slovak:  helix84
   - Spanish: Francisco Luque Contreras (frannoe@ya.com), Alfredo Monclus alfrix(Transifex) and José Antonio Moray moray33(Transifex)
-  - Swedish: Daniel Nylander (po@danielnylander.se)
+  - Swedish: Daniel Nylander (po@danielnylander.se) and Emil Hammarberg Ooglogput(Transifex)
   - Turkish: Hasan Yilmaz (iletisim@hedefturkce.com)
   - Ukrainian: Oleh Prypin (blaxpirit@gmail.com) and zubr139(Transifex)
   - Vietnamese: Anh Phan ppanhh(Transifex)

Changelog

@@ -1,3 +1,200 @@
+* Wed Oct 22 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.11
+    - FEATURE: Allow relative torrent paths when qBittorrent is already running (pmzqla)
+    - FEATURE: Make Windows icons suitable for high dpi screens (pmzqla)
+    - FEATURE: Increase maximum size of system icons (pmzqla)
+    - BUGFIX: Fix crash in the "Content" widget when user would right click in it without a torrent selected (Ivan Sorokin)
+    - BUGFIX: Don't show multiple unlock UI dialogs. Closes #2040. (sledgehammer999)
+    - SEARCH: Fix bug where python would falsely be detected and nothing worked (paolo-sz)
+    - SEARCH: Fix TorrentReactor search plugin (Bruno Barbieri)
+    - SEARCH: Fix search engine encoding issues with python3 on Windows (Bruno Barbieri)
+    - SEARCH: Pirate bay search engine update (DoumanAsh)
+    - SEARCH: Internal improvements in the python code (Bruno Barbieri)
+    - WINDOWS: Fix magnet link association. Closes #1952. (sledgehammer999)
+    - WINDOWS and OSX: Fix again the program updater. The url was changed by sourceforge.net. Closes #1954. (sledgehammer999)
+    - OSX: Fix compilation (sledgehammer999)
+    - WEBUI: Set correct HTTP Content-Type in case of forbidden access. (pmzqla)
+    - COSMETIC: Remove unneeded tooltip (pmzqla)
+    - COSMETIC: Don't stretch the last section in the transfer list (pmzqla)
+    - COSMETIC: Set minimum width of the left panel in the preferences (pmzqla)
+    - OTHER: Optimize sorting of rows. This should have less CPU impact when many torrents are present. (Ivan Sorokin)
+    - OTHER: Use the correct character encoding for exceptions coming from libtorrent. (sledgehammer999)
+    - OTHER: Use boost:bind() as the docs show. Allows compilation with older gcc versions. (sledgehammer999)
+
+* Sun Sep 21 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.10
+    - FEATURE: Allow disabling of OS cache. This will prevent RAM increases on Windows when seeding many files. Closes #1699. (sledgehammer999)
+    - FEATURE: Add 'Completed' column. Closes #1241. (sledgehammer999)
+    - FEATURE: Added 'Ratio Limit' column. Closes #936. (sledgehammer999)
+    - FEATURE: Add 'Open' and 'Open Containing Folder' entries in the content's right-click menu. Closes #1143. (sledgehammer999)
+    - FEATURE: Don't listen on IPv6 address by default. Prevents network connectivity problems. Closes #1880. (sledgehammer999)
+    - FEATURE: Added 'Shutdown now' button in shutdown confirmation dialog. Closes #969. (sledgehammer999)
+    - FEATURE: Add peer port column to PeerListWidget. Closes #1650. (Ivanov Juriy)
+    - COSMETIC: Fix weird ratio values when torrent was imported or downloaded history was lost due to crash. (sledgehammer999)
+    - COSMETIC: Use 'μTP' instead of 'uTP'. (sledgehammer999)
+    - COSMETIC: Show the loaded torrents in the transferlist when qBT is launched with a torrent/magnet and the AddNewTorrentDialog is showing. Closes #1564. (sledgehammer999)
+    - COSMETIC: Don't mix finished/unifinished torrents when sorting by ETA. Closes #1688. (sledgehammer999)
+    - COSMETIC: Sort finished torrents by completed date when sorting by queue number. (sledgehammer999)
+    - COSMETIC: Right align numerical values in the transfer list. Partially revert 51a9a9aab. Closes #1903. (sledgehammer999)
+    - COSMETIC: Don't display the Search Engine tab by default. (sledgehammer999)
+    - WINDOWS: Correctly associate torrents and magnet links with qBittorrent under non-admin accounts. Closes #291 #527 #579 #614 #964. (glassez, sledgehammer999)
+    - WINDOWS: Check for python before creating the search engine tab. Prevents the creation of python specific files in the user's PC if no python is found. Closes #1370. (sledgehammer999)
+    - WINDOWS: Don't create keys in the registry if python isn't found. Closes #1370. (sledgehammer999)
+    - WINDOWS: Can now correctly detect 64bit and 32bit python installations on 64bit Windows. Closes #1148 #445 #795 #1708. (sledgehammer999)
+    - WINDOWS: Search first in PATH for python. Closes #956. (sledgehammer999)
+    - OSX: Enable system tray in MACOSX (Nick Korotysh).
+    - OSX: Fix headless (nox) build. (sledgehammer999)
+    - WEBUI: Correctly save/load settings and other improvements (glassez)
+    - WEBUI: Removed broken 'Report a bug' iframe. Closes #1343 (Benjamin Hutchins)
+    - WEBUI: Removed broken 'Documentation'. Improves fix for #1343 (Benjamin Hutchins)
+    - WEBUI: Removed essentially useless 'Visit website' iframe and changed it to a regular link. Improves fix for #1343 (Benjamin Hutchins)
+    - BUGFIX: Fix RSS feed icon. The tmp file gets deleted in the feed destructor. Closes #1639 (sledgehammer999)
+    - BUGFIX: fix issue #1674: AddNewTorrentDialog is shown again and again even if checkbox "dont ask me again" is set (Ivan Sorokin)
+    - BUGFIX: Don't show availability bar for magnet links (Ivan Sorokin)
+    - BUGFIX: Fix crash when the selected torrent disappears from the transfer list. Closes #1661 (sledgehammer999)
+    - BUGFIX: Fix tracker announcing problem(hit-and-run) when many torrents are being active. Closes #1571 (sledgehammer999)
+    - BUGFIX: Count magnet links in the 'downloading' filter and make them prevent system inhibition. Closes #1558 (sledgehammer999)
+    - BUGFIX: Pick up updated plugins. Closes #1745. (sledgehammer999)
+    - BUGFIX: Bring mainwindow in front when notification is clicked and other windows are in front. (sledgehammer999)
+    - BUGFIX: Speedup torrent moving (Ivan Sorokin)
+    - BUGFIX: Fix bug when moving a torrent before the previous move is completed (Ivan Sorokin)
+    - BUGFIX: Add option to hibernate computer in Auto-Shutdown menu (Bruno Barbieri)
+    - BUGFIX: Fix column resizing issues (Bryan Roscoe)
+    - BUGFIX: Fix possible crashes. Closes #1814. (sledgehammer999)
+    - BUGFIX: Limit max cache to 1800MiB for 32bits compiled binaries and to 4GiB for other. Closes #1698. (sledgehammer999)
+    - BUGFIX: Don't localize double numbers in the webui. Closes #1525. (sledgehammer999)
+    - BUGFIX: Don't shrink transferlist rows when scrolling horizontally. Closes #1613. (sledgehammer999)
+    - BUGFIX: When qBT is launched with a magnet don't show it in the transferlist while the metadata are being loaded in the background. (sledgehammer999)
+    - BUGFIX: Show disk space while retrieving metadata. Closes #1693. (sledgehammer999)
+    - BUGFIX: Don't disable DHT/LSD/UPnP in the GUI when anonymous mode is enabled. (sledgehammer999)
+    - BUGFIX: Possible fix for crash in RSS code. Closes #1901. (sledgehammer999)
+    - BUGFIX: Fixed SMTP emailing code (Ivanov Juriy, sledgehammer999)
+    - BUGFIX: Don't display the context menu in 'Content' and 'HTTP Sources' buttons when no torrent is selected. It prevents crashes. Closes #1906, #1900. (sledgehammer999)
+    - BUGFIX: Don't translate file extensions. Closes #1907. (sledgehammer999)
+    - BUGFIX: Fix available disk space label on single file torrents. (sledgehammer999)
+    - BUGFIX: Show stalled downloads that are uploading under the 'Active' filter. Closes #1654." (sledgehammer999)
+    - BUGFIX: fix import torrent with "Keep incomplete torrents in:" enabled (lojack5)
+    - BUGFIX: Send a spoofed user agent for the search engines(fixes some of them) (Martin Janco)
+    - BUGFIX: Support URLs that redirect to magnet links (Gelmir)
+    - BUGFIX: Consider queued items before deciding to 'auto-shutdown on downloads completion'. Closes #1942. (sledgehammer999)
+
+* Tue Apr 29 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.9.2
+    - OTHER: The v3.1.9.1 Windows build was broken
+
+* Mon Apr 28 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.9.1
+    - OTHER: This is an excuse to produce new builds with an OpenSSL version that isn't affected by the heartbleed bug for Windows and Mac. This bug should only affect the WebUI and only if HTTPS/SSL authentication was enabled.
+
+* Sat Mar 01 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.9
+    - BUGFIX: Fix nox build. Closes #1368 (bob23450)
+    - BUGFIX: Fix build with libtorrent 0.15.x (sledgehammer999)
+    - BUGFIX: Fix missing percentage signs. Closes #1392. (sledgehammer999)
+    - BUGFIX: Fix queue sorting order. (alfrix)
+    - BUGFIX: Fix build using qt < 4.7 Closes #1385. (Evgeny Lensky)
+    - BUGFIX: Fix autoupdater. Send our user-agent to sourceforge.net (sledgehammer999)
+    - FEATURE: Add button for links in toolbar (alfrix)
+
+* Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.8
+    - BUGFIX: Really fix build of v3.1.6
+
+* Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.7
+    - BUGFIX: Fix build of v3.1.6
+
+* Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.6
+    - BUGFIX: Fix 'preview file' regression. Closes #1285. (sledgehammer999)
+    - BUGFIX: Fix peers and seeds sorting in transfer list. (Angel Alonso)
+    - BUGFIX: Fix btdigg search engine. (BTDigg research team)
+    - BUGFIX: Save statistics every 15min and only if there was new traffic. Fixes #1288 and partially #1272. (sledgehammer999)
+    - BUGFIX: Fix share ratio text in the 'general' tab. (sledgehammer999)
+    - BUGFIX: Output a more generic message when blocking IPs and don't use italics in the log. (sledgehammer999)
+    - BUGFIX: Allow 2 decimals when setting the share ratio. Closes #1303. (sledgehammer999)
+    - BUGFIX: Fix extratorrents search plugin. (sledgehammer999)
+    - BUGFIX: Use shorter names for amount columns in main UI (Gelmir)
+    - BUGFIX: Fix overstretched options dialog. Closes #1293. (sledgehammer999)
+    - BUGFIX: Don't show a popup menu when no torrent is selected. (sledgehammer999)
+    - BUGFIX: Launch external programs async and don't block. Closes #1252. (sledgehammer999)
+    - BUGFIX: Don't re-announce to trackers when torrent is paused. Closes #1310. (sledgehammer999)
+    - BUGFIX: Bring dialog boxes in the front when qbt doesn't have focus. (sledgehammer999)
+    - BUGFIX: Correctly resize 'name' column of the content tab. Closes #1360. (sledgehammer999)
+    - BUGFIX: Correctly restore 'name' column width when loading magnet links in the 'Add new torrent dialog'. Closes #1334. (sledgehammer999)
+    - WEBUI: Fix sorting by size in WebUI when non-default locale used. (Vladimir Golovnev)
+    - UI: Reposition statistics menu item. (sledgehammer999)
+    - UI: Convert more accurately decimal numbers to text. (sledgehammer999)
+    - WINDOWS/OSX: Improvements on the behavior of the program updater(closes #1282) (sledgehammer999)
+    - LINUX: Explicitle tell that we don't support freedesktop's startup notify standard. Fixes GNOME issues. Closes #1217. (sledgehammer999)
+    - LINUX: Add our WM_CLASS in the .desktop file so window managers know how to group our windows. (sledgehammer999)
+    - OTHER: Sync translations from Transifex.
+
+* Thu 16 Jan 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.5
+    - BUGFIX: Fix compilation with Qt 4.7. Closes #1215. (sledgehammer999)
+    - BUGFIX: Third attempt at fixing saving settings on OS shutdown. (sledgehammer999)
+    - BUGFIX: Preview now correctly uses the selected file. Closes #1222 #1182. (sledgehammer999)
+    - BUGFIX: Allow to resize the columns in Add New Torrent dialog. Closes #1207 #676 (sledgehammer999)
+    - BUGFIX: Ensure that at least one column in the tranferlist is always visible. Closes #1165. (sledgehammer999)
+    - BUGFIX: Ensure that the options window will always be placed onscreen. Closes #1226. (sledgehammer999)
+    - BUGFIX: Delete temporary files after they aren't needed. Closes #1188. (sledgehammer999)
+    - BUGFIX: Correctly detect libtorrent version. (sledgehammer999)
+    - BUGFIX: Various code cppcheck fixes (Konstantin Goncharik)
+    - BUGFIX: Remove isohunt search engine and update thepiratebay url (sledgehammer999)
+    - BUGFIX: Fix rss settings corruption when checking regexp and going to other rule. (Gelmir)
+    - BUGFIX: Don't count paused torrents for the autoshutdown. Closes #1280. (sledgehammer999)
+    - LINUX: Fix notifications with xfce4-notifyd.
+    - OSX: Added basic retina support. Closes #1251. (Sébastien Lavoie)
+    - OTHER: Sync translations from Transifex.
+
+* Sun 29 Dec 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.4
+    - FEATURE: Statistics dialog (Gelmir)
+    - FEATURE: Tooltips explaining each peer's connection flags (sledgehammer999)
+    - FEATURE: Win/Mac Check for program updates every 15min and allow the user to manually check for updates through the help menu. (sledgehammer999)
+    - BUGFIX: Better dialog message for torrent delete confirmation (sledgehammer999)
+    - BUGFIX: Fix resizing grip location. Closes #1146. (sledgehammer999)
+    - BUGFIX: Lock toolbar in place. Closes #1144. (sledgehammer999)
+    - BUGFIX: Second attempt at fixing saving settings on shutdown. (sledgehammer999)
+    - BUGFIX: Sort labels in 'Add new torrent' dialog. Closes #1150 #411. (sledgehammer999)
+    - LINUX: Fix build under Ubuntu 13.10 (sledgehammer999)
+    - LINUX: Make sleep and shutdown functions work on systemd's logind (Faheem Pervez)
+
+* Mon Nov 20 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.3
+    - FEATURE: Add a key shortcut to "Add link to torrent..." (Angel Alonso)
+    - BUGFIX: Make all columns and headers use the same text alignment in the transferlist. (sledgehammer999)
+    - BUGFIX: Fix build system for Unix/Linux. (sledgehammer999)
+    - BUGFIX: Case insensitive sort in Peers list. Closes #1066. (sledgehammer999)
+    - BUGFIX: Small optimization of WebUI responses when there isn't a data payload. (sledgehammer999)
+    - BUGFIX: Hide empty folders after filtering. Closes #74. (sledgehammer999)
+    - BUGFIX: Expand folders when filtering files. Closes #1076. (sledgehammer999)
+    - BUGFIX: Updated search plugin's URL (Zach Thibeau)
+    - BUGFIX: Strip some png to fix incorrect sRGB profiles. (Angel Alonso)
+    - BUGFIX: Fixed font issues on OSX Mavericks (Zach Thibeau)
+    - BUGFIX: Improve text in the About dialog (Artem S. Tashkinov)
+    - BUGFIX: Always show a peer IP address as a tool tip (Artem S. Tashkinov)
+    - BUGFIX: Fix inhibit system functionality. Closes #766. (sledgehammer999)
+    - BUGFIX: WebUI: Don't gzip too small payloads. (sledgehammer999)
+    - BUGFIX: Correctly detect if the browser supports gzip compression. (sledgehammer999)
+    - BUGFIX: Fix WebUI link to 'Anonymous mode' explanation. Closes #1093. (sledgehammer999)
+    - BUGFIX: Correctly update tracker tier number in the trackers tab. Closes #1075. (sledgehammer999)
+    - BUGFIX: Speed improvements.(sledgehammer999)
+    - OTHER: Updated translations.
+    
+* 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)
+    - FEATURE: Torrents show more states(queued for checking, downloading metadata, allocating, checking resume). (sledgehammer999)
+    - FEATURE: Reenable "force reannounce" to all trackers. (sledgehammer999)
+    - FEATURE: Allow to clear the UI lock password. Closes #973. (sledgehammer999)
+    - FEATURE: New translations: English(Australia) and English(United Kingdom)
+    - BUGFIX: Expose all available translation in the WebUI. Closes #976. (sledgehammer999)
+    - BUGFIX: Copy IP copied wrong data. Closes #970 (sledgehammer999)
+    - BUGFIX: "Preview file..." didn't work on single file torrents. (sledgehammer999)
+    - BUGFIX: Fix and improve the scheduler (Gelmir and sledgehammer999)
+    - BUGFIX: RSS fixes. Closes #960, #998 (Gelmir)
+    - BUGFIX: Fix 'append label to save path' with magnet links. (sledgehammer999)
+    - BUGFIX: Can download up to 10MB .torrent file when a link is provided. Closes #879 (sledgehammer999)
+    - OTHER: Updated translations.
+    - LINUX: Fix missing conf.pri error (leigh123linux)
+    - WINDOWS: Don't remove file associations if they aren't our own. (sledgehammer999)
+
 * Sat Oct 12 2013 - Christophe Dumez <chris@qbittorrent.org> and sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.0
     - FEATURE: Add command line option to daemonize qbittorrent-nox (ngaro)
     - FEATURE: Add "Shutdown qBittorrent" button to Web UI (ngaro)

README.md

@@ -1,10 +1,11 @@
-qBittorrent - A BitTorrent client in Qt4
+qBittorrent - A BitTorrent client in Qt
 ------------------------------------------
 
-Description:
+[![Build Status](https://travis-ci.org/qbittorrent/qBittorrent.png?branch=v3_1_x)](https://travis-ci.org/qbittorrent/qBittorrent)
 ********************************
-qBittorrent is a bittorrent client programmed in C++ / Qt4 that uses
-libtorrent (sometimes called rblibtorrent) by Arvid Norberg.
+###Description:
+qBittorrent is a bittorrent client programmed in C++ / Qt that uses
+libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg.
 
 It aims to be a good alternative to all other bittorrent clients
 out there. qBittorrent is fast, stable and provides unicode
@@ -13,13 +14,14 @@ support as well as many features.
 This product includes GeoLite data created by MaxMind, available from
 http://maxmind.com/
 
-Installation:
-********************************
+### Installation:
 For installation, follow the instructions from INSTALL file, but simple:
 
+```
 ./configure
 make && make install
 qbittorrent
+```
 
 will install and execute qBittorrent hopefully without any problem.
 
@@ -32,9 +34,9 @@ http://wiki.qbittorrent.org
 Please report any bug (or feature request) to:
 http://bugs.qbittorrent.org
 
-You can also meet me (chris-qBT) on IRC:
-#qbittorrent on irc.freenode.net
+You can also meet me (sledgehammer_999) on IRC:
+`#qbittorrent on irc.freenode.net`
 
 ------------------------------------------
-Christophe Dumez <chris@qbittorrent.org>
+sledgehammer999 <sledgehammer999@qbittorrent.org>
 

configure

@@ -511,7 +511,7 @@ public:
     QStringList libDirs;
     if (!s.isEmpty())
       libDirs << s;
-    libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
+    libDirs << "/usr/lib/" << "/usr/lib/i386-linux-gnu/" << "/usr/lib64/" << "/usr/lib/x86_64-linux-gnu/" << "/usr/local/lib/" << "/usr/lib/local/i386-linux-gnu/" << "/usr/local/lib64/" << "/usr/local/lib/x86_64-linux-gnu/";
 
     foreach(const QString& lib, required_libs) {
       bool found = false;

qcm/libboost.qcm

@@ -75,7 +75,7 @@ public:
     QStringList libDirs;
     if (!s.isEmpty())
       libDirs << s;
-    libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
+    libDirs << "/usr/lib/" << "/usr/lib/i386-linux-gnu/" << "/usr/lib64/" << "/usr/lib/x86_64-linux-gnu/" << "/usr/local/lib/" << "/usr/lib/local/i386-linux-gnu/" << "/usr/local/lib64/" << "/usr/local/lib/x86_64-linux-gnu/";
 
     foreach(const QString& lib, required_libs) {
       bool found = false;

src/Icons/qBittorrent.desktop

@@ -8,9 +8,14 @@ MimeType=application/x-bittorrent;x-scheme-handler/magnet;
 Name=qBittorrent
 Terminal=false
 Type=Application
+StartupNotify=false
+StartupWMClass=qbittorrent
 
 
 
+# Translations
+
+
 # Translations
 GenericName[ar]=العميل BitTorrent
 Comment[be]=Сцягванне і раздача файлаў праз пратакол BitTorrent
@@ -18,12 +23,19 @@ GenericName[be]=BitTorrent-кліент
 Name[be]=qBittorrent
 Icon[be]=qbittorrent
 GenericName[bg]=Торент клиент
+Comment[cs]=Stahování a sdílení souborů přes síť BitTorrent
 GenericName[cs]=BitTorrent klient
+Name[cs]=qBittorrent
+Icon[cs]=qbittorrent
 GenericName[de]=BitTorren Client
 Comment[el]=Λήψη και διαμοιρασμός αρχείων μέσω BitTorrent
 GenericName[el]=BitTorrent πελάτης
 Name[el]=qBittorrent
 Icon[el]=qbittorrent
+Comment[en_GB]=Download and share files over BitTorrent
+GenericName[en_GB]=BitTorrent client
+Name[en_GB]=qBittorrent
+Icon[en_GB]=qbittorrent
 Comment[es]=Descarga y comparte archivos por BitTorrent
 GenericName[es]=Cliente BitTorrent
 Name[es]=qBittorrent
@@ -32,7 +44,10 @@ Comment[eu]=Jeitsi eta elkarbanatu agiriak BitTorrent-en
 GenericName[eu]=BitTorrent bezeroa
 Name[eu]=qBittorrent
 Icon[eu]=qbittorrent
+Comment[fi]=Lataa ja jaa tiedostoja BitTorrentia käyttäen
 GenericName[fi]=BitTorrent-ohjelma
+Name[fi]=qBittorrent
+Icon[fi]=qbittorrent
 Comment[fr]=Télécharger et partager des fichiers avec BitTorrent
 GenericName[fr]=Client BitTorrent
 Comment[gl]=Descargue e comparta ficheiros co protocolo BitTorrent
@@ -73,16 +88,25 @@ Comment[pt_BR]=Baixe e compartilhe arquivos através do qBittorrent
 GenericName[pt_BR]=Cliente BitTorrent
 Name[pt_BR]=qBittorrent
 Icon[pt_BR]=qbittorrent
+Comment[ro]=Descărcați  și partajați fișiere prin BitTorrent
 GenericName[ro]=Client BitTorrent
+Name[ro]=qBittorrent
+Icon[ro]=qbittorrent
 Comment[ru]=Скачивайте и делитесь файлами с помощью BitTorrent
 GenericName[ru]=клиент BitTorrent
 Name[ru]=qBittorrent
 Icon[ru]=qbittorrent
 GenericName[sk]=Klient siete BitTorrent
 GenericName[sr]=BitTorrent-клијент
+Comment[sv]=Hämta och dela filer över BitTorrent
 GenericName[sv]=BitTorrent-klient
+Name[sv]=qBittorrent
+Icon[sv]=qbittorrent
 GenericName[tr]=BitTorrent istemcisi
+Comment[uk]=Завантажувати і обмінюватися файлами через BitTorrent
 GenericName[uk]=BitTorrent-клієнт
+Name[uk]=qBittorrent
+Icon[uk]=qbittorrent
 Comment[vi]=Tải về và chia sẻ các tập tin thông qua BitTorrent
 GenericName[vi]=Máy trạm dạng BitTorrent
 Name[vi]=qBittorrent
@@ -91,3 +115,7 @@ Comment[zh_TW]=經由 BitTorrent 下載並分享檔案
 GenericName[zh_TW]=BitTorrent 客戶端
 Name[zh_TW]=qBittorrent
 Icon[zh_TW]=qbittorrent
+Comment[en_AU]=Download and share files over BitTorrent
+GenericName[en_AU]=BitTorrent client
+Name[en_AU]=qBittorrent
+Icon[en_AU]=qbittorrent

src/about_imp.h

@@ -50,7 +50,7 @@ class about : public QDialog, private Ui::AboutDlg{
       setAttribute(Qt::WA_DeleteOnClose);
       // About
       QString aboutText =
-          QString::fromUtf8("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\"><html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body style=\" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;\"><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">") +
+          QString::fromUtf8("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\"><html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body style=\" font-size:11pt; font-weight:400; font-style:normal;\"><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">") +
           tr("An advanced BitTorrent client programmed in C++, based on Qt4 toolkit and libtorrent-rasterbar.") +
           QString::fromUtf8(" <br /><br />") +
           trUtf8("Copyright ©2006-2013 The qBittorrent project") +
@@ -80,7 +80,7 @@ class about : public QDialog, private Ui::AboutDlg{
       te_thanks->setHtml(thanks_txt);
       // Translation
       QString trans_txt = "<p>"+tr("I would like to thank the following people who volunteered to translate qBittorrent:")+"</p>";
-      trans_txt += QString::fromUtf8("<ul><li><u>Arabic:</u> SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)</li>\
+      trans_txt += QString::fromUtf8("<ul><li><u>Arabic:</u> SDERAWI (abz8868@msn.com), sn51234 (nesseyan@gmail.com) and  Ibrahim Saed ibraheem_alex(Transifex)</li>\
           <li><u>Armenian:</u> Hrant Ohanyan (hrantohanyan@mail.am)</li>\
           <li><u>Basque:</u> Xabier Aramendi (azpidatziak@gmail.com)</li>\
           <li><u>Belarusian:</u> Mihas Varantsou (meequz@gmail.com)</li>\
@@ -89,10 +89,12 @@ class about : public QDialog, private Ui::AboutDlg{
           <li><u>Chinese (Simplified):</u> Guo Yue (yue.guo0418@gmail.com)</li>\
           <li><u>Chinese (Traditional):</u> Yi-Shun Wang (dnextstep@gmail.com) and 冥王歐西里斯 s8321414(Transifex)</li>\
           <li><u>Croatian:</u> Oliver Mucafir (oliver.untwist@gmail.com)</li>\
-          <li><u>Czech:</u> Jirka Vilim (web@tets.cz)</li>\
+          <li><u>Czech:</u> Jirka Vilim (web@tets.cz) and Petr Cernobila abr(Transifex)</li>\
           <li><u>Danish:</u> Mathias Nielsen (comoneo@gmail.com)</li>\
           <li><u>Dutch:</u> Pieter Heyvaert (pieter_heyvaert@hotmail.com)</li>\
-          <li><u>Finnish:</u> Niklas Laxström (nikerabbit@users.sourceforge.net) and Pekka Niemi (pekka.niemi@iki.fi)</li>\
+          <li><u>English(Australia):</u> Robert Readman readmanr(Transifex)</li>\
+          <li><u>English(United Kingdom):</u> Robert Readman readmanr(Transifex)</li>\
+          <li><u>Finnish:</u> Niklas Laxström (nikerabbit@users.sourceforge.net), Pekka Niemi (pekka.niemi@iki.fi) and Jiri Grönroos artnay(Transifex)</li>\
           <li><u>Galician:</u> Marcos Lans (marcoslansgarza@gmail.com) and antiparvos(Transifex)</li>\
           <li><u>Georgian:</u> Beqa Arabuli (arabulibeqa@yahoo.com)</li>\
           <li><u>German:</u> Niels Hoffmann (zentralmaschine@users.sourceforge.net)</li>\
@@ -107,12 +109,12 @@ class about : public QDialog, private Ui::AboutDlg{
           <li><u>Polish:</u> Mariusz Fik (fisiu@opensuse.org)</li>\
           <li><u>Portuguese:</u> Sérgio Marques smarquespt(Transifex)</li>\
           <li><u>Portuguese(Brazil):</u> Nick Marinho (nickmarinho@gmail.com)</li>\
-          <li><u>Romanian:</u> Obada Denis (obadadenis@users.sourceforge.net)</li>\
+          <li><u>Romanian:</u> Obada Denis (obadadenis@users.sourceforge.net), Adrian Gabor Adriannho(Transifex) and Mihai Coman z0id(Transifex)</li>\
           <li><u>Russian:</u> Nick Khazov (m2k3d0n at users.sourceforge.net), Alexey Morsov (samurai@ricom.ru), Nick Tiskov Dayman(daymansmail (at) gmail (dot) com), Dmitry DmitryKX(Transifex) and kraleksandr kraleksandr(Transifex)</li>\
           <li><u>Serbian:</u> Anaximandar Milet (anaximandar@operamail.com)</li>\
           <li><u>Slovak:</u>  helix84</li>\
           <li><u>Spanish:</u> Alfredo Monclús (alfrix), Francisco Luque Contreras (frannoe@ya.com) and José Antonio Moray moray33(Transifex)</li>\
-          <li><u>Swedish:</u> Daniel Nylander (po@danielnylander.se)</li>\
+          <li><u>Swedish:</u> Daniel Nylander (po@danielnylander.se) and Emil Hammarberg Ooglogput(Transifex)</li>\
           <li><u>Turkish:</u> Hasan YILMAZ (iletisim@hedefturkce.com) and Erdem Bingöl (erdem84@gmail.com)</li>\
           <li><u>Ukrainian:</u> Oleh Prypin (blaxpirit@gmail.com)</li>\
           <li><u>Vietnamese:</u> Anh Phan ppanhh(Transifex)</li></ul>");

src/addnewtorrentdialog.h

@@ -53,8 +53,8 @@ class AddNewTorrentDialog : public QDialog
 public:
   ~AddNewTorrentDialog();
 
-  static void showTorrent(const QString& torrent_path, const QString& from_url = QString());
-  static void showMagnet(const QString& torrent_link);
+  static void showTorrent(const QString& torrent_path, const QString& from_url, QWidget *parent = 0);
+  static void showMagnet(const QString& torrent_link, QWidget *parent = 0);
 
 protected:
   void showEvent(QShowEvent *event);
@@ -84,6 +84,7 @@ private:
   void loadState();
   void saveState();
   void setMetadataProgressIndicator(bool visibleIndicator, const QString &labelText = QString());
+  void setupTreeview();
 
 private:
   Ui::AddNewTorrentDialog *ui;
@@ -98,6 +99,7 @@ private:
   QStringList m_filesPath;
   bool m_hasRenamedFile;
   QShortcut *editHotkey;
+  QByteArray m_headerState;
 };
 
 #endif // ADDNEWTORRENTDIALOG_H

src/addnewtorrentdialog.ui

@@ -176,9 +176,6 @@
         <property name="sortingEnabled">
          <bool>true</bool>
         </property>
-        <attribute name="headerStretchLastSection">
-         <bool>false</bool>
-        </attribute>
        </widget>
       </item>
      </layout>

src/confirmdeletiondlg.ui

@@ -44,7 +44,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>Are you sure you want to delete the selected torrents from the transfer list?</string>
+        <string notr="true">deletion message goes here</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>

src/deletionconfirmationdlg.h

@@ -40,8 +40,12 @@ class DeletionConfirmationDlg : public QDialog, private Ui::confirmDeletionDlg {
   Q_OBJECT
 
   public:
-  DeletionConfirmationDlg(QWidget *parent=0): QDialog(parent) {
+  DeletionConfirmationDlg(QWidget *parent, const int &size, const QString &name): QDialog(parent) {
     setupUi(this);
+    if (size == 1)
+      label->setText(tr("Are you sure you want to delete \"%1\" from the transfer list?", "Are you sure you want to delete \"ubuntu-linux-iso\" from the transfer list?").arg(name));
+    else
+      label->setText(tr("Are you sure you want to delete these %1 torrents from the transfer list?", "Are you sure you want to delete these 5 torrents from the transfer list?").arg(QString::number(size)));
     // Icons
     lbl_warn->setPixmap(IconProvider::instance()->getIcon("dialog-warning").pixmap(lbl_warn->height()));
     lbl_warn->setFixedWidth(lbl_warn->height());
@@ -57,10 +61,10 @@ class DeletionConfirmationDlg : public QDialog, private Ui::confirmDeletionDlg {
     return checkPermDelete->isChecked();
   }
 
-  static bool askForDeletionConfirmation(bool *delete_local_files) {
-    DeletionConfirmationDlg dlg;
+  static bool askForDeletionConfirmation(bool& delete_local_files, const int& size, const QString& name) {
+    DeletionConfirmationDlg dlg(NULL, size, name);
     if (dlg.exec() == QDialog::Accepted) {
-      *delete_local_files = dlg.shouldDeleteLocalFiles();
+      delete_local_files = dlg.shouldDeleteLocalFiles();
       return true;
     }
     return false;

src/downloadthread.cpp

@@ -122,6 +122,14 @@ void DownloadThread::processDlFinished(QNetworkReply* reply) {
         newUrl = reply->url().resolved(newUrl);
     const QString newUrlString = newUrl.toString();
     qDebug("Redirecting from %s to %s", qPrintable(url), qPrintable(newUrlString));
+    // Redirect to magnet workaround
+    if (newUrlString.startsWith("magnet:", Qt::CaseInsensitive)) {
+      qDebug("Magnet redirect detected.");
+      reply->abort();
+      emit magnetRedirect(newUrlString, url);
+      reply->deleteLater();
+      return;
+    }
     m_redirectMapping.insert(newUrlString, url);
     // redirecting with first cookies
     downloadUrl(newUrlString, m_networkManager.cookieJar()->cookiesForUrl(url));
@@ -134,8 +142,8 @@ void DownloadThread::processDlFinished(QNetworkReply* reply) {
   }
   // Success
   QTemporaryFile *tmpfile = new QTemporaryFile;
-  tmpfile->setAutoRemove(false);
   if (tmpfile->open()) {
+    tmpfile->setAutoRemove(false);
     QString filePath = tmpfile->fileName();
     qDebug("Temporary filename is: %s", qPrintable(filePath));
     if (reply->isOpen() || reply->open(QIODevice::ReadOnly)) {
@@ -153,6 +161,7 @@ void DownloadThread::processDlFinished(QNetworkReply* reply) {
       emit downloadFinished(url, filePath);
     } else {
       delete tmpfile;
+      fsutils::forceRemove(filePath);
       // Error when reading the request
       emit downloadFailure(url, tr("I/O Error"));
     }
@@ -202,16 +211,16 @@ void DownloadThread::checkDownloadSize(qint64 bytesReceived, qint64 bytesTotal)
   if (!reply) return;
   if (bytesTotal > 0) {
     // Total number of bytes is available
-    if (bytesTotal > 1048576) {
-      // More than 1MB, this is probably not a torrent file, aborting...
+    if (bytesTotal > 1048576*10) {
+      // More than 10MB, this is probably not a torrent file, aborting...
       reply->abort();
       reply->deleteLater();
     } else {
       disconnect(reply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(checkDownloadSize(qint64,qint64)));
     }
   } else {
-    if (bytesReceived  > 1048576) {
-      // More than 1MB, this is probably not a torrent file, aborting...
+    if (bytesReceived  > 1048576*10) {
+      // More than 10MB, this is probably not a torrent file, aborting...
       reply->abort();
       reply->deleteLater();
     }

src/downloadthread.h

@@ -54,6 +54,7 @@ public:
 signals:
   void downloadFinished(const QString &url, const QString &file_path);
   void downloadFailure(const QString &url, const QString &reason);
+  void magnetRedirect(const QString &url_new, const QString &url_old);
 
 private slots:
   void processDlFinished(QNetworkReply* reply);

src/headlessloader.h

@@ -41,6 +41,7 @@ class HeadlessLoader: public QObject {
 
 public:
   HeadlessLoader(const QStringList &torrentCmdLine) {
+    connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(shutdownCleanUp()), Qt::DirectConnection);
     Preferences pref;
     // Enable Web UI
     pref.setWebUiEnabled(true);
@@ -61,11 +62,12 @@ public:
     }
   }
 
-  ~HeadlessLoader() {
+public slots:
+  void shutdownCleanUp() {
+    Preferences().sync();
     QBtSession::drop();
   }
 
-public slots:
   // Call this function to exit qBittorrent headless loader
   // and return to prompt (object will be deleted by main)
   void exit() {

src/iconprovider.cpp

@@ -81,7 +81,7 @@ QIcon IconProvider::generateDifferentSizes(const QIcon& icon)
 {
   QIcon new_icon;
   QList<QSize> required_sizes;
-  required_sizes << QSize(16, 16) << QSize(24, 24);
+  required_sizes << QSize(16, 16) << QSize(24, 24) << QSize(32, 32);
   QList<QIcon::Mode> modes;
   modes << QIcon::Normal << QIcon::Active << QIcon::Selected << QIcon::Disabled;
   foreach (const QSize& size, required_sizes) {

src/icons.qrc

@@ -314,6 +314,7 @@
   <file>Icons/oxygen/view-filter.png</file>
   <file>Icons/oxygen/view-preview.png</file>
   <file>Icons/oxygen/view-refresh.png</file>
+  <file>Icons/oxygen/view-statistics.png</file>
   <file>Icons/oxygen/wallet-open.png</file>
   <file>Icons/oxygen/webui.png</file>
   <file>Icons/skin/arrow-right.gif</file>

src/lang.qrc

@@ -9,6 +9,8 @@
   <file>lang/qbittorrent_de.qm</file>
   <file>lang/qbittorrent_el.qm</file>
   <file>lang/qbittorrent_en.qm</file>
+  <file>lang/qbittorrent_en_AU.qm</file>
+  <file>lang/qbittorrent_en_GB.qm</file>
   <file>lang/qbittorrent_es.qm</file>
   <file>lang/qbittorrent_eu.qm</file>
   <file>lang/qbittorrent_fi.qm</file>

src/lang/TRANSLATION_INSTRUCTIONS

@@ -0,0 +1,42 @@
+For future maintainers on how to update translations from Transifex.
+
+Project page: https://www.transifex.com/projects/p/qbittorrent/
+
+Most of the options are setup in the .tx/config file. You will need to have the Transifex client app in your path.
+The examples use the tx app on Windows. Other OSs should be similar.
+
+===Updating the translations===
+1. In the root folder of the project just run "tx pull"
+2. Commit to git
+
+===Pulling new translation files===
+1. In the root folder of the project just run "tx pull -a"
+2. Commit to git each translation file separately with its own message.
+3. After you commit all new files expose them in app. Edit:
+  a. lang.qrc
+  b. options_imp.cpp: options_imp::languageToLocalizedString()
+  c. src.pro: The TRANSLATIONS var
+  d. preferences_content.html: search for: <select id="locale_select">
+
+Note: This will also pull updated translations if you haven't already 'tx pull'.
+
+===Updating the qBittorrent.desktop file===
+1. In the root folder of the project just run "tx pull -s -r qbittorrent.qbittorrentdesktop_master"
+2. Commit to git
+
+It will pull the source file (en). However, in this case .desktop files contain all other translations
+when you pull the source file.
+
+===When making new branch===
+1. Switch to new branch
+2. Edit the .tx.config file. You should change the resource for the qbt translations from 'qbittorrent.qbittorrent_master'
+   to eg 'qbittorrent.qbittorrent_v3_1_x'. It follows this spec: <project>.<resource_slug>_<branchname>'
+3. Commit to git
+4. Use this command to create the new resource on the server and push the translations files "tx push -s -t"
+
+===Updating the source file==
+When you run lupdate Transifex needs to know that the source is updated. When creating a new resource on transifex
+you should go to the website, select the resource and hit "edit resource". From there you should update the
+"Source file URL". It should point to the exact file in the github repository(eg src/lang/qbittorrent_en.ts). Be sure to copy
+the 'raw' link presented by github and not the regular one. This will make Transifex fetch automatically the source file
+from the repo(maybe once a day). If you want to instantly update the resouce then on the correct branch run "tx push -s"