Merge branch 'master' of github.com:trueos/lumina

12 files changed, 45 insertions, 45 deletions

diff --git a/src-qt5/core-utils/lumina-config/i18n/lumina-config_es.ts b/src-qt5/core-utils/lumina-config/i18n/lumina-config_es.ts
index 1ceab98a..ef899209 100644
--- a/src-qt5/core-utils/lumina-config/i18n/lumina-config_es.ts
+++ b/src-qt5/core-utils/lumina-config/i18n/lumina-config_es.ts
@@ -83,7 +83,7 @@
         <location filename="../ColorDialog.cpp" line="121"/>
         <location filename="../ColorDialog.cpp" line="122"/>
         <source>Select Color</source>
-        <translation>Seleccione Color</translation>
+        <translation>Seleccionar Color</translation>
     </message>
     <message>
         <location filename="../ColorDialog.cpp" line="142"/>
@@ -345,7 +345,7 @@
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="67"/>
-        <source>Start menu alternative focusing on the user&apos;s files, directories, and favorites.</source>
+        <source>Start menu alternative focusing on the user's files, directories, and favorites.</source>
         <translation>Iniciar alternativa de menú enfocándose en los archivos del usuario, directorios y favoritos.</translation>
     </message>
     <message>
@@ -1234,12 +1234,12 @@ Sobrescribirlo?</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.ui" line="244"/>
-        <source>&quot;Mod1&quot;:	Alt key
-&quot;Mod4&quot;: 	Windows/Mac key
-&quot;Control&quot;:	Ctrl key</source>
-        <translation>&quot;Mod1&quot;:	Alt key
-&quot;Mod4&quot;: 	Windows/Mac key
-&quot;Control&quot;:	Ctrl key</translation>
+        <source>"Mod1":	Alt key
+"Mod4": 	Windows/Mac key
+"Control":	Ctrl key</source>
+        <translation>"Mod1":	Alt key
+"Mod4": 	Windows/Mac key
+"Control":	Ctrl key</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.cpp" line="70"/>
diff --git a/src-qt5/core-utils/lumina-search/i18n/lumina-search_es.ts b/src-qt5/core-utils/lumina-search/i18n/lumina-search_es.ts
index 20f12c83..778b5102 100644
--- a/src-qt5/core-utils/lumina-search/i18n/lumina-search_es.ts
+++ b/src-qt5/core-utils/lumina-search/i18n/lumina-search_es.ts
@@ -90,7 +90,7 @@
         <location filename="../MainUI.ui" line="122"/>
         <location filename="../MainUI.ui" line="125"/>
         <source>Save Screenshot</source>
