- Replaced OSD messages by systray messages

Changelog

@@ -1,6 +1,7 @@
 * Unknown - Christophe Dumez <chris@qbittorrent.org> - v0.8.0
     - FEATURE: Based on Qt 4.2
     - FEATURE: Brand new trayicon from Qt 4.2
+    - COSMETIC: Replaced OSD messages by systray messages
 
 * Mon Oct 16 2006 - Christophe Dumez <chris@qbittorrent.org> - v0.7.1
     - I18N: Updated French, Polish, Dutch, Swedish, Slovak translations

TODO

@@ -13,8 +13,7 @@
 - Allow to prioritize files within a torrent
 - Allow to prioritize torrents
 - Optimize code to use less memory/cpu
-- Add some transparency (menus, OSD)
+- Add some transparency (menus,...)
-- Rewrite trayicon using QSystemTrayIcon class (waiting for Qt 4.2)
 - Popup when adding a torrent (Save path, select files in the torrent...) (v0.8.0?)
 - Display remaining HD space (check it before adding a new torrent?)
 - Add a column "Tracker status"?

src/GUI.cpp

@@ -152,6 +152,9 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent){
   connect(actionPreview_file, SIGNAL(triggered()), this, SLOT(previewFileSelection()));
   connect(infoBar, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayInfoBarMenu(const QPoint&)));
   // Create tray icon
+  if (!QSystemTrayIcon::isSystemTrayAvailable()){
+    std::cerr << "Error: System tray unavailable\n";
+  }
   myTrayIcon = new QSystemTrayIcon(QIcon(":/Icons/qbittorrent22.png"), this);
   // Start download list refresher
   refresher = new QTimer(this);
