- Fixed crash when closing the main window without the setting "Minimize to Tray Icon"

- Renamed the setting "Do not Minimize to Tray Icon" to "Minimize to Tray Icon" and fixed wrong usage
  Please check your setting!
- Updated english translation


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6557 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/MainWindow.cpp

@@ -1012,30 +1012,26 @@ void MainWindow::displayErrorMessage(int /*a*/,int /*b*/,const QString& error_ms
 
 void MainWindow::closeEvent(QCloseEvent *e)
 {
-    static bool firstTime = true;
+    e->ignore();
 
-   if(!Settings->getCloseToTray())
-   {
-      if (trayIcon->isVisible()) {
-          if (firstTime)
-          {
+    if (Settings->getCloseToTray())
+    {
+        if (trayIcon->isVisible()) {
 /*****
-            QMessageBox::information(this, tr("RetroShare System tray"),
-            tr("Application will continue running. Quit using context menu in the system tray"));
-*****/
-            firstTime = false;
-          }
-          hide();
-          e->ignore();
-      }
-   }
-   else   
-   {
-       rsicontrol->rsGlobalShutDown();
-       rApp->quit();
-   }
-   
+            static bool firstTime = true;
 
+            if (firstTime)
+            {
+                QMessageBox::information(this, tr("RetroShare System tray"), tr("Application will continue running. Quit using context menu in the system tray"));
+                firstTime = false;
+            }
+*****/
+            hide();
+        }
+        return;
+    }
+
+    doQuit();
 }
 
 void MainWindow::updateMenu()