-        <translation>Guardar Captura de Pantalla</translation>
+        <translation type="unfinished">Guardar la Captura de Pantalla</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="128"/>
diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp
index 0ac8aaeb..2c36af80 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp
@@ -109,6 +109,7 @@ void LScreenSaver::ShowScreenSaver(){
     if(DEBUG){ qDebug() << " - New SS Base:" << i; }
     BASES << new SSBaseWidget(this, settings);
     connect(BASES[i], SIGNAL(InputDetected()), this, SLOT(newInputEvent()) );
+    
     //Setup the geometry of the base to match the screen
     BASES[i]->setGeometry(SCREENS[i]->geometry());  //match this screen geometry
     BASES[i]->setPlugin(settings->value("screenplugin"+QString::number(i+1), settings->value("defaultscreenplugin","random").toString() ).toString() );
diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp
index 9ef0c491..7854b597 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp
@@ -39,8 +39,7 @@ void SSBaseWidget::startPainting(){
   cplug = plugType;
   //free up any old animation instance
   if(ANIM!=0){
-    ANIM->stop(); ANIM->clear();
-    delete ANIM; ANIM = 0;
+    stopPainting();
   }
   //If a random plugin - grab one of the known plugins
   if(cplug=="random"){
diff --git a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_el.ts b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_el.ts
index 3874ede1..3ff1ef03 100644
--- a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_el.ts
+++ b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_el.ts
@@ -36,12 +36,12 @@
         <location filename="../MainUI.cpp" line="65"/>
         <location filename="../MainUI.cpp" line="276"/>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>Αρχείο</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="134"/>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Επεξεργασία</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="145"/>
diff --git a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_es.ts b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_es.ts
index 06057adf..d1a78287 100644
--- a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_es.ts
+++ b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_es.ts
@@ -29,64 +29,64 @@
     <message>
         <location filename="../MainUI.ui" line="35"/>
         <source>Archive:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Archivo comprimido:</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="125"/>
         <location filename="../MainUI.cpp" line="65"/>
         <location filename="../MainUI.cpp" line="276"/>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>Archivo</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="134"/>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="145"/>
         <source>Burn to Disk</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Quemar al Disco</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="178"/>
         <source>&amp;Open Archive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Abrir Archivo comprimido</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="181"/>
         <source>Open archive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Abrir archivo comprimido</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="186"/>
         <source>&amp;New Archive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Nuevo Archivo comprimido</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="189"/>
         <source>New archive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nuevo Archivo comprimido</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="194"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Quitar</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="199"/>
         <source>Add File(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>Añadir Archivo(s)</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="202"/>
         <source>Add files to archive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Añadir archivos al archivo comprimido</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="207"/>
         <source>Remove File(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>Remover Archivo(s)</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="210"/>
diff --git a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp
index 06f16ad1..d5f219bb 100644
--- a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp
@@ -275,7 +275,7 @@ void BrowserWidget::itemDataAvailable(QIcon ico, LFileInfo *info){
   int num = 0;
   if(listWidget!=0){
     //LIST WIDGET - name and icon only
-    if(info->isDesktopFile() && info.XDG()->isValid()){
+    if(info->isDesktopFile() && info->XDG()->isValid()){
       QList<QListWidgetItem*> items = listWidget->findItems(info->XDG()->name, Qt::MatchExactly);
       //Could be multiple items with the same text in this case - check paths as well
       bool found = false;
diff --git a/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_el.ts b/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_el.ts
index 02de6b9d..d460b6c5 100644
--- a/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_el.ts
+++ b/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_el.ts
@@ -154,17 +154,17 @@
     <message>
         <location filename="../mainUI.ui" line="681"/>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>Αρχείο</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="688"/>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Προβολή</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="699"/>
         <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <translation>Μπάρα Εργαλείων</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="726"/>
diff --git a/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_es.ts b/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_es.ts
index eaa89e7a..f45dd9d0 100644
--- a/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_es.ts
+++ b/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_es.ts
@@ -159,12 +159,12 @@
     <message>
         <location filename="../mainUI.ui" line="688"/>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="699"/>
         <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <translation>Barra de Herramientas</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="726"/>
@@ -219,7 +219,7 @@
     <message>
         <location filename="../mainUI.ui" line="770"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="784"/>
diff --git a/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_fr.ts b/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_fr.ts
index 753476cc..202bde66 100644
--- a/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_fr.ts
+++ b/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_fr.ts
@@ -7,24 +7,24 @@
         <location filename="../mainUI.ui" line="14"/>
         <location filename="../mainUI.cpp" line="285"/>
         <source>Media Player</source>
-        <translation type="unfinished"></translation>
+        <translation>Lecteur Multimédia</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="50"/>
         <location filename="../mainUI.ui" line="261"/>
         <location filename="../mainUI.cpp" line="631"/>
         <source>Now Playing</source>
-        <translation type="unfinished"></translation>
+        <translation>Lecture en Cours</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="74"/>
         <source>(No Running Video)</source>
-        <translation type="unfinished"></translation>
+        <translation>Pas de Vidéo en Cours d'Exécution</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="105"/>
         <source>Playlist</source>
-        <translation type="unfinished"></translation>
+        <translation>Playlist</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="167"/>
@@ -154,7 +154,7 @@
     <message>
         <location filename="../mainUI.ui" line="681"/>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>Fichier</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="688"/>
@@ -164,7 +164,7 @@
     <message>
         <location filename="../mainUI.ui" line="699"/>
         <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <translation>Barre d'outils</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="726"/>
diff --git a/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_ru.ts b/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_ru.ts
index 8c0859f3..4cbc8899 100644
--- a/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_ru.ts
+++ b/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_ru.ts
@@ -104,7 +104,7 @@
     <message>
         <location filename="../mainUI.ui" line="512"/>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="521"/>
@@ -159,12 +159,12 @@
     <message>
         <location filename="../mainUI.ui" line="688"/>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Вид</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="699"/>
         <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <translation>Панель инструментов</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="726"/>
@@ -214,7 +214,7 @@
     <message>
         <location filename="../mainUI.ui" line="767"/>
         <source>Close Application</source>
-        <translation type="unfinished"></translation>
+        <translation>Закрыть приложение</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="770"/>
diff --git a/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_zh_CN.ts b/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_zh_CN.ts
index 68c93782..5730b72f 100644
--- a/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_zh_CN.ts
+++ b/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_zh_CN.ts
@@ -104,7 +104,7 @@
     <message>
         <location filename="../mainUI.ui" line="512"/>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>设置</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="521"/>
@@ -159,7 +159,7 @@
     <message>
         <location filename="../mainUI.ui" line="688"/>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>查看</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="699"/>
@@ -214,7 +214,7 @@
     <message>
         <location filename="../mainUI.ui" line="767"/>
         <source>Close Application</source>
-        <translation type="unfinished"></translation>
+        <translation>关闭应用程序</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="770"/>