Update changelog

(cherry picked from commit c0eb048fe2)

AUTHORS

@@ -87,6 +87,7 @@ 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)
   - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)

Changelog

@@ -1,3 +1,24 @@
+* Thu Dec 29 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.3
+    - BUGFIX: Fix btdigg plugin (Python3 support + torrent name in magnet links)
+    - BUGFIX: Fix banning of IPv6 peers (Closes #885021)
+    - BUGFIX: Fix torrent addition dialog layout problem (Closes #84650522)
+    - BUGFIX: Do not report any progress for disabled files (Closes #56731485)
+    - BUGFIX: Make torrent sorting case insensitive (Closes #857154)
+    - BUGFIX: Improve Web UI usability of small devices
+    - BUGFIX: Program updater: More reliable version detection / comparison
+    - I18N: Add Georgian translation
+
+* Sat Oct 29 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.2
+    - BUGFIX: Fix mimimum dimensions for torrent addition dialog
+    - BUGFIX: Remove dependency on boost-datetime
+    - BUGFIX: Remove dependency on boost-filesystem (libtorrent v0.16.x)
+
+* Sun Oct 23 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.1
+    - BUGFIX: Add support for speed limits scheduling (Web UI)
+    - BUGFIX: Fix ratio calculation for purely seeded torrents
+    - I18N: Update Russian translation
+    - COSMETIC: Torrent addition dialog layout fixes
+
 * 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

INSTALL

@@ -14,15 +14,17 @@ qBittorrent - A BitTorrent client in C++ / Qt4
 
     - pkg-config executable
 
-    - libtorrent-rasterbar by Arvid Norberg (>= 0.14.4 REQUIRED, compatible with v0.15.x)
+    - libtorrent-rasterbar by Arvid Norberg (>= 0.14.4 REQUIRED, compatible with v0.15.x/v0.16.x)
         -> http://www.libtorrent.net
         Be careful: another library (the one used by rTorrent) uses a similar name.
 
-    - libboost 1.34.x (libboost-filesystem, libboost-date-time) + libasio
+    - libboost 1.34.x (libboost-filesystem°) + libasio
       or
-    - libboost >= 1.35.x (libboost-system, libboost-filesystem, libboost-date-time)
+    - libboost >= 1.35.x (libboost-system, libboost-filesystem°)
+      
+    °libboost-filesystem is not needed if libtorrent-rasterbar >= v0.16.x is used
 
-    - python >= 2.3 && < 3.0 (needed by search engine)
+    - python >= 2.3 (needed by search engine)
         * Run time only dependency
 
     - geoip-database (optional)

configure

@@ -442,12 +442,15 @@ 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) {}
+  qc_libboost(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libboost"; }
+  QString name() const { return "libboost"; }
-	QString shortname() const { return "libboost"; }
+  QString shortname() const { return "libboost"; }
+
   QString findBoostLib(QString path, QString lib) const {
     QString name;
     QDir libDir(path);
@@ -471,77 +474,61 @@ public:
     }
     return name;
   }
-	bool exec(){
+
-        	QString s;
+  bool exec(){
-		s = conf->getenv("QC_WITH_LIBBOOST_INC");
+    QStringList sl;
-		if(!s.isEmpty()) {
+    QString s = conf->getenv("QC_WITH_LIBBOOST_INC");
-			if(!conf->checkHeader(s, "boost/format.hpp")) {
+    if (!s.isEmpty())
-				return false;
+      sl << s;
-      			}
+    sl << "/usr/include";
-			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
+    sl << "/usr/local/include";
-				return false;
+    bool found = false;
-      			}
+    foreach (s, sl) {
-			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
+      if (conf->checkHeader(s, "boost/format.hpp")
-				return false;
+#if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
-      			}
+          && conf->checkHeader(s, "boost/filesystem/path.hpp")
-		}else{
+#endif
-			QStringList sl;
+         ) {
-			sl << "/usr/include";
+        found = true;
-			sl << "/usr/local/include";
+        break;
-			bool found = false;
+      }
-			foreach(s, sl){
+    }
-				if(conf->checkHeader(s, "boost/format.hpp")){
+    if (!found)
-					found = true;
+      return false;
-					break;
+
-				}
+    conf->addIncludePath(s);
-			}
+
-			if(!found) {
+    // Find library
-				return false;
+    s = conf->getenv("QC_WITH_LIBBOOST_LIB");
-          		}
-			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
-				return false;
-      			}
-			if(!conf->checkHeader(s, "boost/filesystem/path.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
     QStringList libDirs;
+    if (!s.isEmpty())
+      libDirs << s;
     libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
+
     foreach(const QString& lib, required_libs) {
-      if(!s.isEmpty()) {
+      bool found = false;
-        QString detected_name = findBoostLib(s, lib);
+      foreach(const QString& libDir, libDirs) {
-        if(detected_name.isEmpty()) {
+        QString detected_name = findBoostLib(libDir, lib);
-          printf("Could not find boost %s library!\n", qPrintable(lib));
+        if(!detected_name.isEmpty()) {
-          return false;
-        } else {
           conf->addLib("-l"+detected_name);
-        }
+          found = true;
-      } else {
+          break;
-        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;
-	}
+  }
 };
 #line 1 "geoip-database.qcm"
 /*

macxconf.pri

@@ -2,8 +2,22 @@ PREFIX = /usr/local
 BINDIR = /usr/local/bin
 DATADIR = /usr/local/share
 
-INCLUDEPATH += /usr/local/include/libtorrent /usr/include/openssl /usr/include /opt/local/include/boost /opt/local/include
+# Use pkg-config to get all necessary libtorrent DEFINES
-LIBS += -ltorrent-rasterbar -lcrypto -L/opt/local/lib -lboost_system-mt -lboost_filesystem-mt -lboost_thread-mt -framework Cocoa -framework Carbon -framework IOKit
+CONFIG += link_pkgconfig
+PKGCONFIG += libtorrent-rasterbar
+
+# 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
 
 document_icon.path = Contents/Resources
 document_icon.files = Icons/qBitTorrentDocument.icns

qcm/libboost.qcm

@@ -6,12 +6,15 @@ 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) {}
+  qc_libboost(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libboost"; }
+  QString name() const { return "libboost"; }
-	QString shortname() const { return "libboost"; }
+  QString shortname() const { return "libboost"; }
+
   QString findBoostLib(QString path, QString lib) const {
     QString name;
     QDir libDir(path);
@@ -35,75 +38,59 @@ public:
     }
     return name;
   }
-	bool exec(){
+
-        	QString s;
+  bool exec(){
-		s = conf->getenv("QC_WITH_LIBBOOST_INC");
+    QStringList sl;
-		if(!s.isEmpty()) {
+    QString s = conf->getenv("QC_WITH_LIBBOOST_INC");
-			if(!conf->checkHeader(s, "boost/format.hpp")) {
+    if (!s.isEmpty())
-				return false;
+      sl << s;
-      			}
+    sl << "/usr/include";
-			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
+    sl << "/usr/local/include";
-				return false;
+    bool found = false;
-      			}
+    foreach (s, sl) {
-			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
+      if (conf->checkHeader(s, "boost/format.hpp")
-				return false;
+#if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
-      			}
+          && conf->checkHeader(s, "boost/filesystem/path.hpp")
-		}else{
+#endif
-			QStringList sl;
+         ) {
-			sl << "/usr/include";
+        found = true;
-			sl << "/usr/local/include";
+        break;
-			bool found = false;
+      }
-			foreach(s, sl){
+    }
-				if(conf->checkHeader(s, "boost/format.hpp")){
+    if (!found)
-					found = true;
+      return false;
-					break;
+
-				}
+    conf->addIncludePath(s);
-			}
+
-			if(!found) {
+    // Find library
-				return false;
+    s = conf->getenv("QC_WITH_LIBBOOST_LIB");
-          		}
-			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
-				return false;
-      			}
-			if(!conf->checkHeader(s, "boost/filesystem/path.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
     QStringList libDirs;
+    if (!s.isEmpty())
+      libDirs << s;
     libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
+
     foreach(const QString& lib, required_libs) {
-      if(!s.isEmpty()) {
+      bool found = false;
-        QString detected_name = findBoostLib(s, lib);
+      foreach(const QString& libDir, libDirs) {
-        if(detected_name.isEmpty()) {
+        QString detected_name = findBoostLib(libDir, lib);
-          printf("Could not find boost %s library!\n", qPrintable(lib));
+        if(!detected_name.isEmpty()) {
-          return false;
-        } else {
           conf->addLib("-l"+detected_name);
-        }
+          found = true;
-      } else {
+          break;
-        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;
-	}
+  }
 };

src/Info.plist

@@ -47,7 +47,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.8.0</string>
+	<string>2.9.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>

src/about_imp.h

@@ -75,6 +75,7 @@ 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>Hungarian:</u> Majoros Péter (majoros.peterj@gmail.com)</li>\

src/lang.qrc

@@ -33,5 +33,6 @@
   <file>lang/qbittorrent_en.qm</file>
   <file>lang/qbittorrent_hr.qm</file>
   <file>lang/qbittorrent_ro.qm</file>
+  <file>lang/qbittorrent_ka.qm</file>
 </qresource>
-</RCC>
+</RCC>

src/lang/qbittorrent_ru.ts

@@ -89,23 +89,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Libraries</source>
-        <translation type="unfinished"></translation>
+        <translation>Библиотеки</translation>
     </message>
     <message>
         <source>This version of qBittorrent was built against the following libraries:</source>
-        <translation type="unfinished"></translation>
+        <translation>Эта версия qBittorrent была создана с использованием следующих библиотек:</translation>
     </message>
     <message>
         <source>Qt:</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt:</translation>
     </message>
     <message>
         <source>Boost:</source>
-        <translation type="unfinished"></translation>
+        <translation>Boost:</translation>
     </message>
     <message>
         <source>Libtorrent:</source>
-        <translation type="unfinished"></translation>
+        <translation>Libtorrent:</translation>
     </message>
 </context>
 <context>
@@ -231,7 +231,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Always announce to all trackers</source>
-        <translation type="unfinished"></translation>
+        <translation>Всегда анонсировать на все трекеры</translation>
     </message>
 </context>
 <context>
@@ -1710,7 +1710,7 @@ No further notices will be issued.</source>
     <name>LogListWidget</name>
     <message>
         <source>Copy</source>
-        <translation type="unfinished">Копировать</translation>
+        <translation>Копировать</translation>
     </message>
 </context>
 <context>
@@ -2145,16 +2145,16 @@ Would you like to update qBittorrent to version %1?</source>
     </message>
     <message>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать</translation>
     </message>
     <message>
         <source>Hide</source>
-        <translation type="unfinished"></translation>
+        <translation>Скрыть</translation>
     </message>
     <message>
         <source>[D: %1/s, U: %2/s] qBittorrent %3</source>
         <comment>D = Download; U = Upload; %3 is qBittorrent version</comment>
-        <translation type="unfinished"></translation>
+        <translation>[Скач: %1/с, Отд: %2/с] qBittorrent %3</translation>
     </message>
 </context>
 <context>
@@ -2965,27 +2965,27 @@ Would you like to update qBittorrent to version %1?</source>
     </message>
     <message>
         <source>File association</source>
-        <translation type="unfinished"></translation>
+        <translation>Привязка файлов</translation>
     </message>
     <message>
         <source>Use qBittorrent for .torrent files</source>
-        <translation type="unfinished"></translation>
+        <translation>Использовать qBittorrent для .torrent файлов</translation>
     </message>
     <message>
         <source>Use qBittorrent for magnet links</source>
-        <translation type="unfinished"></translation>
+        <translation>Использовать qBittorrent для magnet ссылок</translation>
     </message>
     <message>
         <source>Do not count slow torrents in these limits</source>
-        <translation type="unfinished"></translation>
+        <translation>Не учитывать количество медленных торрентов в этих ограничениях</translation>
     </message>
     <message>
         <source>Enable anonymous mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Разрешить анонимный режим</translation>
     </message>
     <message>
         <source> (&lt;a href=&quot;http://sourceforge.net/apps/mediawiki/qbittorrent/index.php?title=Anonymous_mode&quot;&gt;More information&lt;/a&gt;)</source>
-        <translation type="unfinished"></translation>
+        <translation> (&lt;a href=&quot;http://sourceforge.net/apps/mediawiki/qbittorrent/index.php?title=Anonymous_mode&quot;&gt;Дополнительная информация&lt;/a&gt;)</translation>
     </message>
 </context>
 <context>
@@ -3582,7 +3582,7 @@ Would you like to update qBittorrent to version %1?</source>
     </message>
     <message>
         <source>Anonymous mode [ON]</source>
-        <translation type="unfinished"></translation>
+        <translation>Анонимный режим [Вкл]</translation>
     </message>
 </context>
 <context>
@@ -4970,7 +4970,7 @@ Do you want to install it now?</source>
     </message>
     <message>
         <source>Set as default save path</source>
-        <translation type="unfinished"></translation>
+        <translation>Установить как путь сохранения по умолчанию</translation>
     </message>
 </context>
 <context>
@@ -5534,7 +5534,7 @@ However, those plugins were disabled.</source>
     </message>
     <message>
         <source>Downloads</source>
-        <translation type="unfinished">Загрузки</translation>
+        <translation>Загрузки</translation>
     </message>
 </context>
 <context>