Tagged v2.6.1 release

.gitignore

@@ -1,14 +0,0 @@
-src/geoip/GeoIP.dat
-src/qbittorrent
-qbittorrent.pro.user
-conf.pri
-Makefile
-*.pyc
-*.log
-# Compiled object files
-*.o
-# Generated MOC, resource and UI files
-moc_*.cpp
-qrc_*.cpp
-ui_*.h
-*.moc

AUTHORS

@@ -1,11 +1,7 @@
-Current maintainer:
-* Sledgehammer999 <sledgehammer999@qbittorrent.org>
-
-Original author:
+Author:
 * Christophe Dumez <chris@qbittorrent.org>
 
 Contributors:
-* Vladimir Golovnev <glassez@yandex.ru>
 * Stefanos Antaris <santaris@csd.auth.gr>
 * Mohammad Dib <mdib@qbittorrent.org>
 * Mirco Chinelli <infinity89@fastwebmail.it>
@@ -14,7 +10,6 @@ Contributors:
 * Grigis Gaëtan <cipher16@gmail.com>
 * Christian Kandeler <zambesi@users.sourceforge.net>
 * Silvan Scherrer <silvan.scherrer@aroa.ch>
-* Nick Tiskov <daymansmail@gmail.com>
 
 Code from other projects:
 * files src/qtsingleapp/* src/lineedit/*
@@ -29,10 +24,6 @@ Code from other projects:
   copyright: Dan Haim <negativeiq@users.sourceforge.net>
   license: BSD
 
-* file src/stacktrace_win.h
-  copyright: Quassel Project
-  license: GPLv2/3
-
 Images Authors:
 * files: src/Icons/*.png
   copyright: Gnome Icon Theme
@@ -58,10 +49,6 @@ Images Authors:
   copyright: Greg Houston <gregory.houston@gmail.com>
   license: MIT
 
-* file: src/Icons/skin/qbittorrent_mono*
-  copyright: Daniel Eguren <deguren@gmail.com>
-  license: LGPL
-
 * file: src/search_engine/engines/btjunkie.png
   copyright: Downloaded from btjunkie.org
 
@@ -81,9 +68,6 @@ Translations authors:
 * files: src/lang/*.ts
   copyright:
   - Arabic: SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)
-  - Armenian: Hrant Ohanyan (hrantohanyan@mail.am)
-  - Basque: Xabier Aramendi (azpidatziak@gmail.com)
-  - Belarusian: Mihas Varantsou (meequz@gmail.com)
   - Brazilian: Nick Marinho (nickmarinho@gmail.com)
   - Bulgarian: Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)
   - Catalan: Francisco Luque Contreras (frannoe@ya.com)
@@ -97,16 +81,13 @@ Translations authors:
   - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net)
   - French: Christophe Dumez (chris@qbittorrent.org)
   - Galician: Marcos Lans (marcoslansgarza@gmail.com)
-  - Georgian: Beqa Arabuli (arabulibeqa@yahoo.com)
   - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net)
   - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net) and Stephanos Antaris (santaris@csd.auth.gr)
-  - Hebrew: David Deutsch (d.deffo@gmail.com)
   - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
-  - Italian: bovirus (bovirus@live.it) and Matteo Sechi (bu17714@gmail.com)
-  - Japanese: Masato Hashimoto (cabezon.hashimoto@gmail.com)
+  - Italian: Matteo Sechi (bu17714@gmail.com)
+  - Japanese: Nardog (alphisation@gmail.com)
   - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)
-  - Lithuanian: Naglis Jonaitis (njonaitis@gmail.com)
-  - Norwegian: Tomaso
+  - Norwegian: Lars-Erik Labori (hamil@users.sourceforge.net)
   - Polish: Mariusz Fik (fisiu@opensuse.org)
   - Portuguese: Nick Marinho (nickmarinho@gmail.com)
   - Romanian: Obada Denis (obadadenis@users.sourceforge.net)
@@ -116,5 +97,5 @@ Translations authors:
   - Spanish: Francisco Luque Contreras (frannoe@ya.com)
   - Swedish: Daniel Nylander (po@danielnylander.se)
   - Turkish: Hasan Yilmaz (iletisim@hedefturkce.com)
-  - Ukrainian: Oleh Prypin (blaxpirit@gmail.com)
+  - Ukrainian: Andrey Shpachenko (masterfix@users.sourceforge.net) and Oleh Prypin (blaxpirit@gmail.com)
   license: GPLv2

Changelog

@@ -1,162 +1,9 @@
-* Tue Jul 9 2013 - Christophe Dumez <chris@qbittorrent.org> and sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.0.10
-    - BUGFIX: Fix LegitTorrents search plugin
-    - BUGFIX: Improve peer host name resolution (closes #360)
-    - BUGFIX: Context menu fix in the Web UI
-    - BUGFIX: Respect 'don't show' torrent dialog in Search (sledgehammer999)
-    - BUGFIX: Torrent creator can now use files/folders from disk root (Gelmir)
-    - BUGFIX: Update free disk space when changing drives in the add new torrent dialog (sledgehammer999)
-    - BUGFIX: Various fixes relating to RSS drag and drop (Gelmir)
-    - BUGFIX: Properly rename torrent which changes position in filter model (Gelmir)
-    - BUGFIX: Actually show tray notifications when a torrent finishes downloading (sledgehammer999)
-    - BUGFIX: Don't download RSS items based on rules still being edited (Gelmir)
-    - COSMETIC: Native look for the search boxes (Hyperz)
-    - IMPROVEMENT: Use natural sorting where possible (Gelmir and sledgehammer999)
-    - LINUX: Drop Boost.Thread dependency from configure script
-    - OTHER: Update translations.
-    - OTHER: Drop obsolete Boost.Thread dependency from configure script on linux (Dumez)
-    - LIBTORRENT: SOCKS5 fixes (0.16.10)
-    - LIBTORRENT: Fix hanging issue on Windows when closing files (0.16.10)
-    - LIBTORRENT: Cache can now be returned to the OS (0.16.10)
-    - PERFORMANCE: Impove drawing speed of tranferlist when there are many torrents(>100) (sledgehammer999)
-    - PERFORMANCE: Impove drawing speed of peers list when there are many peers (sledgehammer999)
-    
-* Sat Mar 16 2013 - Christophe Dumez <chris@qbittorrent.org> - v3.0.9
-    - BUGFIX: Raise qBittorrent windows when another instance is launched
-    - BUGFIX: Show human readable names for network interfaces in preferences (Windows)
-    - BUGFIX: Fix torrent creator bug when saving non-latin path (Windows)
-    - BUGFIX: Enable 'copy magnet uri' for torrents without metadata too
-    - BUGFIX: Fix a few JSON parser issues (Gelmir)
-    - BUGFIX: Add support for gzipped encoded HTTP responses (daimor)
-    - BUGFIX: Fix possibly missing "Add torrent" icon (Driim)
-    - OTHER: Add search plugin for Legit Torrents
-
-* Sun Jan 20 2013 - Christophe Dumez <chris@qbittorrent.org> - v3.0.8
-    - BUGFIX: Fix support for --no-splash command line argument
-    - BUGFIX: Fix compilation error with libtorrent v0.15
-    - BUGFIX: Fix search issues with Python3
-    - BUGFIX: Fix dead link about certificates in program preferences
-
-* Sat Jan 19 2013 - Christophe Dumez <chris@qbittorrent.org> - v3.0.7
-    - BUGFIX: Update max write cache size to 2048MB and set it to automatic by default (closes #148)
-    - BUGFIX: Add m4v to the list of previewable file extensions (closes #216)
-    - BUGFIX: Fix "Couldn't set environment variable..." message on start up (closes #245)
-    - BUGFIX: Use right path separator in torrent addition dialog on Windows
-    - BUGFIX: Fix "Set as default save path" setting (closes #254)
-    - BUGFIX: Reenable disk cache on Windows since the memory issue seems to be gone
-    - BUGFIX: Fixed several search engine plugins and removed the dead ones
-    - BUGFIX: Use https links in search plugins when possible
-    - BUGFIX: Bump Mootools to v1.4.5 (Web UI)
-    - BUGFIX: Require password to exit qBittorrent from tray icon when locked (closes #311)
-    - BUGFIX: Fix possible crash in loadPeers() (closes #222)
-
-* Sun Oct 7 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.6
-    - BUGFIX: Fix unicode support for command-line arguments on Windows (closes #139)
-    - BUGFIX: Do not store created torrent in memory before writing it to a file (closes #133)
-    - BUGFIX: No longer fallback to ANY interface if the user-selected interface cannot be found (closes #143)
-    - BUGFIX: Fix timezone parsing in RSS (closes #136)
-    - BUGFIX: Fix cookie support for RSS feeds (closes #119)
-
-* Sun Sep 30 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.5
-    - BUGFIX: Disabling systray icon no longer disables file association settings (closes #114)
-    - BUGFIX: Import new trackers from magnet link in case of duplicate torrent (closes #111)
-    - BUGFIX: Fix "Skip hash check" feature in torrent import dialog (closes #128)
-    - BUGFIX: Several Web UI connection fixes
-    - BUGFIX: Add Basque locale to Web UI
-
-* Tue Sep 18 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.4
-    - BUGFIX: Fix issue with downloads starting from scratch on startup if temporary
-      directory setting is enabled.
-
-* Sun Sep 16 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.3
-    - BUGFIX: Fix issue with temporary directory not being taken into consideration (closes #94)
-    - BUGFIX: Address encoding issues when using search engine on Windows (closes #29)
-    - BUGFIX: Bypass cache when uploading a torrent file in Web UI (closes #68)
-    - BUGFIX: "Completed On" column is not updated until restart (closes #84)
-    - BUGFIX: Fix possible build error on some systems
-    - I18N: Add hebrew translation
-
-* Sat Sep 1 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.2
-    - FEATURE: Add "clear" functionality to search field (closes #59)
-    - BUGFIX: Attempt to use qBittorrent icon from theme if available (closes #49)
-    - BUGFIX: Fix crash when a fastresume file is empty (closes #52)
-    - BUGFIX: Fix encoding problem for detected XDG Download folder (closes #53)
-    - BUGFIX: Improve performance when showing torrent content panel (Improves #24)
-    - BUGFIX: Fix label-based filtering of torrents whose label contains special characters
-    - BUGFIX: Fix possible crash due to labels (closes #64)
-
-* Tue Aug 21 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.1
-    - BUGFIX: Fix possible crash when adding a tracker to a magnet torrent without metadata (Closes #1034254)
-    - BUGFIX: Remember queue position for torrents without metadata (closes #17)
-    - BUGFIX: Fix crash when using unauthorized characters in label names (closes #19)
-    - BUGFIX: Fix search plugins updating (closes #25)
-    - BUGFIX: Make uTP connections rate limited by default
-
-* Thu Aug 09 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.0
-    - FEATURE: Brand new torrent addition dialog
-    - FEATURE: Add the ability to choose the save path when using magnet links (mutoso)
-    - FEATURE: Add support for adding multiple local torrents at once (Web UI)
-    - COSMETIC: Improve style of left panel
-    - BUGFIX: Lower panels no longer gets disabled
-    - BUGFIX: Major code refactoring and various optimizations.
-    - BUGFIX: No longer strip root folder from torrent files
-    - OTHER: Drop support for libtorrent v0.14.x
-    - OTHER: Drop support for Qt 4.5
-
-* Sat Oct 08 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.0
-    - FEATURE: Add file association settings to program preferences (Windows)
-    - FEATURE: Add setting to ignore slow torrents in queueing system
-    - FEATURE: Add advanced setting to announce to all trackers
-    - FEATURE: Add support for anonymous mode (libtorrent >= v0.16)
-    - FEATURE: Add quick "set as default save path" checkbox to torrent addition dialog (sledgehammer999)
-    - BUGFIX: Add tray menu entry for toggling window visibility
-    - BUGFIX: Fix execution log lines selection and copying
-    - BUGFIX: Reduce CPU usage when running Web UI
-    - BUGFIX: Save RSS items to disk regularly for safety
-    - BUGFIX: Fix ratio calculation (use all_time_download)
-    - BUGFIX: Fix torrent upload issues (Web UI)
-    - BUGFIX: Fix some IE incompatibilities (Web UI)
-    - COSMETIC: Display speed at the beginning of the Window title
-    - COSMETIC: Several cosmetic fixes to the Web UI
-    - COSMETIC: Make top toolbar follow system style
-    - OTHER: Display libraries versions in about dialog (sledgehammer999)
-    - OTHER: Display qBittorrent version in Web UI about dialog
-
-* Thu Jun 02 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.8.0
-    - FEATURE: Added full libtorrent v0.16 support (uTP, ...)
-    - FEATURE: Proxy can be disabled for peer connections
-    - FEATURE: Added support for secure SMTP connection (SSL)
-    - FEATURE: Added support for SMTP authentication
-    - FEATURE: Added UPnP/NAT-PMP port forward for the Web UI port
-    - FEATURE: qBittorrent can update dynamic DNS services (DynDNS, no-ip)
-    - FEATURE: Display peer connection type in peer list (BT, uTP, Web)
-    - FEATURE: Added full regex support to RSS downloader
-    - FEATURE: Added regex help and validation in RSS downloader
-    - FEATURE: Added HTTPS support to Web UI (Ishan Arora)
-    - BUGFIX: Change systray icon on the fly (no restart needed)
-    - BUGFIX: Remember peer-level rate limits (requires libtorrent v0.16)
-    - BUGFIX: Stop annoncing to trackers an all tiers (more respectful)
-    - BUGFIX: Stop sharing private trackers with other peers
-    - BUGFIX: Tracker exchange extension can be disabled
-    - BUGFIX: Cleaner program exit on system log out
-    - BUGFIX: Fix possible magnet link parsing problems
-    - BUGFIX: Fix possible RSS URL parsing problems
-    - COSMETIC: Added monochrome icon for light themes 
-
-* Sun Mar 20 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.7.0
-    - FEATURE: Added search field for torrent content
-    - FEATURE: Added auto-shutdown confirmation dialog
-    - FEATURE: Added option to skip torrent deletion confirmation (Ville Kiiskinen)
-    - FEATURE: IP address reported to trackers is now customizable
-    - FEATURE: Inhibit system sleep when torrents are active (Vladimir Golovnev)
-    - FEATURE: Added option to bypass Web UI authentication for localhost
-    - FEATURE: Added option to disable program exit confirmation
-    - FEATURE: Added per-torrent ratio limiting (Christian Kandeler)
-    - FEATURE: Torrent content list is now sortable
-    - BUGFIX: Fix compilation with namespaced Qt (Christian Kandeler)
-    - BUGFIX: Added length restriction on UI lock password
-    - COSMETIC: Added monochrome tray icon
-    - COSMETIC: Improved status bar's style
-    - OTHER: Make QtDBus dependency optional (X11)
+* Mon Jan 10 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.1
+    - BUGFIX: Really disable torrent addition dialog by default
+    - BUGFIX: Fix some missing icons in the Web UI
+    - BUGFIX: Fix magnet torrent name update problem
+    - COSMETIC: Use 24px size for toolbar icons and reduce spacing
+    - COSMETIC: Move transfer list filter on the right side of the toolbar
 
 * Sun Jan 9 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.0
     - FEATURE: Use system icons (Linux, Qt >= 4.6)

INSTALL

@@ -10,23 +10,25 @@ qBittorrent - A BitTorrent client in C++ / Qt4
   will install and execute qBittorrent hopefully without any problems.
 
   Dependencies:
-    - Qt >= 4.6.0 (libqtgui, libqtcore, libqtnetwork, libqtxml, libqtdbus/optional)
+    - Qt >= 4.5.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
 
     - pkg-config executable
 
-    - libtorrent-rasterbar by Arvid Norberg (>= 0.15.0)
+    - libtorrent-rasterbar by Arvid Norberg (>= 0.14.4 REQUIRED, compatible with v0.15.x)
         -> http://www.libtorrent.net
         Be careful: another library (the one used by rTorrent) uses a similar name.
 
-    - libboost 1.34.x (libboost-filesystem°) + libasio
+    - libboost 1.34.x (libboost-filesystem, libboost-thread, libboost-date-time) + libasio
       or
-    - libboost >= 1.35.x (libboost-system, libboost-filesystem°)
-      
-    °libboost-filesystem is not needed if libtorrent-rasterbar >= v0.16.x is used
+    - libboost >= 1.35.x (libboost-system, libboost-filesystem, libboost-thread, libboost-date-time)
 
     - python >= 2.3 (needed by search engine)
         * Run time only dependency
 
+    - libnotify >= 0.4.2, glib-2.0 (optional)
+        * Can be used for system notifications to replace standard Qt notifications
+          so that it integrates better into the Desktop
+
     - geoip-database (optional)
         * If qBittorrent cannot find this database, it will try to resolve countries using the Internet but it will be a lot slower.
         * Run time only dependency
@@ -44,7 +46,7 @@ qBittorrent - A BitTorrent client in C++ / Qt4
 
     - pkg-config executable
 
-    - libtorrent-rasterbar by Arvid Norberg (>= v0.15.0)
+    - libtorrent-rasterbar by Arvid Norberg (>= 0.14.4 REQUIRED, >= v0.15.0 ADVISED)
         -> http://www.libtorrent.net
         Be careful: another library (the one used by rTorrent) uses a similar name.
 

README.os2

@@ -27,6 +27,7 @@ First you need to create the conf.pri file in the same dir as this readme.os2 is
 the conf.pri file has the following content:
 
 ##### conf.pri content beginn #####
+PREFIX = .
 BINDIR = ./bin
 INCDIR = ./include
 LIBDIR = ./lib
@@ -42,10 +43,7 @@ LIBS += -Lx:/trees/libtorrent/trunk/src/.libs \
 
 Of course all the above path references have to be adjusted to your build env.
 
-Now you can either do a normal build or a shadow build. A shadow build has the
-advantage that no created files are in the same dir as the sources are.
-
-For a normal build do the following:
+It should now be easy to build qBittorrent:
 
 Simply type:
 $ qmake
@@ -53,16 +51,6 @@ $ qmake
 Followed by:
 $ make
 
-For a shadow build do the following:
-given your sources are in x:\trees\qbittorrent\trunk create a 
-x:\trees\qbittorrent\build directory
-
-Now switch to the created directory and type:
-$ qmake ..\trunk
-
-Followed by:
-$ make
-
 If all works fine you should get a working qbittorrent executable.
 
 If you have any question regarding the eCS (OS/2) port of qBittorrent you can meet me (_diver) on IRC:

install.os2

@@ -11,7 +11,7 @@ QBittorrent installation
 
 3. INSTALLATION
 
-4. BUGREPORTS
+4. CONTACT
 
 5. CREDITS
 
@@ -29,70 +29,17 @@ Welcome to QBittorrent port for OS/2 and eComStation.
 2. REQUIREMENTS
 ===============
 
-The following requirements can be installed either by rpm or by zip files.
+* klibc 0.6.3 or later
 
-RPM Installation:
+    ftp://ftp.netlabs.org/pub/gcc/libc-0_6_3-csd3.wpi
 
-klibc
------
+* openssl 1.0
+ 
+    ftp://ftp.netlabs.org/pub/unixos2/ssl10.zip
 
-  1. yum install libc
+* Qt4 dll
 
-openssl 1.0
------------
-
-  1. yum install openssl
-
-pthread
--------
-
-  1. yum install pthread
-
-GCC4Core
---------
-
-  1. yum install libgcc
-  2. yum install gcc-stack-protector
-  3. yum install gcc-stdc++-shared-library
-  4. yum install gcc-supc++-shared-library
-
-Qt4 dll
--------
-
-  1. yum install libqt4
-
-
-ZIP Installation:
-
-klibc
------
-
-  1. Download klibc 0.6.5 or better (see http://svn.netlabs.org/libc for more information)
-  2. Install the files to your libpath eg x:\ecs\dll
-
-openssl 1.0
------------
-
-  1. Download the zip file from http://rpm.netlabs.org/release/00/zip
-  2. Install the files to your libpath eg. x:\ecs\dll
-
-pthread
--------
-
-  1. Download pthread 2012-03-13 or better from http://rpm.netlabs.org/release/00/zip
-  2. Install the files to your libpath eg. x:\ecs\dll
-
-GCC4Core
---------
-
-  1. Download GCC4Core 1.2.1 or better from http://ftp.netlabs.org/pub/gcc
-  2. Install the files to your libpath eg. x:\ecs\dll
-
-Qt4 dll
--------
-
-  1. Download Qt4 4.7.3 or better (see http://svn.netlabs.org/qt4 for more information)
-  2. Install the files according to the readme
+    see http://svn.netlabs.org/qt4 for more information whats needed and where to get the latest
 
 
 3. INSTALLATION
@@ -100,6 +47,30 @@ Qt4 dll
           
 To install QBittorrent, do the following:
 
+klibc
+-----
+
+  1. Download klibc 0.6.3 csd3 or later.
+  2. Install the package by double-clicking on the WPI file.
+
+
+openssl 1.0
+-----------
+
+  1. Download the zip file
+  2. Install the files to your libpath eg. x:\ecs\dll
+
+Qt4 dll
+-------
+
+  1. Download the package
+  2. Install the package by double-clicking on the wpi file.
+
+
+
+QBittorrent
+-----------
+
   1. Create a directory for QBittorrent.
   2. Extract the QBittorrent package to the new directory.
   3. Create a WPS object for QBittorrent.exe.
@@ -107,13 +78,18 @@ To install QBittorrent, do the following:
   5. Happy torrenting
   
 
-4. BUGREPORTS
-=============
 
-Please create bugreports at http://svn.netlabs.org/qtapps
+4. CONTACT
+==========
+
+Please send bugreports to:
+
+  ecs@aroa.ch
+
 Only bug reports with a reproducable bug are accepted. :-)
 
 
+
 5. CREDITS
 ==========
 
@@ -146,33 +122,6 @@ development, you can do so in one of the following ways:
 7. HISTORY
 ==========
 
-2012-09-19
-
-  * updated to 3.0.4 code level of QBittorrent
-  * updated libtorrent to 0.16.3 level
-
-2012-09-06
-
-  * updated to 3.0.2 code level of QBittorrent
-
-2012-05-14
-
-  * updated to 2.9.8 code level of QBittorrent
-
-2012-03-15
-
-  * updated to 2.9.5 code level of QBittorrent
-
-2011-09-26
-
-  * updated to 2.8.5 code level of QBittorrent
-  * updated to Qt 4.7.3
-
-2011-06-20
-
-  * updated to 2.7.3 code level of QBittorrent
-  * updated libtorrent to 0.15.6 level
-
 2010-12-23
 
   * updated to 2.5.2 code level of QBittorrent

macxconf.pri

@@ -2,66 +2,15 @@ PREFIX = /usr/local
 BINDIR = /usr/local/bin
 DATADIR = /usr/local/share
 
-# Use pkg-config to get all necessary libtorrent DEFINES
-CONFIG += link_pkgconfig
-PKGCONFIG += libtorrent-rasterbar
-DEFINES += BOOST_ASIO_DYN_LINK
-
-# Special include/libs paths (macports)
-INCLUDEPATH += /usr/include/openssl /usr/include /opt/local/include/boost /opt/local/include
-LIBS += -L/opt/local/lib
-
-# OpenSSL lib
-LIBS += -lssl -lcrypto
-# Boost system lib
-LIBS += -lboost_system-mt
-# Boost filesystem lib (Not needed for libtorrent >= 0.16.0)
-#LIBS += -lboost_filesystem-mt
-# Carbon
-LIBS += -framework Carbon -framework IOKit
-# Zlib
-LIBS += -lz
+INCLUDEPATH += /usr/local/include/libtorrent /usr/include/openssl /usr/include /opt/local/include/boost /opt/local/include
+LIBS += -ltorrent-rasterbar -lcrypto -L/opt/local/lib -lboost_system-mt -lboost_filesystem-mt -lboost_thread-mt -framework Cocoa -framework Carbon
 
 document_icon.path = Contents/Resources
-document_icon.files = mac/qBitTorrentDocument.icns
+document_icon.files = Icons/qBitTorrentDocument.icns
+
 QMAKE_BUNDLE_DATA += document_icon
-
-qt_conf.path = Contents/Resources
-qt_conf.files = mac/qt.conf
-QMAKE_BUNDLE_DATA += qt_conf
-
-qt_translations.path = Contents/MacOS/translations
-qt_translations.files = qt-translations/qt_ar.qm \
-                        qt-translations/qt_bg.qm \
-                        qt-translations/qt_ca.qm \
-                        qt-translations/qt_cs.qm \
-                        qt-translations/qt_da.qm \
-                        qt-translations/qt_de.qm \
-                        qt-translations/qt_es.qm \
-                        qt-translations/qt_fi.qm \
-                        qt-translations/qt_fr.qm \
-                        qt-translations/qt_gl.qm \
-                        qt-translations/qt_he.qm \
-                        qt-translations/qt_hu.qm \
-                        qt-translations/qt_it.qm \
-                        qt-translations/qt_ja.qm \
-                        qt-translations/qt_ko.qm \
-                        qt-translations/qt_lt.qm \
-                        qt-translations/qt_nl.qm \
-                        qt-translations/qt_pl.qm \
-                        qt-translations/qt_pt.qm \
-                        qt-translations/qt_pt_BR.qm \
-                        qt-translations/qt_ru.qm \
-                        qt-translations/qt_sk.qm \
-                        qt-translations/qt_sv.qm \
-                        qt-translations/qt_tr.qm \
-                        qt-translations/qt_uk.qm \
-                        qt-translations/qt_zh_CN.qm \
-                        qt-translations/qt_zh_TW.qm
-QMAKE_BUNDLE_DATA += qt_translations
-
-ICON = mac/qbittorrent_mac.icns
-QMAKE_INFO_PLIST = mac/Info.plist
+ICON = Icons/qbittorrent_mac.icns
+QMAKE_INFO_PLIST = Info.plist
 
 DEFINES += WITH_GEOIP_EMBEDDED
 message("On Mac OS X, GeoIP database must be embedded.")

os2conf.pri

@@ -1,3 +1,5 @@
+INCLUDEPATH += $$PWD
+
 exists(conf.pri) {
     # to the conf.pri goes all system dependent stuff
     include(conf.pri)
@@ -7,13 +9,9 @@ LIBS += -ltorrent-rasterbar \
         -lboost_thread \
         -lboost_system \
         -lboost_filesystem \
-        -lssl -lcrypto -lidn -lpthread -lz
+        -lssl -lcrypto -lidn -lpthread
 
 RC_FILE = qbittorrent_os2.rc
 
-# LIBTORRENT DEFINES
-DEFINES += WITH_SHIPPED_GEOIP_H
-DEFINES += BOOST_ASIO_DYN_LINK
-
 DEFINES += WITH_GEOIP_EMBEDDED
 message("On eCS(OS/2), GeoIP database must be embedded.")

qbittorrent.pro

@@ -2,17 +2,3 @@ TEMPLATE = subdirs
 
 SUBDIRS += src
 
-include(version.pri)
-
-# Dist
-dist.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/ &&
-dist.commands += git clone . ../$${PROJECT_NAME}-$${PROJECT_VERSION} &&
-dist.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/.git &&
-dist.commands += rm -f ../$${PROJECT_NAME}-$${PROJECT_VERSION}/.gitignore &&
-dist.commands += cd .. &&
-dist.commands += tar czf $${PROJECT_NAME}-$${PROJECT_VERSION}.tar.gz $${PROJECT_NAME}-$${PROJECT_VERSION} &&
-dist.commands += tar cf $${PROJECT_NAME}-$${PROJECT_VERSION}.tar $${PROJECT_NAME}-$${PROJECT_VERSION} &&
-dist.commands += xz -f $${PROJECT_NAME}-$${PROJECT_VERSION}.tar &&
-dist.commands += rm -fR $${PROJECT_NAME}-$${PROJECT_VERSION}
-
-QMAKE_EXTRA_TARGETS += dist

qbittorrent.qc

@@ -6,8 +6,6 @@
   <dep type='qt4'>
     <required/>
   </dep>
-  <dep type='qt-dbus'>
-  </dep>
   <dep type='pkg-config'>
     <required/>
   </dep>
@@ -17,6 +15,8 @@
   <dep type='libboost'>
     <required/>
   </dep>
+  <dep type='libnotify'>
+  </dep>
   <dep type='geoip-database'>
   </dep>
   <dep type='qtsingleapplication'>

qcm/libboost.qcm

@@ -6,15 +6,12 @@ arg: with-libboost-lib=[path], Path to libboost library files
 -----END QCMOD-----
 */
 #include <boost/version.hpp>