@@ -169,6 +172,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent){
   myTrayIconMenu->addSeparator();
   myTrayIconMenu->addAction(actionExit);
   myTrayIcon->setContextMenu(myTrayIconMenu);
+  connect(myTrayIcon, SIGNAL(messageClicked()), this, SLOT(balloonClicked()));
   // End of Icon Menu
   connect(myTrayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(toggleVisibility(QSystemTrayIcon::ActivationReason)));
   myTrayIcon->show();
@@ -226,8 +230,6 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent){
   connect(meganova, SIGNAL(stateChanged(int)), this, SLOT(saveCheckedSearchEngines(int)));
   // Update nova.py search plugin if necessary
   updateNova();
-  // OSD
-  OSDWindow = new OSD(this);
   // Supported preview extensions
   // XXX: might be incomplete
   supported_preview_extensions<<"AVI"<<"DIVX"<<"MPG"<<"MPEG"<<"MP3"<<"OGG"<<"WMV"<<"WMA"<<"RMV"<<"RMVB"<<"ASF"<<"MOV"<<"WAV"<<"MP2"<<"SWF"<<"AC3";
@@ -249,7 +251,6 @@ GUI::~GUI(){
   delete refresher;
   delete myTrayIcon;
   delete myTrayIconMenu;
-  delete OSDWindow;
   delete tcpServer;
   delete DLDelegate;
   delete DLListModel;
@@ -272,6 +273,16 @@ void GUI::setInfoBar(const QString& info, const QString& color){
   infoBar->append("<font color='grey'>"+ QTime::currentTime().toString("hh:mm:ss") + "</font> - <font color='" + color +"'><i>" + info + "</i></font>");
 }
 
+void GUI::balloonClicked(){
+  if(isHidden()){
+      show();
+      if(isMinimized()){
+        showNormal();
+      }
+      raise();
+      activateWindow();
+  }
+}
 // Buggy with Qt 4.1.2 : should try with another version
 // void GUI::readParamsOnSocket(){
 //     QTcpSocket *clientConnection = tcpServer->nextPendingConnection();
@@ -1860,7 +1871,7 @@ void GUI::checkConnectionStatus(){
       // Level: info
       setInfoBar(fileName+tr(" has finished downloading."));
       if(options->getUseOSDAlways() || (options->getUseOSDWhenHiddenOnly() && (isMinimized() || isHidden()))) {
-        OSDWindow->display(fileName+tr(" has finished downloading."));
+        myTrayIcon->showMessage(tr("Download finished"), fileName+tr(" has finished downloading.", "<filename> has finished downloading."), QSystemTrayIcon::Information, TIME_TRAY_BALLOON);
       }
       QString scan_dir = options->getScanDir();
       bool isScanningDir = !scan_dir.isNull();
@@ -2173,7 +2184,7 @@ void GUI::on_update_nova_button_clicked(){
 // Error | Stopped by user | Finished normally
 void GUI::searchFinished(int exitcode,QProcess::ExitStatus){
   if(options->getUseOSDAlways() || (options->getUseOSDWhenHiddenOnly() && (isMinimized() || isHidden()))) {
-    OSDWindow->display(tr("Search is finished"));
+    myTrayIcon->showMessage(tr("Search Engine"), tr("Search is finished"), QSystemTrayIcon::Information, TIME_TRAY_BALLOON);
   }
   if(exitcode){
     search_status->setText(tr("An error occured during search..."));

src/GUI.h

@@ -41,10 +41,11 @@
 #include "ui_MainWindow.h"
 #include "options_imp.h"
 #include "about_imp.h"
-#include "OSD.h"
 #include "previewSelect.h"
 #include "trackerLogin.h"
 
+#define TIME_TRAY_BALLOON 5000
+
 class createtorrent;
 class QTimer;
 class DLListDelegate;
@@ -94,7 +95,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     bool no_search_results;
     QByteArray search_result_line_truncated;
     unsigned long nb_search_results;
-    OSD *OSDWindow;
     QTcpServer *tcpServer;
     QTcpSocket *clientConnection;
 
@@ -133,6 +133,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void previewFileSelection();
     void previewFile(const QString& filePath);
     void cleanTempPreviewFile(int, QProcess::ExitStatus);
+    void balloonClicked();
     // Torrent actions
     void showProperties(const QModelIndex &index);
     void propertiesSelection();

src/Icons/qBittorrent.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Application;Network;P2P
-Comment=V0.7.1
+Comment=V0.8.0
 Encoding=UTF-8
 Exec=qbittorrent
 GenericName=Bittorrent client

src/OSD.cpp

@@ -1,65 +0,0 @@
-/*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * Contact : chris@qbittorrent.org
- */
-
-#include <QPixmap>
-#include "OSD.h"
-
-OSD::OSD(QWidget *parent) : QDialog(parent){
-  // Hide OSD Timer
-  hideOSDTimer = new QTimer(this);
-  hideOSDTimer->setSingleShot(true);
-  connect(hideOSDTimer, SIGNAL(timeout()), this, SLOT(hide()));
-  // Window settings
-  setWindowFlags(Qt::SplashScreen);
-  setPalette(QPalette(QColor("darkBlue")));
-  hboxLayout = new QHBoxLayout(this);
-  icon = new QLabel(this);
-  icon->setPixmap(QPixmap(":/Icons/qbittorrent16.png"));
-  icon->adjustSize();
-  msg = new QLabel(this);
-  msg->setPalette(QPalette(QColor(88, 75, 255, 200)));
-  icon->setPalette(QPalette(QColor(88, 75, 255, 200)));
-  msg->setAutoFillBackground(true);
-  icon->setAutoFillBackground(true);
-  hboxLayout->addWidget(icon);
-  hboxLayout->addWidget(msg);
-  hboxLayout->setSpacing(0);
-  hboxLayout->setMargin(1);
-}
-
-OSD::~OSD(){
-  delete hideOSDTimer;
-  delete icon;
-  delete msg;
-  delete hboxLayout;
-}
-
-void OSD::display(const QString& message){
-  if(hideOSDTimer->isActive()){
-    hideOSDTimer->stop();
-    hide();
-  }
-  msg->setText("<font color='white'><b>"+message+"</b></font>");
-  msg->adjustSize();
-  adjustSize();
-  show();
-  hideOSDTimer->start(3000);
-}

src/OSD.h

@@ -1,47 +0,0 @@
-/*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * Contact : chris@qbittorrent.org
- */
-
-#ifndef OSD_H
-#define OSD_H
-
-#include <QDialog>
-#include <QLabel>
-#include <QHBoxLayout>
-#include <QTimer>
-
-class OSD : public QDialog {
-  Q_OBJECT
-
-private:
-  QTimer *hideOSDTimer;
-  QHBoxLayout *hboxLayout;
-  QLabel *icon;
-  QLabel *msg;
-
-public:
-  OSD(QWidget *parent=0);
-  ~OSD();
-
-public slots:
-  void display(const QString& message);
-};
-
-#endif

src/lang/qbittorrent_bg.ts

@@ -381,19 +381,19 @@ Copyright © 2006 на Christophe Dumez<br>
     </message>
     <message>
         <source>OSD</source>
-        <translation>OSD</translation>
+        <translation type="obsolete">OSD</translation>
     </message>
     <message>
         <source>Always display OSD</source>
-        <translation>Винаги показвай OSD</translation>
+        <translation type="obsolete">Винаги показвай OSD</translation>
     </message>
     <message>
         <source>Display OSD only if window is minimized or iconified</source>
-        <translation>Покажи OSD само ако минимизиран или иконизиран</translation>
+        <translation type="obsolete">Покажи OSD само ако минимизиран или иконизиран</translation>
     </message>
     <message>
         <source>Never display OSD</source>
-        <translation>Не показвай OSD</translation>
+        <translation type="obsolete">Не показвай OSD</translation>
     </message>
     <message>
         <source>KiB/s</source>
@@ -427,6 +427,22 @@ Copyright © 2006 на Christophe Dumez&lt;br&gt;
         <source>Audio/Video player:</source>
         <translation>Аудио/Видео плейър:</translation>
     </message>
+    <message>
+        <source>Systray Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display systray messages only when window is hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GUI</name>
@@ -830,6 +846,19 @@ Please close the other one first.</source>
         <source>Transfers</source>
         <translation>Трансфери</translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished"> е завършил свалянето.</translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished">Търсачка</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/lang/qbittorrent_ca.ts

@@ -404,19 +404,19 @@ Copyright © 2006 by Christophe Dumez<br>
     </message>
     <message>
         <source>OSD</source>
-        <translation>OSD</translation>
+        <translation type="obsolete">OSD</translation>
     </message>
     <message>
         <source>Always display OSD</source>
-        <translation>Mostrar sempre OSD</translation>
+        <translation type="obsolete">Mostrar sempre OSD</translation>
     </message>
     <message>
         <source>Display OSD only if window is minimized or iconified</source>
-        <translation>Mostra l&apos;OSD només si la finestra està minimitzada o iconificada</translation>
+        <translation type="obsolete">Mostra l&apos;OSD només si la finestra està minimitzada o iconificada</translation>
     </message>
     <message>
         <source>Never display OSD</source>
-        <translation>No mostrar OSD mai</translation>
+        <translation type="obsolete">No mostrar OSD mai</translation>
     </message>
     <message>
         <source>KiB/s</source>
@@ -450,6 +450,22 @@ Copyright © 2006 by Christophe Dumez&lt;br&gt;
         <source>Audio/Video player:</source>
         <translation>Reproductor de Audio/Video:</translation>
     </message>
+    <message>
+        <source>Systray Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display systray messages only when window is hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GUI</name>
@@ -873,6 +889,19 @@ Si et plau tanca l&apos;altre primer.</translation>
         <source>Transfers</source>
         <translation>Transferits</translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished"> ha finalitzat la descàrrega.</translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished">Motor de Busqueda</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/lang/qbittorrent_de.ts

@@ -331,21 +331,17 @@ Copyright (c) 2006 Christophe Dumez<br>
         <source>Behaviour</source>
         <translation>Verhalten</translation>
     </message>
-    <message>
-        <source>OSD</source>
-        <translation></translation>
-    </message>
     <message>
         <source>Always display OSD</source>
-        <translation>OSD immer anzeigen</translation>
+        <translation type="obsolete">OSD immer anzeigen</translation>
     </message>
     <message>
         <source>Display OSD only if window is minimized or iconified</source>
-        <translation>OSD nur anzeigen, wenn das Fenster minimiert ist</translation>
+        <translation type="obsolete">OSD nur anzeigen, wenn das Fenster minimiert ist</translation>
     </message>
     <message>
         <source>Never display OSD</source>
-        <translation>OSD nie anzeigen</translation>
+        <translation type="obsolete">OSD nie anzeigen</translation>
     </message>
     <message>
         <source>KiB/s</source>
@@ -379,6 +375,22 @@ Copyright (c) 2006 Christophe Dumez&lt;br&gt;
         <source>Audio/Video player:</source>
         <translation>Audio/Video Player:</translation>
     </message>
+    <message>
+        <source>Systray Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display systray messages only when window is hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GUI</name>
@@ -790,6 +802,19 @@ Bitte schliessen Sie diesen zuerst.</translation>
         <source>Transfers</source>
         <translation>Transfer</translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished"> ist vollständig heruntergeladen.</translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished">Such-Maschine</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/lang/qbittorrent_el.ts

@@ -396,19 +396,19 @@ Copyright © 2006 από τον Christophe Dumez<br>
     </message>
     <message>
         <source>OSD</source>
-        <translation>OSD</translation>
+        <translation type="obsolete">OSD</translation>
     </message>
     <message>
         <source>Always display OSD</source>
-        <translation>Εμφάνιση πάντα OSD</translation>
+        <translation type="obsolete">Εμφάνιση πάντα OSD</translation>
     </message>
     <message>
         <source>Display OSD only if window is minimized or iconified</source>
-        <translation>Εμφάνιση OSD μόνο αν το παράθυρο είναι ελαχιστοποιημένο ή εικονοποιημένο</translation>
+        <translation type="obsolete">Εμφάνιση OSD μόνο αν το παράθυρο είναι ελαχιστοποιημένο ή εικονοποιημένο</translation>
     </message>
     <message>
         <source>Never display OSD</source>
-        <translation>Απόκρυψη OSD</translation>
+        <translation type="obsolete">Απόκρυψη OSD</translation>
     </message>
     <message>
         <source>KiB/s</source>
@@ -442,6 +442,22 @@ Copyright © 2006 από τον Christophe Dumez&lt;br&gt;
         <source>Audio/Video player:</source>
         <translation>Αναπαραγωγή Ήχου/Βίντεο:</translation>
     </message>
+    <message>
+        <source>Systray Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display systray messages only when window is hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GUI</name>
@@ -865,6 +881,19 @@ Please close the other one first.</source>
         <source>Transfers</source>
         <translation>Μεταφορές</translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished"> έχει τελειώσει το κατέβασμα.</translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished">Μηχανή Αναζήτησης</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/lang/qbittorrent_en.ts

@@ -271,51 +271,51 @@ Copyright © 2006 by Christophe Dumez<br>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OSD</source>
+        <source>KiB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Always display OSD</source>
+        <source>1 KiB DL = </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display OSD only if window is minimized or iconified</source>
+        <source>KiB UP max.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Never display OSD</source>
+        <source>DHT (Trackerless):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>KiB/s</source>
+        <source>Disable DHT (Trackerless) support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 KiB DL = </source>
+        <source>Automatically clear finished downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>KiB UP max.</source>
+        <source>Preview program</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DHT (Trackerless):</source>
+        <source>Audio/Video player:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disable DHT (Trackerless) support</source>
+        <source>Systray Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically clear finished downloads</source>
+        <source>Always display systray messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Preview program</source>
+        <source>Display systray messages only when window is hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Audio/Video player:</source>
+        <source>Never display systray messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -613,6 +613,19 @@ Please close the other one first.</source>
         <source>Transfers</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/lang/qbittorrent_es.ts

@@ -345,19 +345,19 @@ Copyright © 2006 por Christophe Dumez<br>
     </message>
     <message>
         <source>OSD</source>
-        <translation>OSD</translation>
+        <translation type="obsolete">OSD</translation>
     </message>
     <message>
         <source>Always display OSD</source>
-        <translation>Mostrar siempre OSD</translation>
+        <translation type="obsolete">Mostrar siempre OSD</translation>
     </message>
     <message>
         <source>Display OSD only if window is minimized or iconified</source>
-        <translation>Muestra OSD solo si la ventana esta minimizada o iconificada</translation>
+        <translation type="obsolete">Muestra OSD solo si la ventana esta minimizada o iconificada</translation>
     </message>
     <message>
         <source>Never display OSD</source>
-        <translation>No mostrar nunca OSD</translation>
+        <translation type="obsolete">No mostrar nunca OSD</translation>
     </message>
     <message>
         <source>KiB/s</source>
@@ -391,6 +391,22 @@ Copyright © 2006 por Christophe Dumez&lt;br&gt;
         <source>Audio/Video player:</source>
         <translation>Reproductor de Audio/Video:</translation>
     </message>
+    <message>
+        <source>Systray Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display systray messages only when window is hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GUI</name>
@@ -806,6 +822,19 @@ Por favor cierra el otro antes.</translation>
         <source>Transfers</source>
         <translation>Transferidos</translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished">se ha terminado de descargar.</translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished">Motor de Búsqueda</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/lang/qbittorrent_fr.ts

@@ -435,21 +435,17 @@ Copyright © 2006 par Christophe Dumez<br>
         <source>Behaviour</source>
         <translation>Comportement</translation>
     </message>
-    <message>
-        <source>OSD</source>
-        <translation></translation>
-    </message>
     <message>
         <source>Always display OSD</source>
-        <translation>Toujours afficher les OSD</translation>
+        <translation type="obsolete">Toujours afficher les OSD</translation>
     </message>
     <message>
         <source>Display OSD only if window is minimized or iconified</source>
-        <translation>Afficher les OSD uniquement lorsque la fenêtre n&apos;est pas visible</translation>
+        <translation type="obsolete">Afficher les OSD uniquement lorsque la fenêtre n&apos;est pas visible</translation>
     </message>
     <message>
         <source>Never display OSD</source>
-        <translation>Ne jamais afficher d&apos;OSD</translation>
+        <translation type="obsolete">Ne jamais afficher d&apos;OSD</translation>
     </message>
     <message>
         <source>KiB/s</source>
@@ -483,6 +479,22 @@ Copyright © 2006 par Christophe Dumez&lt;br&gt;
         <source>Audio/Video player:</source>
         <translation>Lecteur audio/video :</translation>
     </message>
+    <message>
+        <source>Systray Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display systray messages only when window is hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GUI</name>
@@ -941,6 +953,19 @@ Veuillez d&apos;abord le quitter.</translation>
         <source>Transfers</source>
         <translation>Transferts</translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished"> a fini de télécharger.</translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished">Moteur de recherche</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/lang/qbittorrent_it.ts

@@ -282,19 +282,19 @@ Copyright © 2006 by Christophe Dumez<br>
     </message>
     <message>
         <source>OSD</source>
-        <translation>OSD</translation>
+        <translation type="obsolete">OSD</translation>
     </message>
     <message>
         <source>Always display OSD</source>
-        <translation>Mostra sempre l&apos;OSD</translation>
+        <translation type="obsolete">Mostra sempre l&apos;OSD</translation>
     </message>
     <message>
         <source>Display OSD only if window is minimized or iconified</source>
-        <translation>Mostra l&apos;OSD solo se la finestra è minimizzata o ridotta a icona</translation>
+        <translation type="obsolete">Mostra l&apos;OSD solo se la finestra è minimizzata o ridotta a icona</translation>
     </message>
     <message>
         <source>Never display OSD</source>
-        <translation>Non mostrare mai l&apos;OSD</translation>
+        <translation type="obsolete">Non mostrare mai l&apos;OSD</translation>
     </message>
     <message>
         <source>KiB/s</source>
@@ -328,6 +328,22 @@ Copyright © 2006 by Christophe Dumez&lt;br&gt;
         <source>Audio/Video player:</source>
         <translation>Player audio/video:</translation>
     </message>
+    <message>
+        <source>Systray Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display systray messages only when window is hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GUI</name>
@@ -631,6 +647,19 @@ Example: Downloading www.example.com/test.torrent</comment>
         <comment>Example: Downloading www.example.com/test.torrent</comment>
         <translation>Scaricando</translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished">ha finito il download.</translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/lang/qbittorrent_ko.ts

@@ -346,19 +346,19 @@ list:</source>
     </message>
     <message>
         <source>OSD</source>
-        <translation>OSD(On Screen Display)</translation>
+        <translation type="obsolete">OSD(On Screen Display)</translation>
     </message>
     <message>
         <source>Always display OSD</source>
-        <translation>OSD 항시 표시</translation>
+        <translation type="obsolete">OSD 항시 표시</translation>
     </message>
     <message>
         <source>Display OSD only if window is minimized or iconified</source>
-        <translation>창이 최소화할때나 작업창 아이콘이 될때만 OSD 표시</translation>
+        <translation type="obsolete">창이 최소화할때나 작업창 아이콘이 될때만 OSD 표시</translation>
     </message>
     <message>
         <source>Never display OSD</source>
-        <translation>OSD 표시하지 않기</translation>
+        <translation type="obsolete">OSD 표시하지 않기</translation>
     </message>
     <message>
         <source>KiB/s</source>
@@ -392,6 +392,22 @@ list:</source>
         <source>Audio/Video player:</source>
         <translation>음악/비디오 재생기:</translation>
     </message>
+    <message>
+        <source>Systray Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display systray messages only when window is hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GUI</name>
@@ -835,6 +851,19 @@ Please close the other one first.</source>
         <source>Transfers</source>
         <translation>전송</translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished"> 가 완료되었습니다.</translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished">검색 엔진</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/lang/qbittorrent_nb.ts

@@ -275,19 +275,19 @@ Copyright © 2006 av Christophe Dumez<br>
     </message>
     <message>
         <source>OSD</source>
-        <translation>Skjermmeldinger</translation>
+        <translation type="obsolete">Skjermmeldinger</translation>
     </message>
     <message>
         <source>Always display OSD</source>
-        <translation>Vis alltid skjermmeldinger</translation>
+        <translation type="obsolete">Vis alltid skjermmeldinger</translation>
     </message>
     <message>
         <source>Display OSD only if window is minimized or iconified</source>
-        <translation>Vis skjermmeldinger kun når vinduet er minimert</translation>
+        <translation type="obsolete">Vis skjermmeldinger kun når vinduet er minimert</translation>
     </message>
     <message>
         <source>Never display OSD</source>
-        <translation>Vis aldri skjermmeldinger</translation>
+        <translation type="obsolete">Vis aldri skjermmeldinger</translation>
     </message>
     <message>
         <source>KiB/s</source>
@@ -321,6 +321,22 @@ Copyright © 2006 av Christophe Dumez&lt;br&gt;
         <source>Audio/Video player:</source>
         <translation>Lyd/video avspiller:</translation>
     </message>
+    <message>
+        <source>Systray Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display systray messages only when window is hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GUI</name>
@@ -619,6 +635,19 @@ Vennligst avslutt denne først.</translation>
         <source>Transfers</source>
         <translation type="unfinished">Overføringer</translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished">er ferdig lastet ned.</translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/lang/qbittorrent_nl.ts

@@ -406,19 +406,19 @@ Copyright  2006 door Christophe Dumez<br>
     </message>
     <message>
         <source>OSD</source>
-        <translation>OSD</translation>
+        <translation type="obsolete">OSD</translation>
     </message>
     <message>
         <source>Always display OSD</source>
-        <translation>OSD altijd weergeven</translation>
+        <translation type="obsolete">OSD altijd weergeven</translation>
     </message>
     <message>
         <source>Display OSD only if window is minimized or iconified</source>
-        <translation>OSD alleen weergeven indien venster geminimaliseerd of in systeemvak</translation>
+        <translation type="obsolete">OSD alleen weergeven indien venster geminimaliseerd of in systeemvak</translation>
     </message>
     <message>
         <source>Never display OSD</source>
-        <translation>OSD nooit weergeven</translation>
+        <translation type="obsolete">OSD nooit weergeven</translation>
     </message>
     <message>
         <source>KiB/s</source>
@@ -452,6 +452,22 @@ Copyright  2006 door Christophe Dumez&lt;br&gt;
         <source>Audio/Video player:</source>
         <translation>Audio/Video Speler:</translation>
     </message>
+    <message>
+        <source>Systray Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display systray messages only when window is hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GUI</name>
@@ -828,6 +844,19 @@ Stop het eerste proccess eerst.
         <source>Transfers</source>
         <translation>Overdrachten</translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished"> is klaar met downloaden.</translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished">Zoekmachine</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/lang/qbittorrent_pl.ts

@@ -395,19 +395,19 @@ Wszystkie prawa zastrżeżone © 2006 Christophe Dumez<br>
     </message>
     <message>
         <source>OSD</source>
-        <translation>OSD</translation>
+        <translation type="obsolete">OSD</translation>
     </message>
     <message>
         <source>Always display OSD</source>
-        <translation>Zawsze wyświetlaj OSD</translation>
+        <translation type="obsolete">Zawsze wyświetlaj OSD</translation>
     </message>
     <message>
         <source>Display OSD only if window is minimized or iconified</source>
-        <translation>Wyświetlaj OSD tylko jeżeli okno jest zminimalizowane</translation>
+        <translation type="obsolete">Wyświetlaj OSD tylko jeżeli okno jest zminimalizowane</translation>
     </message>
     <message>
         <source>Never display OSD</source>
-        <translation>Nigdy nie wyświetlaj OSD</translation>
+        <translation type="obsolete">Nigdy nie wyświetlaj OSD</translation>
     </message>
     <message>
         <source>KiB/s</source>
@@ -441,6 +441,22 @@ Wszystkie prawa zastrżeżone © 2006 Christophe Dumez&lt;br&gt;
         <source>Audio/Video player:</source>
         <translation>Odtwarzacz multimedialny:</translation>
     </message>
+    <message>
+        <source>Systray Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display systray messages only when window is hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GUI</name>
@@ -849,6 +865,19 @@ Zamknij najpierw okno podglądu.</translation>
         <source>Transfers</source>
         <translation>Prędkość</translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished"> zakończył sciąganie.</translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished">Wyszukiwarka</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/lang/qbittorrent_pt.ts

@@ -291,19 +291,19 @@ Copyright ©2006 por Christophe Dumez<br>
     </message>
     <message>
         <source>OSD</source>
-        <translation>OSD</translation>
+        <translation type="obsolete">OSD</translation>
     </message>
     <message>
         <source>Always display OSD</source>
-        <translation>Sempre mostrar OSD</translation>
+        <translation type="obsolete">Sempre mostrar OSD</translation>
     </message>
     <message>
         <source>Display OSD only if window is minimized or iconified</source>
-        <translation>Mostrar OSD somente se minimizado ou em ícone</translation>
+        <translation type="obsolete">Mostrar OSD somente se minimizado ou em ícone</translation>
     </message>
     <message>
         <source>Never display OSD</source>
-        <translation>Nunca mostrar OSD</translation>
+        <translation type="obsolete">Nunca mostrar OSD</translation>
     </message>
     <message>
         <source>KiB/s</source>
@@ -337,6 +337,22 @@ Copyright ©2006 por Christophe Dumez&lt;br&gt;
         <source>Audio/Video player:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Systray Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display systray messages only when window is hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GUI</name>
@@ -690,6 +706,19 @@ Please close the other one first.</source>
         <source>Transfers</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished">concluiu o download.</translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished">Mecanismo de Busca</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/lang/qbittorrent_ro.ts

@@ -291,19 +291,19 @@ Copyright © 2006 by Christophe Dumez<br>
     </message>
     <message>
         <source>OSD</source>
-        <translation>OSD</translation>
+        <translation type="obsolete">OSD</translation>
     </message>
     <message>
         <source>Always display OSD</source>
-        <translation>Întotdeauna arata OSD</translation>
+        <translation type="obsolete">Întotdeauna arata OSD</translation>
     </message>
     <message>
         <source>Display OSD only if window is minimized or iconified</source>
-        <translation>Arata OSD numai cînd fereastra este minimizata sau iconificata</translation>
+        <translation type="obsolete">Arata OSD numai cînd fereastra este minimizata sau iconificata</translation>
     </message>
     <message>
         <source>Never display OSD</source>
-        <translation>Nici o data nu afiseaza OSD</translation>
+        <translation type="obsolete">Nici o data nu afiseaza OSD</translation>
     </message>
     <message>
         <source>KiB/s</source>
@@ -337,6 +337,22 @@ Copyright © 2006 by Christophe Dumez&lt;br&gt;
         <source>Audio/Video player:</source>
         <translation>Audio/Video player:</translation>
     </message>
+    <message>
+        <source>Systray Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display systray messages only when window is hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GUI</name>
@@ -692,6 +708,19 @@ Vă rugăm să-l opriţi.</translation>
         <source>Transfers</source>
         <translation>Transferuri</translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished"> am terminat descărcarea.</translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished">Motor de Căutare</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/lang/qbittorrent_ru.ts

@@ -342,19 +342,19 @@ Copyright © 2006 by Christophe Dumez<br>
     </message>
     <message>
         <source>OSD</source>
-        <translation>OSD</translation>
+        <translation type="obsolete">OSD</translation>
     </message>
     <message>
         <source>Always display OSD</source>
-        <translation>Всегда показывать OSD</translation>
+        <translation type="obsolete">Всегда показывать OSD</translation>
     </message>
     <message>
         <source>Display OSD only if window is minimized or iconified</source>
-        <translation>Показывать OSD только когда окно минимизировано</translation>
+        <translation type="obsolete">Показывать OSD только когда окно минимизировано</translation>
     </message>
     <message>
         <source>Never display OSD</source>
-        <translation>Никогда не показывать OSD</translation>
+        <translation type="obsolete">Никогда не показывать OSD</translation>
     </message>
     <message>
         <source>KiB/s</source>
@@ -388,6 +388,22 @@ Copyright © 2006 by Christophe Dumez&lt;br&gt;
         <source>Audio/Video player:</source>
         <translation>Аудио/Видео проигрователь:</translation>
     </message>
+    <message>
+        <source>Systray Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display systray messages only when window is hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GUI</name>
@@ -779,6 +795,19 @@ Please close the other one first.</source>
         <source>Transfers</source>
         <translation>Передачи</translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished"> скачивание завершено.</translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished">Поисковик</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/lang/qbittorrent_sk.ts

@@ -300,19 +300,19 @@ Copyright © 2006 by Christophe Dumez<br>
     </message>
     <message>
         <source>OSD</source>
-        <translation>OSD</translation>
+        <translation type="obsolete">OSD</translation>
     </message>
     <message>
         <source>Always display OSD</source>
-        <translation>Vždy zobrazuj OSD</translation>
+        <translation type="obsolete">Vždy zobrazuj OSD</translation>
     </message>
     <message>
         <source>Display OSD only if window is minimized or iconified</source>
-        <translation>Zobrazuj OSD iba keď je okno minimalizované alebo ikonifikované</translation>
+        <translation type="obsolete">Zobrazuj OSD iba keď je okno minimalizované alebo ikonifikované</translation>
     </message>
     <message>
         <source>Never display OSD</source>
-        <translation>Nikdy nezobrazuj OSD</translation>
+        <translation type="obsolete">Nikdy nezobrazuj OSD</translation>
     </message>
     <message>
         <source>KiB/s</source>
@@ -346,6 +346,22 @@ Copyright © 2006 by Christophe Dumez&lt;br&gt;
         <source>Audio/Video player:</source>
         <translation>Audio/Video prehrávač:</translation>
     </message>
+    <message>
+        <source>Systray Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display systray messages only when window is hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GUI</name>
@@ -712,6 +728,19 @@ Najskôr ho prosím zatvorte.</translation>
         <source>Please wait...</source>
         <translation>Čakajte prosím...</translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished"> skončilo sťahovanie.</translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished">Vyhad</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/lang/qbittorrent_sv.ts

@@ -282,19 +282,19 @@ Copyright © 2006 by Christophe Dumez<br>
     </message>
     <message>
         <source>OSD</source>
-        <translation>OSD</translation>
+        <translation type="obsolete">OSD</translation>
     </message>
     <message>
         <source>Always display OSD</source>
-        <translation>Visa alltid OSD</translation>
+        <translation type="obsolete">Visa alltid OSD</translation>
     </message>
     <message>
         <source>Display OSD only if window is minimized or iconified</source>
-        <translation>Visa endast OSD om ett fönster är minimerat eller ikonifierat</translation>
+        <translation type="obsolete">Visa endast OSD om ett fönster är minimerat eller ikonifierat</translation>
     </message>
     <message>
         <source>Never display OSD</source>
-        <translation>Visa aldrig OSD</translation>
+        <translation type="obsolete">Visa aldrig OSD</translation>
     </message>
     <message>
         <source>KiB/s</source>
@@ -328,6 +328,22 @@ Copyright © 2006 by Christophe Dumez&lt;br&gt;
         <source>Audio/Video player:</source>
         <translation>Ljud-/videospelare:</translation>
     </message>
+    <message>
+        <source>Systray Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display systray messages only when window is hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GUI</name>
@@ -626,6 +642,19 @@ Stäng den först.</translation>
         <source>Transfers</source>
         <translation>Överföringar</translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished"> har hämtats färdigt.</translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/lang/qbittorrent_tr.ts

@@ -396,19 +396,19 @@ Telif Hakkı © 2006 Christophe Dumez<br>
     </message>
     <message>
         <source>OSD</source>
-        <translation>OSD</translation>
+        <translation type="obsolete">OSD</translation>
     </message>
     <message>
         <source>Always display OSD</source>
-        <translation>Her zaman OSD yi göster</translation>
+        <translation type="obsolete">Her zaman OSD yi göster</translation>
     </message>
     <message>
         <source>Display OSD only if window is minimized or iconified</source>
-        <translation>OSD yi sadece pencere küçültülmüşken ya da simge durumundayken göster</translation>
+        <translation type="obsolete">OSD yi sadece pencere küçültülmüşken ya da simge durumundayken göster</translation>
     </message>
     <message>
         <source>Never display OSD</source>
-        <translation>OSD yi asla gösterme</translation>
+        <translation type="obsolete">OSD yi asla gösterme</translation>
     </message>
     <message>
         <source>KiB/s</source>
@@ -442,6 +442,22 @@ Telif Hakkı © 2006 Christophe Dumez&lt;br&gt;
         <source>Audio/Video player:</source>
         <translation>Ses/Video oynatıcısı:</translation>
     </message>
+    <message>
+        <source>Systray Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display systray messages only when window is hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GUI</name>
@@ -857,6 +873,19 @@ Lütfen önce diğerini kapatın.</translation>
         <source>Transfers</source>
         <translation>Aktarımlar</translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished"> download tamamlandı.</translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished">Arama Motoru</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/lang/qbittorrent_uk.ts

@@ -338,19 +338,19 @@ Copyright © 2006 by Christophe Dumez<br>
     </message>
     <message>
         <source>OSD</source>
-        <translation>OSD</translation>
+        <translation type="obsolete">OSD</translation>
     </message>
     <message>
         <source>Always display OSD</source>
-        <translation>Завжди показувати OSD</translation>
+        <translation type="obsolete">Завжди показувати OSD</translation>
     </message>
     <message>
         <source>Display OSD only if window is minimized or iconified</source>
-        <translation>Показувати OSD лише коли вікно мінімізовано</translation>
+        <translation type="obsolete">Показувати OSD лише коли вікно мінімізовано</translation>
     </message>
     <message>
         <source>Never display OSD</source>
-        <translation>Ніколи не показувати OSD</translation>
+        <translation type="obsolete">Ніколи не показувати OSD</translation>
     </message>
     <message>
         <source>KiB/s</source>
@@ -384,6 +384,22 @@ Copyright © 2006 by Christophe Dumez&lt;br&gt;
         <source>Audio/Video player:</source>
         <translation>Аудіо/Відео плеєр:</translation>
     </message>
+    <message>
+        <source>Systray Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display systray messages only when window is hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GUI</name>
@@ -787,6 +803,19 @@ Please close the other one first.</source>
         <source>Transfers</source>
         <translation>Трансфери</translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished">завантажено.</translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished">Пошуковик</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/lang/qbittorrent_zh.ts

@@ -325,19 +325,19 @@ Copyright © 2006 by Christophe Dumez<br>
     </message>
     <message>
         <source>OSD</source>
-        <translation>OSD</translation>
+        <translation type="obsolete">OSD</translation>
     </message>
     <message>
         <source>Always display OSD</source>
-        <translation>总是显示OSD</translation>
+        <translation type="obsolete">总是显示OSD</translation>
     </message>
     <message>
         <source>Display OSD only if window is minimized or iconified</source>
-        <translation>仅当窗口为最小化或为图标时显示OSD</translation>
+        <translation type="obsolete">仅当窗口为最小化或为图标时显示OSD</translation>
     </message>
     <message>
         <source>Never display OSD</source>
-        <translation>从不显示OSD</translation>
+        <translation type="obsolete">从不显示OSD</translation>
     </message>
     <message>
         <source>KiB/s</source>
@@ -371,6 +371,22 @@ Copyright © 2006 by Christophe Dumez&lt;br&gt;
         <source>Audio/Video player:</source>
         <translation>音频/视频播放器:</translation>
     </message>
+    <message>
+        <source>Systray Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display systray messages only when window is hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GUI</name>
@@ -745,6 +761,19 @@ Please close the other one first.</source>
         <source>Transfers</source>
         <translation>传输</translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished"> 下载完毕.</translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished">搜索引擎</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/lang/qbittorrent_zh_HK.ts

@@ -325,19 +325,19 @@ Copyright © 2006 by Christophe Dumez<br>
     </message>
     <message>
         <source>OSD</source>
-        <translation>OSD</translation>
+        <translation type="obsolete">OSD</translation>
     </message>
     <message>
         <source>Always display OSD</source>
-        <translation>永遠顯示OSD</translation>
+        <translation type="obsolete">永遠顯示OSD</translation>
     </message>
     <message>
         <source>Display OSD only if window is minimized or iconified</source>
-        <translation>顯示OSD當視窗最小化</translation>
+        <translation type="obsolete">顯示OSD當視窗最小化</translation>
     </message>
     <message>
         <source>Never display OSD</source>
-        <translation>不要顯示OSD</translation>
+        <translation type="obsolete">不要顯示OSD</translation>
     </message>
     <message>
         <source>KiB/s</source>
@@ -371,6 +371,22 @@ Copyright © 2006 by Christophe Dumez&lt;br&gt;
         <source>Audio/Video player:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Systray Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display systray messages only when window is hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never display systray messages</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GUI</name>
@@ -726,6 +742,19 @@ Please close the other one first.</source>
         <source>Transfers</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> has finished downloading.</source>
+        <comment>&lt;filename&gt; has finished downloading.</comment>
+        <translation type="unfinished"> 下載完畢.</translation>
+    </message>
+    <message>
+        <source>Search Engine</source>
+        <translation type="unfinished">搜索引擎</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>

src/options.ui

@@ -1,7 +1,4 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>Dialog</class>
  <widget class="QDialog" name="Dialog" >
   <property name="geometry" >
@@ -79,7 +76,6 @@
         <number>6</number>
        </property>
        <item>
-        <widget class="QWidget" name="widgeta" >
         <layout class="QHBoxLayout" >
          <property name="margin" >
           <number>0</number>
@@ -122,7 +118,6 @@
           </layout>
          </item>
         </layout>
-        </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="groupBox" >
@@ -143,7 +138,6 @@
            <number>6</number>
           </property>
           <item>
-           <widget class="QWidget" name="widgetb" >
            <layout class="QHBoxLayout" >
             <property name="margin" >
              <number>0</number>
@@ -504,16 +498,16 @@
                    <number>1</number>
                   </property>
                   <property name="maximum" >
-                    <double>99.9</double>
+                   <double>99.900000000000006</double>
                   </property>
                   <property name="minimum" >
-                    <double>1</double>
+                   <double>1.000000000000000</double>
                   </property>
                   <property name="singleStep" >
-                    <double>0.1</double>
+                   <double>0.100000000000000</double>
                   </property>
                   <property name="value" >
-                    <double>1</double>
+                   <double>1.000000000000000</double>
                   </property>
                  </widget>
                 </item>
@@ -565,7 +559,6 @@
              </layout>
             </item>
            </layout>
-           </widget>
           </item>
          </layout>
         </widget>
@@ -578,7 +571,6 @@
         </widget>
        </item>
        <item>
-        <widget class="QWidget" name="scanDirWidget" >
         <layout class="QHBoxLayout" >
          <property name="margin" >
           <number>0</number>
@@ -627,7 +619,6 @@
           </layout>
          </item>
         </layout>
-        </widget>
        </item>
       </layout>
      </widget>
@@ -712,7 +703,6 @@
            </widget>
           </item>
           <item>
-           <widget class="QWidget" name="widgetc" >
            <layout class="QHBoxLayout" >
             <property name="margin" >
              <number>0</number>
@@ -761,10 +751,8 @@
              </spacer>
             </item>
            </layout>
-           </widget>
           </item>
           <item>
-           <widget class="QWidget" name="widgetd" >
            <layout class="QHBoxLayout" >
             <property name="margin" >
              <number>0</number>
@@ -790,7 +778,6 @@
              </widget>
             </item>
            </layout>
-           </widget>
           </item>
          </layout>
         </widget>
@@ -831,7 +818,6 @@
            <number>6</number>
           </property>
           <item>
-           <widget class="QWidget" name="proxy_server" >
            <layout class="QHBoxLayout" >
             <property name="margin" >
              <number>0</number>
@@ -903,7 +889,6 @@
              </spacer>
             </item>
            </layout>
-           </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="enableProxyAuth_checkBox" >
@@ -928,7 +913,6 @@
               <number>6</number>
              </property>
              <item>
-              <widget class="QWidget" name="proxy_auth" >
               <layout class="QHBoxLayout" >
                <property name="margin" >
                 <number>0</number>
@@ -997,7 +981,6 @@
                 </layout>
                </item>
               </layout>
-              </widget>
              </item>
             </layout>
            </widget>
@@ -1025,6 +1008,14 @@
        <string>Misc</string>
       </attribute>
       <widget class="QGroupBox" name="groupBox_2" >
+       <property name="geometry" >
+        <rect>
+         <x>0</x>
+         <y>0</y>
+         <width>452</width>
+         <height>66</height>
+        </rect>
+       </property>
        <property name="title" >
         <string>Localization</string>
        </property>
@@ -1069,7 +1060,7 @@
              <enum>QComboBox::AdjustToContents</enum>
             </property>
             <property name="modelColumn" >
-             <bool>false</bool>
+             <number>0</number>
             </property>
            </widget>
           </item>
@@ -1199,7 +1190,7 @@
         </rect>
        </property>
        <property name="title" >
-        <string>OSD</string>
+        <string>Systray Messages</string>
        </property>
        <layout class="QVBoxLayout" >
         <property name="margin" >
@@ -1211,7 +1202,7 @@
         <item>
          <widget class="QRadioButton" name="alwaysOSD" >
           <property name="text" >
-           <string>Always display OSD</string>
+           <string>Always display systray messages</string>
           </property>
           <property name="checked" >
            <bool>true</bool>
@@ -1221,14 +1212,14 @@
         <item>
          <widget class="QRadioButton" name="someOSD" >
           <property name="text" >
-           <string>Display OSD only if window is minimized or iconified</string>
+           <string>Display systray messages only when window is hidden</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QRadioButton" name="neverOSD" >
           <property name="text" >
-           <string>Never display OSD</string>
+           <string>Never display systray messages</string>
           </property>
          </widget>
         </item>
@@ -1299,7 +1290,6 @@
    </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <resources/>
  <connections/>
 </ui>

src/src.pro

@@ -90,7 +90,7 @@ TRANSLATIONS = $$LANG_PATH/qbittorrent_fr.ts \
 
 # Source code
 HEADERS += GUI.h misc.h options_imp.h about_imp.h \
-           properties_imp.h createtorrent_imp.h OSD.h \
+           properties_imp.h createtorrent_imp.h \
            DLListDelegate.h SearchListDelegate.h \
 	   PropListDelegate.h previewSelect.h \
            PreviewListDelegate.h trackerLogin.h \
@@ -102,6 +102,5 @@ SOURCES += GUI.cpp \
            main.cpp \
            options_imp.cpp \
 	   properties_imp.cpp \
-	   createtorrent_imp.cpp \
+	   createtorrent_imp.cpp
-           OSD.cpp