updated french traslation

resources/i18n/sankore_fr.ts

@@ -2795,7 +2795,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Proxy User:</source>
-        <translation>Nom d&apos;utilisateur :</translation>
+        <translation>Proxy :</translation>
     </message>
     <message>
         <source>Pass:</source>
@@ -2807,7 +2807,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>User:</source>
-        <translation>Nom d&apos;utilisateur proxy :</translation>
+        <translation>Nom d&apos;utilisateur :</translation>
     </message>
     <message>
         <source>Pass: </source>
@@ -3401,7 +3401,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message utf8="true">
         <source>Planète Sankoré ID for exporting file</source>
-        <translation>Identifiant Planète Sankoré pour l'export de fichier</translation>
+        <translation>Identifiant Planète Sankoré pour l&apos;export de fichier</translation>
     </message>
     <message>
         <source>Restore credentials on reboot  </source>
@@ -3416,7 +3416,14 @@ p, li { white-space: pre-wrap; }
 &lt;tr&gt;
 &lt;td style=&quot;border: none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;The licences are in English to respect the official and legal approved translation.&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
+&lt;tr&gt;
+&lt;td style=&quot;border: none;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;Les licences sont en anglais pour respecter la traduction officielle et légale approuvée.&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;

src/core/UBDisplayManager.cpp

@@ -129,25 +129,13 @@ int UBDisplayManager::numPreviousViews()
 void UBDisplayManager::setControlWidget(QWidget* pControlWidget)
 {
     if(hasControl() && pControlWidget && (pControlWidget != mControlWidget))
-    {
         mControlWidget = pControlWidget;
-		// !!!! Should be included into Windows after QT recompilation
-#ifdef Q_WS_MAC
-//        mControlWidget->setAttribute(Qt::WA_MacNoShadow);
-#endif
-    }
 }
 
 void UBDisplayManager::setDesktopWidget(QWidget* pControlWidget )
 {
     if(pControlWidget && (pControlWidget != mControlWidget))
-    {
         mDesktopWidget = pControlWidget;
-        // !!!! Should be included into Windows after QT recompilation
-#ifdef Q_WS_MAC
-        //        mControlWidget->setAttribute(Qt::WA_MacNoShadow);
-#endif
-    }
 }
 
 void UBDisplayManager::setDisplayWidget(QWidget* pDisplayWidget)
@@ -164,10 +152,6 @@ void UBDisplayManager::setDisplayWidget(QWidget* pDisplayWidget)
         mDisplayWidget->setGeometry(mDesktop->screenGeometry(mDisplayScreenIndex));
         if (UBSettings::settings()->appUseMultiscreen->get().toBool())
             mDisplayWidget->showFullScreen();
-		// !!!! Should be included into Windows after QT recompilation
-#ifdef Q_WS_MAC
-//        mDisplayWidget->setAttribute(Qt::WA_MacNoShadow);
-#endif
     }
 }
 

src/gui/UBScreenMirror.cpp

@@ -106,7 +106,6 @@ void UBScreenMirror::grabPixmap()
 
     mLastPixmap = QPixmap::fromMacCGImageRef(windowImage);
 #else
-
     mLastPixmap = QPixmap::grabWindow(windowID, mRect.x(), mRect.y(), mRect.width(), mRect.height());
 #endif
     mLastPixmap = mLastPixmap.scaled(width(), height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
@@ -145,7 +144,7 @@ void UBScreenMirror::start()
     }
     else
     {
-        qDebug() << "UBScreenMirror::start() : Timer alrady running ...";
+        qDebug() << "UBScreenMirror::start() : Timer already running ...";
     }
 }