-#include <libtorrent/version.hpp>
-
 class qc_libboost : public ConfObj
 {
 public:
-  qc_libboost(Conf *c) : ConfObj(c) {}
-  QString name() const { return "libboost"; }
-  QString shortname() const { return "libboost"; }
-
+	qc_libboost(Conf *c) : ConfObj(c) {}
+	QString name() const { return "libboost"; }
+	QString shortname() const { return "libboost"; }
   QString findBoostLib(QString path, QString lib) const {
     QString name;
     QDir libDir(path);
@@ -38,60 +35,84 @@ public:
     }
     return name;
   }
-
-  bool exec(){
-    QStringList sl;
-    QString s = conf->getenv("QC_WITH_LIBBOOST_INC");
-    if (!s.isEmpty())
-      sl << s;
-    sl << "/usr/include";
-    sl << "/usr/local/include";
-    bool found = false;
-    foreach (s, sl) {
-      if (conf->checkHeader(s, "boost/format.hpp")
-#if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
-          && conf->checkHeader(s, "boost/filesystem/path.hpp")
-#endif
-         ) {
-        found = true;
-        break;
-      }
-    }
-    if (!found)
-      return false;
-
-    conf->addIncludePath(s);
-
-    // Find library
-    s = conf->getenv("QC_WITH_LIBBOOST_LIB");
+	bool exec(){
+        	QString s;
+		s = conf->getenv("QC_WITH_LIBBOOST_INC");
+		if(!s.isEmpty()) {
+			if(!conf->checkHeader(s, "boost/format.hpp")) {
+				return false;
+      			}
+			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
+				return false;
+      			}
+			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
+				return false;
+      			}
+			if(!conf->checkHeader(s, "boost/thread.hpp")) {
+				return false;
+      			}
+		}else{
+			QStringList sl;
+			sl << "/usr/include";
+			sl << "/usr/local/include";
+			bool found = false;
+			foreach(s, sl){
+				if(conf->checkHeader(s, "boost/format.hpp")){
+					found = true;
+					break;
+				}
+			}
+			if(!found) {
+				return false;
+          		}
+			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
+				return false;
+      			}
+			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
+				return false;
+      			}
+			if(!conf->checkHeader(s, "boost/thread.hpp")) {
+				return false;
+      			}
+		}
+		conf->addIncludePath(s);
+		// Find library
+		s = conf->getenv("QC_WITH_LIBBOOST_LIB");
     QStringList required_libs;
 #if BOOST_VERSION >= 103500
       required_libs << "system"; 
 #endif
-#if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
-    required_libs << "filesystem" ;
-#endif
-    //required_libs << "thread";
+    if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+      // Not required by nox
+      required_libs << "filesystem" << "thread";
+    }
     QStringList libDirs;
-    if (!s.isEmpty())
-      libDirs << s;
     libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
-
     foreach(const QString& lib, required_libs) {
-      bool found = false;
-      foreach(const QString& libDir, libDirs) {
-        QString detected_name = findBoostLib(libDir, lib);
-        if(!detected_name.isEmpty()) {
+      if(!s.isEmpty()) {
+        QString detected_name = findBoostLib(s, lib);
+        if(detected_name.isEmpty()) {
+          printf("Could not find boost %s library!\n", qPrintable(lib));
+          return false;
+        } else {
           conf->addLib("-l"+detected_name);
-          found = true;
-          break;
+        }
+      } else {
+        bool found = false;
+        foreach(const QString& libDir, libDirs) {
+          QString detected_name = findBoostLib(libDir, lib);
+          if(!detected_name.isEmpty()) {
+            conf->addLib("-l"+detected_name);
+            found = true;
+            break;
+          }
+        }
+        if(!found) {
+          printf("Could not find boost %s library!\n", qPrintable(lib));
+          return false;
         }
       }
-      if(!found) {
-        printf("Could not find boost %s library!\n", qPrintable(lib));
-        return false;
-      }
     }
-    return true;
-  }
+		return true;
+	}
 };

qcm/libtorrent-rasterbar.qcm

@@ -8,17 +8,20 @@ class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.15.0"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.14.4"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
 		QStringList incs;
-		QString req_ver = "0.15.0";
+		QString req_ver = "0.14.4";
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))
 			return false;
 		for(int n = 0; n < incs.count(); ++n)
 			conf->addIncludePath(incs[n]);
+		if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+  		  conf->addLib("-lcrypto");
+                }
 		return true;
 	}
 };

qcm/qt-dbus.qcm

@@ -1,31 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: qt-dbus
------END QCMOD-----
-*/
-// see  Conf::findPkgConfig
-class qc_qt_dbus : public ConfObj
-{
-public:
-	qc_qt_dbus(Conf *c) : ConfObj(c) {}
-	QString name() const { return "QtDBus >= 4.5"; }
-	QString shortname() const { return "qt-dbus"; }
-        QString checkString() const {
-                if(!conf->getenv("QC_DISABLE_qt_dbus").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                        return "";
-                return ConfObj::checkString();
-        }
-	bool exec(){
-                if(!conf->getenv("QC_DISABLE_qt_dbus").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                  return false;
-		QStringList incs;
-		QString req_ver = "4.5.0";
-		QString version, libs, other;
-		VersionMode mode = VersionMin;
-		if(conf->findPkgConfig("QtDBus", mode, req_ver, &version, &incs, &libs, &other)) {
-                        conf->addExtra("CONFIG += dbus");
-			return true;
-                }
-		return false;
-	}
-};

qcm/qt-svg.qcm

@@ -1,31 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: qt-svg
------END QCMOD-----
-*/
-// see  Conf::findPkgConfig
-class qc_qt_svg : public ConfObj
-{
-public:
-	qc_qt_svg(Conf *c) : ConfObj(c) {}
-	QString name() const { return "QtSvg >= 4.5"; }
-	QString shortname() const { return "qt-svg"; }
-        QString checkString() const {
-                if(!conf->getenv("QC_DISABLE_qt_svg").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                        return "";
-                return ConfObj::checkString();
-        }
-	bool exec(){
-                if(!conf->getenv("QC_DISABLE_qt_svg").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                  return false;
-		QStringList incs;
-		QString req_ver = "4.5.0";
-		QString version, libs, other;
-		VersionMode mode = VersionMin;
-		if(conf->findPkgConfig("QtSvg", mode, req_ver, &version, &incs, &libs, &other)) {
-                        conf->addExtra("CONFIG += svg");
-			return true;
-                }
-		return false;
-	}
-};

qcm/qt4.qcm

@@ -1,6 +1,6 @@
 /*
 -----BEGIN QCMOD-----
-name: Qt >= 4.6
+name: Qt >= 4.5
 arg: enable-debug, Enable debug mode
 arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
@@ -9,8 +9,8 @@ class qc_qt4 : public ConfObj
 {
 public:
 	qc_qt4(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.6"; }
-	QString shortname() const { return "Qt 4.6"; }
+	QString name() const { return "Qt >= 4.5"; }
+	QString shortname() const { return "Qt 4.5"; }
 	bool exec()
 	{
                 // NOX mode
@@ -19,18 +19,8 @@ public:
 		}
                 // Debug mode
                 if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) {
-                  conf->addExtra("CONFIG -= release");
                   conf->addExtra("CONFIG += debug");
-                } else {
-                  conf->addExtra("CONFIG -= debug");
-                  conf->addExtra("CONFIG += release");
                 }
-                #ifdef Q_OS_FREEBSD
-                  conf->addLib("-lexecinfo");
-                  conf->addExtra("MANPREFIX = $$PREFIX");
-                #else
-                  conf->addExtra("MANPREFIX = $$PREFIX/share"); 
-                #endif
-		return(QT_VERSION >= 0x040600);
+		return(QT_VERSION >= 0x040500);
 	}
 };

src/Icons/qBittorrent.desktop

@@ -1,39 +1,36 @@
 [Desktop Entry]
-Categories=Network;FileTransfer;P2P;Qt;
-Exec=qbittorrent %U
-GenericName=BitTorrent client
-GenericName[ar]=العميل BitTorrent
+Categories=Qt;Network;P2P;
+Comment=V2.6.1
+Exec=qbittorrent %f
+GenericName=Bittorrent client
+GenericName[ar]=العميل Bittorrent
 GenericName[bg]=Торент клиент
-GenericName[cs]=BitTorrent klient
-GenericName[de]=BitTorren Client
-GenericName[el]=BitTorrent πελάτης
-GenericName[es]=Cliente BitTorrent
-GenericName[fi]=BitTorrent-ohjelma
-GenericName[fr]=Client BitTorrent
-GenericName[hr]=BitTorrent klijent
-GenericName[hu]=BitTorrent kliens
-GenericName[it]=Client BitTorrent
-GenericName[ja]=BitTorrent クライアント
+GenericName[cs]=Bittorrent klient
+GenericName[de]=Bittorren Client
+GenericName[el]=Bittorrent πελάτης
+GenericName[es]=Cliente Bittorrent
+GenericName[fi]=Bittorrent-ohjelma
+GenericName[fr]=Client Bittorrent
+GenericName[hr]=Bittorrent klijent
+GenericName[hu]=Bittorrent kliens
+GenericName[it]=Client Bittorrent
+GenericName[ja]=Bittorrent クライアント
 GenericName[ko]=비토렌트 클라이언트
-GenericName[lt]=BitTorrent klientas
-GenericName[nl]=BitTorrent-cliënt
-GenericName[pl]=Klient BitTorrent
-GenericName[pt]=Cliente BitTorrent
-GenericName[pt_BR]=Cliente BitTorrent
-GenericName[ro]=Client BitTorrent
-GenericName[ru]=клиент BitTorrent
-GenericName[sk]=Klient siete BitTorrent
-GenericName[sr]=BitTorrent-клијент
-GenericName[sv]=BitTorrent-klient
-GenericName[tr]=BitTorrent istemcisi
-GenericName[uk]=BitTorrent-клієнт
-GenericName[zh]=BitTorrent之用户
-GenericName[zh_TW]=BitTorrent客戶端
-Comment=Download and share files over BitTorrent
-Comment[fr]=Télécharger et partager des fichiers avec BitTorrent
-Comment[pl]=Dzielenie się plikami przez BitTorrent
+GenericName[nl]=Bittorrent-cliënt
+GenericName[pl]=Klient Bittorrent
+GenericName[pt]=Cliente Bittorrent
+GenericName[pt_BR]=Cliente Bittorrent
+GenericName[ro]=Client Bittorrent
+GenericName[ru]=клиент Bittorrent
+GenericName[sk]=Klient siete Bittorrent
+GenericName[sr]=Bittorrent-клијент
+GenericName[sv]=Bittorrent-klient
+GenericName[tr]=Bittorrent istemcisi
+GenericName[uk]=Bittorrent-клієнт
+GenericName[zh]=Bittorrent之用户
+GenericName[zh_TW]=Bittorrent客戶端
 Icon=qbittorrent
-MimeType=application/x-bittorrent;x-scheme-handler/magnet;
+MimeType=application/x-bittorrent;
 Name=qBittorrent
 Name[ko]=큐비토런트
 Terminal=false

src/Info.plist

@@ -13,6 +13,10 @@
 			<string>qBitTorrentDocument</string>
 			<key>CFBundleTypeName</key>
 			<string>BitTorrent Document</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/x-bittorrent</string>
+			</array>
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 			<key>LSHandlerRank</key>
@@ -36,55 +40,21 @@
 			<string>BitTorrent Magnet URL</string>
 		</dict>
 	</array>
-	<key>CFBundleName</key>
-	<string>qBittorrent</string>
 	<key>CFBundleIconFile</key>
 	<string>qbittorrent_mac.icns</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>3.0.10</string>
+	<key>CFBundleGetInfoString</key>
+	<string>2.6.1</string>
 	<key>CFBundleSignature</key>
-	<string>qBit</string>
+	<string>????</string>
 	<key>CFBundleExecutable</key>
 	<string>qbittorrent</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.qbittorrent</string>
-	<key>NSAppleScriptEnabled</key>
-	<string>YES</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2013 The qBittorrent project</string>
-	<key>UTExportedTypeDeclarations</key>
-	<array>
-		<dict>
-			<key>UTTypeConformsTo</key>
-			<array>
-				<string>public.data</string>
-				<string>public.item</string>
-				<string>com.bittorrent.torrent</string>
-			</array>
-			<key>UTTypeDescription</key>
-			<string>BitTorrent Document</string>
-			<key>UTTypeIconFile</key>
-			<string>qBitTorrentDocument</string>
-			<key>UTTypeIdentifier</key>
-			<string>org.bittorrent.torrent</string>
-			<key>UTTypeReferenceURL</key>
-			<string>http://www.bittorrent.org/beps/bep_0000.html</string>
-			<key>UTTypeTagSpecification</key>
-			<dict>
-				<key>com.apple.ostype</key>
-				<string>TORR</string>
-				<key>public.filename-extension</key>
-				<array>
-					<string>torrent</string>
-				</array>
-				<key>public.mime-type</key>
-				<string>application/x-bittorrent</string>
-			</dict>
-		</dict>
-	</array>
+	<key>NOTE</key>
+	<string>This file was generated by Qt/QMake.</string>
 </dict>
 </plist>

src/about_imp.h

@@ -33,9 +33,6 @@
 
 #include "ui_about.h"
 #include <QFile>
-#include <QtGlobal>
-#include <libtorrent/version.hpp>
-#include <boost/version.hpp>
 
 class about : public QDialog, private Ui::AboutDlg{
   Q_OBJECT
@@ -45,13 +42,13 @@ class about : public QDialog, private Ui::AboutDlg{
       qDebug("Deleting about dlg");
     }
 
-    about(QWidget *parent): QDialog(parent) {
+    about(QWidget *parent): QDialog(parent){
       setupUi(this);
       setAttribute(Qt::WA_DeleteOnClose);
       // Set icons
       logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png")));
       //Title
-      lb_name->setText(QString::fromUtf8("<b><h1>qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>"));
+      lb_name->setText(QString::fromUtf8("<b><h1>")+tr("qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>"));
       // Thanks
       QString thanks_txt;
       thanks_txt += QString::fromUtf8("<p>I would first like to thank sourceforge.net for hosting qBittorrent project and for their support.</p>");
@@ -63,9 +60,6 @@ class about : public QDialog, private Ui::AboutDlg{
       // 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>\
-          <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>\
           <li><u>Brazilian:</u> Nick Marinho (nickmarinho@gmail.com)</li>\
           <li><u>Bulgarian:</u> Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)</li>\
           <li><u>Catalan:</u> Francisco Luque Contreras (frannoe@ya.com)</li>\
@@ -77,39 +71,32 @@ class about : public QDialog, private Ui::AboutDlg{
           <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>Galician:</u> Marcos Lans (marcoslansgarza@gmail.com)</li>\
-          <li><u>Georgian:</u> Beqa Arabuli (arabulibeqa@yahoo.com)</li>\
           <li><u>German:</u> Niels Hoffmann (zentralmaschine@users.sourceforge.net)</li>\
           <li><u>Greek:</u> Tsvetan Bankov (emerge_life@users.sourceforge.net)</li>\
-          <li><u>Hebrew:</u> David Deutsch (d.deffo@gmail.com)</li>\
           <li><u>Hungarian:</u> Majoros Péter (majoros.peterj@gmail.com)</li>\
-          <li><u>Italian:</u> bovirus (bovirus@live.it) and Matteo Sechi (bu17714@gmail.com)</li>\
-          <li><u>Japanese:</u> Masato Hashimoto (cabezon.hashimoto@gmail.com)</li>\
+          <li><u>Italian:</u> Matteo Sechi (bu17714@gmail.com)</li>\
+          <li><u>Japanese:</u> Nardog (alphisation@gmail.com)</li>\
           <li><u>Korean:</u> Jin Woo Sin (jin828sin@users.sourceforge.net)</li>\
-          <li><u>Lithuanian:</u> Naglis Jonaitis (njonaitis@gmail.com)</li>\
-          <li><u>Norwegian:</u> Tomaso</li>\
+          <li><u>Norwegian:</u> Lars-Erik Labori (hamil@users.sourceforge.net)</li>\
           <li><u>Polish:</u> Mariusz Fik (fisiu@opensuse.org)</li>\
           <li><u>Portuguese:</u> Nick Marinho (nickmarinho@gmail.com)</li>\
           <li><u>Romanian:</u> Obada Denis (obadadenis@users.sourceforge.net)</li>\
           <li><u>Russian:</u> Nick Khazov (m2k3d0n@users.sourceforge.net) and Alexey Morsov (samurai@ricom.ru)</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)</li>\
+          <li><u>Spanish:</u> Francisco Luque Contreras (frannoe@ya.com)</li>\
           <li><u>Swedish:</u> Daniel Nylander (po@danielnylander.se)</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></ul>");
+          <li><u>Ukrainian:</u> Andrey Shpachenko (masterfix@users.sourceforge.net) and Oleh Prypin (blaxpirit@gmail.com)</li></ul>");
       trans_txt += "<p>"+tr("Please contact me if you would like to translate qBittorrent into your own language.")+"</p>";
       te_translation->setHtml(trans_txt);
       // License
       te_license->append(QString::fromUtf8("<a name='top'></a>"));
       QFile licensefile(":/gpl.html");
-      if (licensefile.open(QIODevice::ReadOnly|QIODevice::Text)) {
+      if(licensefile.open(QIODevice::ReadOnly|QIODevice::Text)) {
         te_license->setHtml(licensefile.readAll());
         licensefile.close();
       }
-      // Libraries
-      label_11->setText(QT_VERSION_STR);
-      label_12->setText(LIBTORRENT_VERSION);
-      label_13->setText(QString::number(BOOST_VERSION / 100000) + "." + QString::number((BOOST_VERSION / 100) % 1000) + "." + QString::number(BOOST_VERSION % 100));
       show();
     }
 };