Merge remote-tracking branch 'origin/master'

15 files changed, 691 insertions, 717 deletions

diff --git a/src-qt5/core/libLumina/LuminaThemes.cpp b/src-qt5/core/libLumina/LuminaThemes.cpp
index b6c18cf0..03dfb771 100644
--- a/src-qt5/core/libLumina/LuminaThemes.cpp
+++ b/src-qt5/core/libLumina/LuminaThemes.cpp
@@ -15,6 +15,8 @@
 #include <QPainter>
 #include <QPen>
 
+#include "LuminaXDG.h"
+
 #include <unistd.h>
 
 //Stuff necesary for Qt Cursor Reloads
@@ -292,6 +294,8 @@ QStringList LTHEME::CustomEnvSettings(bool useronly){ //view all the key=value s
 }
 
 void LTHEME::LoadCustomEnvSettings(){
+  //Also ensure that the normal XDG_* environment variables are setup (will not overwrite them if already there)
+  LXDG::setEnvironmentVars();
   //will push the custom settings into the environment (recommended before loading the initial QApplication)
   QStringList info = LTHEME::CustomEnvSettings(false); //all settings
   if(info.isEmpty()){
diff --git a/src-qt5/core/libLumina/LuminaUtils.cpp b/src-qt5/core/libLumina/LuminaUtils.cpp
index dd4c75c4..8a35be6b 100644
--- a/src-qt5/core/libLumina/LuminaUtils.cpp
+++ b/src-qt5/core/libLumina/LuminaUtils.cpp
@@ -214,6 +214,7 @@ QString LUtils::PathToAbsolute(QString path){
   }
   return path;
 }
+
 QString LUtils::AppToAbsolute(QString path){
   if(path.startsWith("~/")){ path = path.replace("~/", QDir::homePath()+"/" ); }
   if(path.startsWith("/") || QFile::exists(path)){ return path; }
diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp
index 96f77ff9..790b386e 100644
--- a/src-qt5/core/libLumina/LuminaXDG.cpp
+++ b/src-qt5/core/libLumina/LuminaXDG.cpp
@@ -586,287 +586,6 @@ bool LFileInfo::isAVFile(){
 
 
 //==== LXDG Functions ====
-/*XDGDesktop *LXDG::loadDesktopFile(QString filePath, bool& ok, QObject *parent){
-  //Create the outputs
-  ok=false;
-  XDGDesktop *DF = new XDGDesktop(parent);
-    DF->isHidden=false;
-    DF->useTerminal=false;
-    DF->startupNotify=false;
-    DF->type = XDGDesktop::APP;
-    DF->filePath = filePath;
-    DF->lastRead = QDateTime::currentDateTime();
-    DF->exec = DF->tryexec = "";   // just to make sure this is initialized
-
-  //Get the current localization code
-  QString lang = QLocale::system().name(); //lang code
-  QString slang = lang.section("_",0,0); //short lang code
-
-  //Read in the File
-  bool insection=false;
-  bool inaction=false;
-  QStringList file = LUtils::readFile(filePath);
-  if(file.isEmpty()){ return DF; }
-  //if(filePath.contains("pcbsd")){ qDebug() << "Check File:" << filePath << lang << slang; }
-  XDGDesktopAction CDA; //current desktop action
-  for(int i=0; i<file.length(); i++){
-    QString line = file[i];
-    //if(filePath.contains("pcbsd")){ qDebug() << " - Check Line:" << line << inaction << insection; }
-    //Check if this is the end of a section
-    if(line.startsWith("[") && inaction){ 
-      insection=false; inaction=false;
-      //Add the current Action structure to the main desktop structure if appropriate
-      if(!CDA.ID.isEmpty()){ DF->actions << CDA; CDA = XDGDesktopAction(); }
-    }else if(line.startsWith("[")){ insection=false; inaction = false; }
-    //Now check if this is the beginning of a section
-    if(line=="[Desktop Entry]"){ insection=true; continue; }
-    else if(line.startsWith("[Desktop Action ")){ 
-      //Grab the ID of the action out of the label
-      CDA.ID = line.section("]",0,0).section("Desktop Action",1,1).simplified();
-      inaction = true;
-      continue;
-    }else if( (!insection && !inaction) || line.startsWith("#")){ continue; }
-    //Now parse out the file
-    line = line.simplified();
-    QString var = line.section("=",0,0).simplified();
-    QString loc = var.section("[",1,1).section("]",0,0).simplified(); // localization
-    var = var.section("[",0,0).simplified(); //remove the localization
-    QString val = line.section("=",1,50).simplified();
-    //-------------------
-    if(var=="Name"){ 
-      if(insection){
-        if(DF->name.isEmpty() && loc.isEmpty()){ DF->name = val; }
-	else if(DF->name.isEmpty() && loc==slang){ DF->name = val; } //short locale code
-        else if(loc == lang){ DF->name = val; }
-      }else if(inaction){
-        if(CDA.name.isEmpty() && loc.isEmpty()){ CDA.name = val; }
-	else if(CDA.name.isEmpty() && loc==slang){ CDA.name = val; } //short locale code
-        else if(loc == lang){ CDA.name = val; }	      
-      }
-      //hasName = true;
-    }else if(var=="GenericName" && insection){ 
-      if(DF->genericName.isEmpty() && loc.isEmpty()){ DF->genericName = val; }
-      else if(DF->genericName.isEmpty() && loc==slang){ DF->genericName = val; } //short locale code
-      else if(loc == lang){ DF->genericName = val; }
-    }else if(var=="Comment" && insection){ 
-      if(DF->comment.isEmpty() && loc.isEmpty()){ DF->comment = val; }
-      else if(DF->comment.isEmpty() && loc==slang){ DF->comment = val; } //short locale code
-      else if(loc == lang){ DF->comment = val; }
-    }else if(var=="Icon"){ 
-      if(insection){
-        if(DF->icon.isEmpty() && loc.isEmpty()){ DF->icon = val; }
-	else if(DF->icon.isEmpty() && loc==slang){ DF->icon = val; } //short locale code
-        else if(loc == lang){ DF->icon = val; }
-      }else if(inaction){
-	if(CDA.icon.isEmpty() && loc.isEmpty()){ CDA.icon = val; }
-	else if(CDA.icon.isEmpty() && loc==slang){ CDA.icon = val; } //short locale code
-        else if(loc == lang){ CDA.icon = val; }
-      }
-    }
-    else if( (var=="TryExec") && (DF->tryexec.isEmpty()) && insection) { DF->tryexec = val; }
-    else if(var=="Exec"){
-      if(insection && DF->exec.isEmpty() ){ DF->exec = val; }
-      else if(inaction && CDA.exec.isEmpty() ){ CDA.exec = val; }
-    }	    
-    else if( (var=="Path") && (DF->path.isEmpty() ) && insection){ DF->path = val; }
-    else if(var=="NoDisplay" && !DF->isHidden && insection){ DF->isHidden = (val.toLower()=="true"); }
-    else if(var=="Hidden" && !DF->isHidden && insection){ DF->isHidden = (val.toLower()=="true"); }
-    else if(var=="Categories" && insection){ DF->catList = val.split(";",QString::SkipEmptyParts); }
-    else if(var=="OnlyShowIn" && insection){ DF->showInList = val.split(";",QString::SkipEmptyParts); }
-    else if(var=="NotShowIn" && insection){ DF->notShowInList = val.split(";",QString::SkipEmptyParts); }
-    else if(var=="Terminal" && insection){ DF->useTerminal= (val.toLower()=="true"); }
-    else if(var=="Actions" && insection){ DF->actionList = val.split(";",QString::SkipEmptyParts); }
-    else if(var=="MimeType" && insection){ DF->mimeList = val.split(";",QString::SkipEmptyParts); }
-    else if(var=="Keywords" && insection){ 
-      if(DF->keyList.isEmpty() && loc.isEmpty()){ DF->keyList = val.split(";",QString::SkipEmptyParts); }
-      else if(loc == lang){ DF->keyList = val.split(";",QString::SkipEmptyParts); }
-    }
-    else if(var=="StartupNotify" && insection){ DF->startupNotify = (val.toLower()=="true"); }
-    else if(var=="StartupWMClass" && insection){ DF->startupWM = val; }
-    else if(var=="URL" && insection){ DF->url = val;}
-    else if(var=="Type" && insection){
-      if(val.toLower()=="application"){ DF->type = XDGDesktop::APP; }
-      else if(val.toLower()=="link"){ DF->type = XDGDesktop::LINK; }
-      else if(val.toLower()=="dir"){ DF->type = XDGDesktop::DIR; }
-      else{ DF->type = XDGDesktop::BAD; } //Unknown type
-      //hasType = true;
-    }
-  } //end reading file
-  file.clear(); //done with contents of file
-  //If there are OnlyShowIn desktops listed, add them to the name
-  if( !DF->showInList.isEmpty() && !DF->showInList.contains("Lumina", Qt::CaseInsensitive) ){
-      DF->name.append(" ("+DF->showInList.join(", ")+")"); 
-  }
-  //Quick fix for showing "wine" applications (which quite often don't list a category, or have other differences)
-  if(DF->catList.isEmpty() && filePath.contains("/wine/")){
-    DF->catList << "Wine"; //Internal Lumina category only (not in XDG specs as of 11/14/14)
-    //Also add a fix for the location of Wine icons
-    if( !DF->icon.isEmpty() ){
-      QStringList sizes; sizes << "256x256" << "128x128" << "64x64" << "48x48" << "32x32" << "16x16";
-      QString upath = QDir::homePath()+"/.local/share/icons/hicolor/%1/apps/%2.png";
-      //qDebug() << "Wine App: Check icon" << upath;
-      for(int i=0; i<sizes.length(); i++){
-        if( QFile::exists(upath.arg(sizes[i],DF->icon)) ){
-	  DF->icon = upath.arg(sizes[i],DF->icon);
-	  //qDebug() << " - Found Icon:" << DF->icon;
-	  break;
-	}
-      }
-    }
-  }
-  //Return the structure
-  ok = true; //was able to open/read the file - validity determined later
-  return DF;
-}*/
-
-/*bool LXDG::saveDesktopFile(XDGDesktop dFile, bool merge){
-  qDebug() << "Save Desktop File:" << dFile.filePath << "Merge:" << merge;
-  bool autofile = dFile.filePath.contains("/autostart/"); //use the "Hidden" field instead of the "NoDisplay"
-  int insertloc = -1;
-  QStringList info;
-  if(QFile::exists(dFile.filePath) && merge){
-    //Load the existing file and merge in in any changes
-    info = LUtils::readFile(dFile.filePath);
-    //set a couple flags based on the contents before we start iterating through
-    // - determine if a translated field was changed (need to remove all the now-invalid translations)
-    bool clearName, clearComment, clearGName; 
-    QString tmp = "";
-    if(!info.filter("Name=").isEmpty()){ tmp = info.filter("Name=").first().section("=",1,50); }
-    clearName=(tmp!=dFile.name);
-    tmp.clear();
-    if(!info.filter("Comment=").isEmpty()){ tmp = info.filter("Comment=").first().section("=",1,50); }
-    clearComment=(tmp!=dFile.comment);
-    tmp.clear();
-    if(!info.filter("GenericName=").isEmpty()){ tmp = info.filter("GenericName=").first().section("=",1,50); }
-    clearGName=(tmp!=dFile.genericName);
-    //Now start iterating through the file and changing fields as necessary
-    bool insection = false;
-    for(int i=0; i<info.length(); i++){
-      if(info[i]=="[Desktop Entry]"){ 
-        insection = true; 
-	continue;
-      }else if(info[i].startsWith("[")){ 
-	if(insection){ insertloc = i; } //save this location for later insertions
-	insection = false; 
-	continue; 
-      }
-      if(!insection || info[i].isEmpty() || info[i].section("#",0,0).simplified().isEmpty()){ continue; }
-      QString var = info[i].section("=",0,0);
-      QString val = info[i].section("=",1,50).simplified();
-      //NOTE: Clear the dFile variable as it is found/set in the file (to keep track of what has been used already)
-      //    For boolian values, set them to false
-      // --LOCALIZED VALUES --
-      if(var.startsWith("Name")){
-        if(var.contains("[") && clearName){ info.removeAt(i); i--; continue;}
-	else if(!var.contains("[")){ info[i] = var+"="+dFile.name; dFile.name.clear(); }
-      }else if(var.startsWith("GenericName")){
-        if(var.contains("[") && clearGName){ info.removeAt(i); i--; continue;}
-	else if(!var.contains("[")){ info[i] = var+"="+dFile.genericName; dFile.genericName.clear(); }
-      }else if(var.startsWith("Comment")){
-        if(var.contains("[") && clearComment){ info.removeAt(i); i--; continue;}
-	else if(!var.contains("[")){ info[i] = var+"="+dFile.comment; dFile.comment.clear(); }
-
-      // --STRING/LIST VALUES--
-      }else if(var=="Exec"){ info[i] = var+"="+dFile.exec; dFile.exec.clear(); }
-      else if(var=="TryExec"){ info[i] = var+"="+dFile.tryexec; dFile.tryexec.clear(); }
-      else if(var=="Path"){ info[i] = var+"="+dFile.path; dFile.path.clear(); }
-      else if(var=="Icon"){ info[i] = var+"="+dFile.icon; dFile.icon.clear(); }
-      else if(var=="StartupWMClass"){ info[i] = var+"="+dFile.startupWM; dFile.startupWM.clear(); }
-      else if(var=="MimeType"){ info[i] = var+"="+dFile.mimeList.join(";"); dFile.mimeList.clear(); }
-      else if(var=="Categories"){ info[i] = var+"="+dFile.catList.join(";"); dFile.catList.clear(); }
-      else if(var=="Keywords"){ info[i] = var+"="+dFile.keyList.join(";"); dFile.keyList.clear(); }
-      else if(var=="Actions"){ info[i] = var+"="+dFile.actionList.join(";"); dFile.actionList.clear(); }
-      else if(var=="OnlyShowIn"){ info[i] = var+"="+dFile.showInList.join(";"); dFile.showInList.clear(); }
-      else if(var=="NotShowIn"){ info[i] = var+"="+dFile.notShowInList.join(";"); dFile.notShowInList.clear(); }
-      else if(var=="URL"){ info[i] = var+"="+dFile.url; dFile.url.clear(); }
-      
-      // --BOOLIAN VALUES--
-      else if(var=="Hidden"){ 
-	if(!autofile){ info.removeAt(i); i--; continue; }
-	else{ info[i] = var+"="+(dFile.isHidden ? "true": "false"); dFile.isHidden=false;}
-      }else if(var=="NoDisplay"){ 
-	if(autofile){ info.removeAt(i); i--; continue; }
-	else{ info[i] = var+"="+(dFile.isHidden ? "true": "false"); dFile.isHidden=false;}
-      }else if(var=="Terminal"){ 
-	info[i] = var+"="+(dFile.useTerminal ? "true": "false"); dFile.useTerminal=false;
-      }else if(var=="StartupNotify"){ 
-	info[i] = var+"="+(dFile.startupNotify ? "true": "false"); dFile.startupNotify=false;
-      }
-      // Remove any lines that have been un-set or removed from the file
-      if(info[i].section("=",1,50).simplified().isEmpty()){ info.removeAt(i); i--; }
-    }
-    
-  }else{
-    //Just write a new file and overwrite any old one 
-    // (pre-set some values here which are always required)
-    info << "[Desktop Entry]";
-    info << "Version=1.0";
-    if(dFile.type==XDGDesktop::APP){ info << "Type=Application"; }
-    else if(dFile.type==XDGDesktop::LINK){ info << "Type=Link"; }
-    else if(dFile.type==XDGDesktop::DIR){ info << "Type=Dir"; }
-  }
-  
-  if(insertloc<0){ insertloc = info.size(); }//put it at the end
-  //Now add in any items that did not exist in the original file
-    if( !dFile.exec.isEmpty() ){ info.insert(insertloc,"Exec="+dFile.exec); }
-    if( !dFile.tryexec.isEmpty() ){ info.insert(insertloc,"TryExec="+dFile.tryexec); }
-    if( !dFile.path.isEmpty() ){ info.insert(insertloc,"Path="+dFile.path); }
-    if( !dFile.icon.isEmpty() ){ info.insert(insertloc,"Icon="+dFile.icon); }
-    if( !dFile.name.isEmpty() ){ info.insert(insertloc,"Name="+dFile.name); }
-    if( !dFile.genericName.isEmpty() ){ info.insert(insertloc,"GenericName="+dFile.genericName); }
-    if( !dFile.comment.isEmpty() ){ info.insert(insertloc,"Comment="+dFile.comment); }
-    if( !dFile.startupWM.isEmpty() ){ info.insert(insertloc,"StartupWMClass="+dFile.startupWM); }
-    if( !dFile.mimeList.isEmpty() ){ info.insert(insertloc,"MimeType="+dFile.mimeList.join(";")); }
-    if( !dFile.catList.isEmpty() ){ info.insert(insertloc,"Categories="+dFile.catList.join(";")); }
-    if( !dFile.keyList.isEmpty() ){ info.insert(insertloc,"Keywords="+dFile.keyList.join(";")); }
-    if( !dFile.actionList.isEmpty() ){ info.insert(insertloc,"Actions="+dFile.actionList.join(";")); }
-    if( !dFile.showInList.isEmpty() ){ info.insert(insertloc,"OnlyShowIn="+dFile.showInList.join(";")); }
-    else if( !dFile.notShowInList.isEmpty() ){ info.insert(insertloc,"NotShowIn="+dFile.notShowInList.join(";")); }
-    if( !dFile.url.isEmpty() ){ info.insert(insertloc,"URL="+dFile.url); }
-    if( dFile.isHidden && autofile ){ info.insert(insertloc,"Hidden=true"); }
-    else if(dFile.isHidden){ info.insert(insertloc,"NoDisplay=true"); }
-    if( dFile.useTerminal){ info.insert(insertloc,"Terminal=true"); }
-    if( dFile.startupNotify ){ info.insert(insertloc,"StartupNotify=true"); }
-    
-  //Now save the file
-  return LUtils::writeFile(dFile.filePath, info, true);
-
-}*/
-
-/*bool LXDG::checkValidity(XDGDesktop dFile, bool showAll){
-  bool ok=true;
-  bool DEBUG = false;
-  if(DEBUG){ qDebug() << "[LXDG] Check File validity:" << dFile.name << dFile.filePath; }
-  switch (dFile.type){
-    case XDGDesktop::BAD:
-      ok=false; 
-      if(DEBUG){ qDebug() << " - Bad file type"; }
-      break;
-    case XDGDesktop::APP:
-      if(!dFile.tryexec.isEmpty() && !LXDG::checkExec(dFile.tryexec)){ ok=false; if(DEBUG){ qDebug() << " - tryexec does not exist";} }
-      else if(dFile.exec.isEmpty() || dFile.name.isEmpty()){ ok=false; if(DEBUG){ qDebug() << " - exec or name is empty";} }
-      else if(!LXDG::checkExec(dFile.exec.section(" ",0,0,QString::SectionSkipEmpty)) ){ ok=false; if(DEBUG){ qDebug() << " - first exec binary does not exist";} }
-      break;
-    case XDGDesktop::LINK:
-      ok = !dFile.url.isEmpty();
-      if(DEBUG && !ok){ qDebug() << " - Link with missing URL"; }
-      break;
-    case XDGDesktop::DIR:
-      ok = !dFile.path.isEmpty();
-      if(DEBUG && !ok){ qDebug() << " - Dir with missing path"; }
-      break;
-    default:
-      ok=false;
-      if(DEBUG){ qDebug() << " - Unknown file type"; } 
-  }
-  if(!showAll){
-    if(!dFile.showInList.isEmpty()){ ok = dFile.showInList.contains("Lumina", Qt::CaseInsensitive); }
-    else if(!dFile.notShowInList.isEmpty()){ ok = !dFile.notShowInList.contains("Lumina",Qt::CaseInsensitive); }
-    else if(dFile.name.isEmpty()){ ok = false; }
-  }
-  return ok;
-}*/
-
 bool LXDG::checkExec(QString exec){
   //Return true(good) or false(bad)
   if(exec.startsWith("/")){ return QFile::exists(exec); }
@@ -899,21 +618,6 @@ QStringList LXDG::systemApplicationDirs(){
   return out;
 }
 
-/*XDGDesktopList* LXDG::systemAppsList(){
-  static XDGDesktopList *sysapps = 0;
-  if(sysapps == 0){ qDebug() << "Generating new apps list"; sysapps = new XDGDesktopList(0,true); }//set this to automatically update as needed
-  if(sysapps->lastCheck.isNull()){ sysapps->updateList(); } //catch the first time the class was used, and prompt for an update right now
-  return sysapps;
-}*/
-
-/*QList<XDGDesktop*> LXDG::systemDesktopFiles(bool showAll, bool showHidden){
-  //If this is going to be used regularly, it is better to use a custom instance of an XDGDesktopList() which self-updates instead.
-  //  Since this function will need to re-read the entire system app registry every time.
-  XDGDesktopList sysapps;
-  sysapps.updateList();
-  return sysapps.apps(showAll, showHidden); 
-}*/
-
 QHash<QString,QList<XDGDesktop*> > LXDG::sortDesktopCats(QList<XDGDesktop*> apps){
   //Sort the list of applications into their different categories (main categories only)
   //Create the category lists
@@ -987,46 +691,6 @@ QList<XDGDesktop*> LXDG::sortDesktopNames(QList<XDGDesktop*> apps){
   return out;
 }
 
-/*QString LXDG::getDesktopExec(XDGDesktop app, QString ActionID){
-  //Generate the executable line for the application
-  QString out;
-  QString exec = app.exec;
-  if( !ActionID.isEmpty() ){
-    //Go through and grab the proper exec for the listed action
-    for(int i=0; i<app.actions.length(); i++){
-      if(app.actions[i].ID == ActionID){
-        exec = app.actions[i].exec;
-        break;
-      }
-    }
-  }
-  
-  if(exec.isEmpty()){ return ""; }
-  else if(app.useTerminal){
-    //Get the currently default terminal
-    QString term = findDefaultAppForMime("application/terminal");
-    if(!QFile::exists(term)){ term = "xterm -lc"; }
-    else if(term.endsWith(".desktop")){
-      bool ok = false;
-      XDGDesktop DF = LXDG::loadDesktopFile(term, ok);
-        if(ok){  term = LXDG::getDesktopExec(DF); }
-        else{ term = "xterm -lc"; }
-    }else if( !LUtils::isValidBinary(term)){ term = "xterm -lc"; }
-    out = term+" -e "+exec;  //-e is a nearly-universal flag for terminal emulators
-  }else{
-    out =exec;
-  }
-  //Now perform any of the XDG flag substitutions as appropriate (9/2014 standards)
-  if(out.contains("%i") && !app.icon.isEmpty() ){ out.replace("%i", "--icon \'"+app.icon+"\'"); }
-  if(out.contains("%c")){ 
-    if(!app.name.isEmpty()){ out.replace("%c", "\'"+app.name+"\'"); }
-    else if(!app.genericName.isEmpty()){ out.replace("%c", "\'"+app.genericName+"\'"); }
-    else{ out.replace("%c", "\'"+app.filePath.section("/",-1).section(".desktop",0,0)+"\'"); }
-  }
-  if(out.contains("%k")){ out.replace("%k", "\'"+app.filePath+"\'"); }
-  return out;
-}*/
-
 void LXDG::setEnvironmentVars(){
   //Set the default XDG environment variables if not already set
   setenv("XDG_DATA_HOME",QString(QDir::homePath()+"/.local/share").toUtf8(), 0);
diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts
index f5f1268e..01adacff 100644
--- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts
+++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
 <TS version="2.1" language="es">
 <context>
     <name>AppLaunchButtonPlugin</name>
     <message>
-        <location filename="../panel-plugins/applauncher/AppLaunchButton.cpp" line="32"/>
+        <location filename="../panel-plugins/applauncher/AppLaunchButton.cpp" line="32"></location>
         <source>Click to assign an application</source>
         <translation>Presione para asignar una aplicación</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/applauncher/AppLaunchButton.cpp" line="38"/>
+        <location filename="../panel-plugins/applauncher/AppLaunchButton.cpp" line="38"></location>
         <source>Launch %1</source>
         <translation>Lanzar %1</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/applauncher/AppLaunchButton.cpp" line="45"/>
+        <location filename="../panel-plugins/applauncher/AppLaunchButton.cpp" line="45"></location>
         <source>Open %1</source>
         <translation>Abrir %1</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/applauncher/AppLaunchButton.cpp" line="63"/>
+        <location filename="../panel-plugins/applauncher/AppLaunchButton.cpp" line="63"></location>
         <source>Select Application</source>
         <translation>Seleccionar Aplicación</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/applauncher/AppLaunchButton.cpp" line="63"/>
+        <location filename="../panel-plugins/applauncher/AppLaunchButton.cpp" line="63"></location>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
@@ -32,18 +32,18 @@
 <context>
     <name>AppLauncherPlugin</name>
     <message>
-        <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="45"/>
-        <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="71"/>
+        <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="45"></location>
+        <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="71"></location>
         <source>Click to Set</source>
         <translation>Presione para Aplicar</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="132"/>
+        <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="132"></location>
         <source>Select Application</source>
         <translation>Seleccionar Aplicación</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="132"/>
+        <location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="132"></location>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
@@ -51,87 +51,87 @@
 <context>
     <name>AppMenu</name>
     <message>
-        <location filename="../AppMenu.cpp" line="45"/>
+        <location filename="../AppMenu.cpp" line="45"></location>
         <source>Desktop</source>
-        <translation type="unfinished">Escritorio</translation>
+        <translation>Escritorio</translation>
     </message>
     <message>
-        <location filename="../AppMenu.cpp" line="83"/>
+        <location filename="../AppMenu.cpp" line="83"></location>
         <source>Manage Applications</source>
         <translation>Administrar Aplicaciones</translation>
     </message>
     <message>
-        <location filename="../AppMenu.cpp" line="88"/>
+        <location filename="../AppMenu.cpp" line="88"></location>
         <source>Control Panel</source>
         <translation>Panel de Control</translation>
     </message>
     <message>
-        <location filename="../AppMenu.cpp" line="98"/>
+        <location filename="../AppMenu.cpp" line="98"></location>
         <source>Multimedia</source>
         <translation>Multimedia</translation>
     </message>
     <message>
-        <location filename="../AppMenu.cpp" line="99"/>
+        <location filename="../AppMenu.cpp" line="99"></location>
         <source>Development</source>
         <translation>Desarrollo</translation>
     </message>
     <message>
-        <location filename="../AppMenu.cpp" line="100"/>
+        <location filename="../AppMenu.cpp" line="100"></location>
         <source>Education</source>
         <translation>Educación</translation>
     </message>
     <message>
-        <location filename="../AppMenu.cpp" line="101"/>
+        <location filename="../AppMenu.cpp" line="101"></location>
         <source>Games</source>
         <translation>Juegos</translation>
     </message>
     <message>
-        <location filename="../AppMenu.cpp" line="102"/>
+        <location filename="../AppMenu.cpp" line="102"></location>
         <source>Graphics</source>
         <translation>Gráficos</translation>
     </message>
     <message>
-        <location filename="../AppMenu.cpp" line="103"/>
+        <location filename="../AppMenu.cpp" line="103"></location>
         <source>Network</source>
         <translation>Red</translation>
     </message>
     <message>
-        <location filename="../AppMenu.cpp" line="104"/>
+        <location filename="../AppMenu.cpp" line="104"></location>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
-        <location filename="../AppMenu.cpp" line="105"/>
+        <location filename="../AppMenu.cpp" line="105"></location>
         <source>Science</source>
         <translation>Ciencia</translation>
     </message>
     <message>
-        <location filename="../AppMenu.cpp" line="106"/>
+        <location filename="../AppMenu.cpp" line="106"></location>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
-        <location filename="../AppMenu.cpp" line="107"/>
+        <location filename="../AppMenu.cpp" line="107"></location>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../AppMenu.cpp" line="108"/>
+        <location filename="../AppMenu.cpp" line="108"></location>
         <source>Utility</source>
         <translation>Utilerías</translation>
     </message>
     <message>
-        <location filename="../AppMenu.cpp" line="109"/>
+        <location filename="../AppMenu.cpp" line="109"></location>
         <source>Wine</source>
         <translation>Wine</translation>
     </message>
     <message>
-        <location filename="../AppMenu.cpp" line="110"/>
+        <location filename="../AppMenu.cpp" line="110"></location>
         <source>Unsorted</source>
         <translation>Sin Ordenar</translation>
     </message>
     <message>
-        <location filename="../AppMenu.cpp" line="37"/>
+        <location filename="../AppMenu.cpp" line="37"></location>
         <source>Applications</source>
         <translation>Aplicaciones</translation>
     </message>
@@ -139,57 +139,57 @@
 <context>
     <name>BootSplash</name>
     <message>
-        <location filename="../BootSplash.ui" line="14"/>
+        <location filename="../BootSplash.ui" line="14"></location>
         <source>Form</source>
         <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../BootSplash.cpp" line="18"/>
+        <location filename="../BootSplash.cpp" line="18"></location>
         <source>Initializing Session …</source>
         <translation>Iniciando sesión ...</translation>
     </message>
     <message>
-        <location filename="../BootSplash.cpp" line="21"/>
+        <location filename="../BootSplash.cpp" line="21"></location>
         <source>Loading System Settings …</source>
         <translation>Cargando Configuración del Sistema...</translation>
     </message>
     <message>
-        <location filename="../BootSplash.cpp" line="24"/>
+        <location filename="../BootSplash.cpp" line="24"></location>
         <source>Loading User Preferences …</source>
         <translation>Cargando Preferencias de Usuario ...</translation>
     </message>
     <message>
-        <location filename="../BootSplash.cpp" line="27"/>
+        <location filename="../BootSplash.cpp" line="27"></location>
         <source>Preparing System Tray …</source>
         <translation>Preparando Bandeja del Sistema ...</translation>
     </message>
     <message>
-        <location filename="../BootSplash.cpp" line="30"/>
+        <location filename="../BootSplash.cpp" line="30"></location>
         <source>Starting Window Manager …</source>
         <translation>Iniciando Gestor de Ventanas ...</translation>
     </message>
     <message>
-        <location filename="../BootSplash.cpp" line="33"/>
+        <location filename="../BootSplash.cpp" line="33"></location>
         <source>Detecting Applications …</source>
         <translation>Detectando Aplicaciones ...</translation>
     </message>
     <message>
-        <location filename="../BootSplash.cpp" line="36"/>
+        <location filename="../BootSplash.cpp" line="36"></location>
         <source>Preparing Menus …</source>
         <translation>Preparando Menus ...</translation>
     </message>
     <message>
-        <location filename="../BootSplash.cpp" line="39"/>
+        <location filename="../BootSplash.cpp" line="39"></location>
         <source>Preparing Workspace …</source>
         <translation>Preparando Area de Trabajo ...</translation>
     </message>
     <message>
-        <location filename="../BootSplash.cpp" line="42"/>
+        <location filename="../BootSplash.cpp" line="42"></location>
         <source>Finalizing …</source>
         <translation>Finalizando ...</translation>
     </message>
     <message>
-        <location filename="../BootSplash.cpp" line="45"/>
+        <location filename="../BootSplash.cpp" line="45"></location>
         <source>Starting App: %1</source>
         <translation>Iniciando Aplicación: %1</translation>
     </message>
@@ -197,37 +197,37 @@
 <context>
     <name>DesktopViewPlugin</name>
     <message>
-        <location filename="../desktop-plugins/desktopview/DesktopViewPlugin.cpp" line="28"/>
+        <location filename="../desktop-plugins/desktopview/DesktopViewPlugin.cpp" line="28"></location>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/desktopview/DesktopViewPlugin.cpp" line="30"/>
+        <location filename="../desktop-plugins/desktopview/DesktopViewPlugin.cpp" line="30"></location>
         <source>Cut</source>
         <translation>Cortar</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/desktopview/DesktopViewPlugin.cpp" line="31"/>
+        <location filename="../desktop-plugins/desktopview/DesktopViewPlugin.cpp" line="31"></location>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/desktopview/DesktopViewPlugin.cpp" line="33"/>
+        <location filename="../desktop-plugins/desktopview/DesktopViewPlugin.cpp" line="33"></location>
         <source>Increase Icons</source>
         <translation>Agrandar Íconos</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/desktopview/DesktopViewPlugin.cpp" line="34"/>
+        <location filename="../desktop-plugins/desktopview/DesktopViewPlugin.cpp" line="34"></location>
         <source>Decrease Icons</source>
         <translation>Reducir Íconos</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/desktopview/DesktopViewPlugin.cpp" line="36"/>
+        <location filename="../desktop-plugins/desktopview/DesktopViewPlugin.cpp" line="36"></location>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/desktopview/DesktopViewPlugin.cpp" line="39"/>
+        <location filename="../desktop-plugins/desktopview/DesktopViewPlugin.cpp" line="39"></location>
         <source>Properties</source>
         <translation>Propiedades</translation>
     </message>
@@ -235,32 +235,32 @@
 <context>
     <name>ItemWidget</name>
     <message>
-        <location filename="../panel-plugins/systemstart/ItemWidget.cpp" line="39"/>
+        <location filename="../panel-plugins/systemstart/ItemWidget.cpp" line="39"></location>
         <source>Go Back</source>
         <translation>Atrás</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/ItemWidget.cpp" line="161"/>
+        <location filename="../panel-plugins/systemstart/ItemWidget.cpp" line="161"></location>
         <source>Pin to Desktop</source>
         <translation>Añadir al Escritorio</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/ItemWidget.cpp" line="165"/>
+        <location filename="../panel-plugins/systemstart/ItemWidget.cpp" line="165"></location>
         <source>Remove from Favorites</source>
         <translation>Eliminar de los Favoritos</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/ItemWidget.cpp" line="168"/>
+        <location filename="../panel-plugins/systemstart/ItemWidget.cpp" line="168"></location>
         <source>Add to Favorites</source>
         <translation>Añadir a los Favoritos</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/ItemWidget.cpp" line="172"/>
+        <location filename="../panel-plugins/systemstart/ItemWidget.cpp" line="172"></location>
         <source>Remove from Quicklaunch</source>
         <translation>Eliminar de Quicklaunch</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/ItemWidget.cpp" line="175"/>
+        <location filename="../panel-plugins/systemstart/ItemWidget.cpp" line="175"></location>
         <source>Add to Quicklaunch</source>
         <translation>Añadir a Quicklaunch</translation>
     </message>
@@ -268,7 +268,7 @@
 <context>
     <name>JsonMenu</name>
     <message>
-        <location filename="../JsonMenu.h" line="60"/>
+        <location filename="../JsonMenu.h" line="60"></location>
         <source>Error parsing script output: %1</source>
         <translation>Error procesando salida del script: %1</translation>
     </message>
@@ -276,97 +276,97 @@
 <context>
     <name>LAppMenuPlugin</name>
     <message>
-        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="37"/>
+        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="37"></location>
         <source>Quickly launch applications or open files</source>
         <translation>Lanzar aplicaciones o abrir archivos rápidamente</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="38"/>
+        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="38"></location>
         <source>Applications</source>
         <translation>Aplicaciones</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="69"/>
+        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="69"></location>
         <source>Browse Files</source>
         <translation>Explorar Archivos</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="74"/>
+        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="74"></location>
         <source>Install Applications</source>
         <translation>Instalar Aplicaciones</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="80"/>
+        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="80"></location>
         <source>Control Panel</source>
         <translation>Panel de Control</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="91"/>
+        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="91"></location>
         <source>Multimedia</source>
         <translation>Multimedia</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="92"/>
+        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="92"></location>
         <source>Development</source>
         <translation>Desarrollo</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="93"/>
+        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="93"></location>
         <source>Education</source>
         <translation>Educación</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="94"/>
+        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="94"></location>
         <source>Games</source>
         <translation>Juegos</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="95"/>
+        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="95"></location>
         <source>Graphics</source>
         <translation>Gráficos</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="96"/>
+        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="96"></location>
         <source>Network</source>
         <translation>Red</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="97"/>
+        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="97"></location>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="98"/>
+        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="98"></location>
         <source>Science</source>
         <translation>Ciencia</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="99"/>
+        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="99"></location>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="100"/>
+        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="100"></location>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="101"/>
+        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="101"></location>
         <source>Utility</source>
         <translation>Utilerías</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="102"/>
+        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="102"></location>
         <source>Wine</source>
         <translation>Wine</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="103"/>
+        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="103"></location>
         <source>Unsorted</source>
         <translation>Sin Ordenar</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="140"/>
+        <location filename="../panel-plugins/appmenu/LAppMenuPlugin.cpp" line="140"></location>
         <source>Leave</source>
         <translation>Salir</translation>
     </message>
@@ -374,12 +374,12 @@
 <context>
     <name>LBattery</name>
     <message>
-        <location filename="../panel-plugins/battery/LBattery.cpp" line="83"/>
+        <location filename="../panel-plugins/battery/LBattery.cpp" line="83"></location>
         <source>%1 % (Charging)</source>
         <translation>%1 % (Cargando)</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/battery/LBattery.cpp" line="84"/>
+        <location filename="../panel-plugins/battery/LBattery.cpp" line="84"></location>
         <source>%1 % (%2 Remaining)</source>
         <translation>%1 % (%2 Restante)</translation>
     </message>
@@ -387,12 +387,12 @@
 <context>
     <name>LClock</name>
     <message>
-        <location filename="../panel-plugins/clock/LClock.cpp" line="121"/>
+        <location filename="../panel-plugins/clock/LClock.cpp" line="121"></location>
         <source>Time Zone (%1)</source>
         <translation>Zona Horaria (%1)</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/clock/LClock.cpp" line="143"/>
+        <location filename="../panel-plugins/clock/LClock.cpp" line="143"></location>
         <source>Use System Time</source>
         <translation>Usar Hora del Sistema</translation>
     </message>
@@ -400,27 +400,27 @@
 <context>
     <name>LDPlugin</name>
     <message>
-        <location filename="../desktop-plugins/LDPlugin.cpp" line="36"/>
+        <location filename="../desktop-plugins/LDPlugin.cpp" line="36"></location>
         <source>Start Moving Item</source>
         <translation>Comenzar a Mover Elemento</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/LDPlugin.cpp" line="37"/>
+        <location filename="../desktop-plugins/LDPlugin.cpp" line="37"></location>
         <source>Start Resizing Item</source>
         <translation>Comenzar a Dimensionar Elemento</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/LDPlugin.cpp" line="39"/>
+        <location filename="../desktop-plugins/LDPlugin.cpp" line="39"></location>
         <source>Increase Item Sizes</source>
         <translation>Aumentar Tamaño de Elementos</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/LDPlugin.cpp" line="40"/>
+        <location filename="../desktop-plugins/LDPlugin.cpp" line="40"></location>
         <source>Decrease Item Sizes</source>
         <translation>Disminuir Tamaño de Elementos</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/LDPlugin.cpp" line="42"/>
+        <location filename="../desktop-plugins/LDPlugin.cpp" line="42"></location>
         <source>Remove Item</source>
         <translation>Eliminar Elemento</translation>
     </message>
@@ -428,42 +428,42 @@
 <context>
     <name>LDeskBarPlugin</name>
     <message>
-        <location filename="../panel-plugins/desktopbar/LDeskBar.cpp" line="194"/>
+        <location filename="../panel-plugins/desktopbar/LDeskBar.cpp" line="194"></location>
         <source>Favorite Applications</source>
         <translation>Aplicaciones Favoritas</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/desktopbar/LDeskBar.cpp" line="196"/>
+        <location filename="../panel-plugins/desktopbar/LDeskBar.cpp" line="196"></location>
         <source>Favorite Folders</source>
         <translation>Directorios Favoritos</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/desktopbar/LDeskBar.cpp" line="197"/>
+        <location filename="../panel-plugins/desktopbar/LDeskBar.cpp" line="197"></location>
         <source>Audio</source>
         <translation>Sonido</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/desktopbar/LDeskBar.cpp" line="199"/>
+        <location filename="../panel-plugins/desktopbar/LDeskBar.cpp" line="199"></location>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/desktopbar/LDeskBar.cpp" line="201"/>
+        <location filename="../panel-plugins/desktopbar/LDeskBar.cpp" line="201"></location>
         <source>Pictures</source>
         <translation>Imágenes</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/desktopbar/LDeskBar.cpp" line="203"/>
+        <location filename="../panel-plugins/desktopbar/LDeskBar.cpp" line="203"></location>
         <source>Other Files</source>
         <translation>Otros Archivos</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/desktopbar/LDeskBar.cpp" line="205"/>
+        <location filename="../panel-plugins/desktopbar/LDeskBar.cpp" line="205"></location>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/desktopbar/LDeskBar.cpp" line="208"/>
+        <location filename="../panel-plugins/desktopbar/LDeskBar.cpp" line="208"></location>
         <source>Favorite Files</source>
         <translation>Archivos Favoritos</translation>
     </message>
@@ -471,32 +471,32 @@
 <context>
     <name>LDesktop</name>
     <message>
-        <location filename="../LDesktop.cpp" line="198"/>
+        <location filename="../LDesktop.cpp" line="198"></location>
         <source>Window List</source>
         <translation>Lista de Ventanas</translation>
     </message>
     <message>
-        <location filename="../LDesktop.cpp" line="263"/>
+        <location filename="../LDesktop.cpp" line="263"></location>
         <source>Lumina Desktop</source>
         <translation>Escritorio Lumina</translation>
     </message>
     <message>
-        <location filename="../LDesktop.cpp" line="264"/>
+        <location filename="../LDesktop.cpp" line="264"></location>
         <source>Workspace %1</source>
         <translation>Área de trabajo %1</translation>
     </message>
     <message>
-        <location filename="../LDesktop.cpp" line="274"/>
+        <location filename="../LDesktop.cpp" line="274"></location>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
-        <location filename="../LDesktop.cpp" line="275"/>
+        <location filename="../LDesktop.cpp" line="275"></location>
         <source>Browse Files</source>
         <translation>Explorar Archivos</translation>
     </message>
     <message>
-        <location filename="../LDesktop.cpp" line="305"/>
+        <location filename="../LDesktop.cpp" line="305"></location>
         <source>Leave</source>
         <translation>Salir</translation>
     </message>
@@ -504,8 +504,8 @@
 <context>
     <name>LDesktopSwitcher</name>
     <message>
-        <location filename="../panel-plugins/desktopswitcher/LDesktopSwitcher.cpp" line="132"/>
-        <location filename="../panel-plugins/desktopswitcher/LDesktopSwitcher.cpp" line="140"/>
+        <location filename="../panel-plugins/desktopswitcher/LDesktopSwitcher.cpp" line="132"></location>
+        <location filename="../panel-plugins/desktopswitcher/LDesktopSwitcher.cpp" line="140"></location>
         <source>Workspace %1</source>
         <translation>Área de Trabajo %1</translation>
     </message>
@@ -513,7 +513,7 @@
 <context>
     <name>LQuickLaunchButton</name>
     <message>
-        <location filename="../panel-plugins/systemstart/LStartButton.h" line="51"/>
+        <location filename="../panel-plugins/systemstart/LStartButton.h" line="51"></location>
         <source>Remove from Quicklaunch</source>
         <translation>Eliminar de Quicklaunch</translation>
     </message>
@@ -521,8 +521,8 @@
 <context>
     <name>LSession</name>
     <message>
-        <location filename="../LSession.cpp" line="158"/>
-        <location filename="../LSession.cpp" line="326"/>
+        <location filename="../LSession.cpp" line="158"></location>
+        <location filename="../LSession.cpp" line="326"></location>
         <source>Desktop</source>
         <translation>Escritorio</translation>
     </message>
@@ -530,7 +530,7 @@
 <context>
     <name>LSysDashboard</name>
     <message>
-        <location filename="../panel-plugins/systemdashboard/LSysDashboard.cpp" line="43"/>
+        <location filename="../panel-plugins/systemdashboard/LSysDashboard.cpp" line="43"></location>
         <source>System Dashboard</source>
         <translation>Tablero del Sistema</translation>
     </message>
@@ -538,54 +538,54 @@
 <context>
     <name>LSysMenuQuick</name>
     <message>
-        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.ui" line="14"/>
+        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.ui" line="14"></location>
         <source>Form</source>
         <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.ui" line="50"/>
+        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.ui" line="50"></location>
         <source>System Volume</source>
         <translation>Volumen del Sistema</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.ui" line="111"/>
+        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.ui" line="111"></location>
         <source>Launch Audio Mixer</source>
         <translation>Abrir Mezclador de Audio</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.ui" line="156"/>
+        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.ui" line="156"></location>
         <source>Screen Brightness</source>
         <translation>Brillo de la Pantalla</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.ui" line="231"/>
+        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.ui" line="231"></location>
         <source>Battery Status</source>
         <translation>Estado de la Batería</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.ui" line="296"/>
+        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.ui" line="296"></location>
         <source>Workspace</source>
         <translation>Área de Trabajo</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.ui" line="344"/>
+        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.ui" line="344"></location>
         <source>Locale</source>
         <translation>Región</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.ui" line="378"/>
+        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.ui" line="378"></location>
         <source>Log Out</source>
         <translation>Cerrar Sesión</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.cpp" line="102"/>
+        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.cpp" line="102"></location>
         <source>connected</source>
         <translation>conectado</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.cpp" line="120"/>
-        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.cpp" line="167"/>
-        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.cpp" line="176"/>
+        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.cpp" line="120"></location>
+        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.cpp" line="167"></location>
+        <location filename="../panel-plugins/systemdashboard/SysMenuQuick.cpp" line="176"></location>
         <source>%1 of %2</source>
         <translation>%1 de %2</translation>
     </message>
@@ -593,42 +593,42 @@
 <context>
     <name>LTaskButton</name>
     <message>
-        <location filename="../panel-plugins/taskmanager/LTaskButton.cpp" line="149"/>
+        <location filename="../panel-plugins/taskmanager/LTaskButton.cpp" line="149"></location>
         <source>Activate Window</source>
         <translation>Activar Ventana</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/taskmanager/LTaskButton.cpp" line="152"/>
+        <location filename="../panel-plugins/taskmanager/LTaskButton.cpp" line="152"></location>
         <source>Minimize Window</source>
         <translation>Minimizar Ventana</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/taskmanager/LTaskButton.cpp" line="154"/>
+        <location filename="../panel-plugins/taskmanager/LTaskButton.cpp" line="154"></location>
         <source>Restore Window</source>
         <translation>Restaurar Ventana</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/taskmanager/LTaskButton.cpp" line="156"/>
+        <location filename="../panel-plugins/taskmanager/LTaskButton.cpp" line="156"></location>
         <source>Maximize Window</source>
         <translation>Maximizar Ventana</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/taskmanager/LTaskButton.cpp" line="159"/>
+        <location filename="../panel-plugins/taskmanager/LTaskButton.cpp" line="159"></location>
         <source>Close Window</source>
         <translation>Cerrar Ventana</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/taskmanager/LTaskButton.cpp" line="162"/>
+        <location filename="../panel-plugins/taskmanager/LTaskButton.cpp" line="162"></location>
         <source>Show All Windows</source>
         <translation>Mostrar Todas Las Ventanas</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/taskmanager/LTaskButton.cpp" line="163"/>
+        <location filename="../panel-plugins/taskmanager/LTaskButton.cpp" line="163"></location>
         <source>Minimize All Windows</source>
         <translation>Minimizar Todas las Ventanas</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/taskmanager/LTaskButton.cpp" line="164"/>
+        <location filename="../panel-plugins/taskmanager/LTaskButton.cpp" line="164"></location>
         <source>Close All Windows</source>
         <translation>Cerrar Todas las Ventanas</translation>
     </message>
@@ -636,7 +636,7 @@
 <context>
     <name>LUserButtonPlugin</name>
     <message>
-        <location filename="../panel-plugins/userbutton/LUserButton.cpp" line="41"/>
+        <location filename="../panel-plugins/userbutton/LUserButton.cpp" line="41"></location>
         <source>Quickly launch applications or open files</source>
         <translation>Lanzar aplicaciones o abrir archivos rápidamente</translation>
     </message>
@@ -644,32 +644,32 @@
 <context>
     <name>MonitorWidget</name>
     <message>
-        <location filename="../desktop-plugins/systemmonitor/MonitorWidget.ui" line="14"/>
+        <location filename="../desktop-plugins/systemmonitor/MonitorWidget.ui" line="14"></location>
         <source>Form</source>
         <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/systemmonitor/MonitorWidget.ui" line="36"/>
+        <location filename="../desktop-plugins/systemmonitor/MonitorWidget.ui" line="36"></location>
         <source>Summary</source>
         <translation>Resumen</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/systemmonitor/MonitorWidget.ui" line="42"/>
+        <location filename="../desktop-plugins/systemmonitor/MonitorWidget.ui" line="42"></location>
         <source>CPU Temp:</source>
         <translation>Temperatura de CPU:</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/systemmonitor/MonitorWidget.ui" line="56"/>
+        <location filename="../desktop-plugins/systemmonitor/MonitorWidget.ui" line="56"></location>
         <source>CPU Usage:</source>
         <translation>Uso del CPU:</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/systemmonitor/MonitorWidget.ui" line="70"/>
+        <location filename="../desktop-plugins/systemmonitor/MonitorWidget.ui" line="70"></location>
         <source>Mem Usage:</source>
         <translation>Uso de la Memoria:</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/systemmonitor/MonitorWidget.ui" line="85"/>
+        <location filename="../desktop-plugins/systemmonitor/MonitorWidget.ui" line="85"></location>
         <source>Disk I/O</source>
         <translation>E/S de Disco</translation>
     </message>
@@ -677,52 +677,52 @@
 <context>
     <name>NotePadPlugin</name>
     <message>
-        <location filename="../desktop-plugins/notepad/NotepadPlugin.cpp" line="97"/>
+        <location filename="../desktop-plugins/notepad/NotepadPlugin.cpp" line="97"></location>
         <source>Note Files (*.note)</source>
         <translation>Archivos de Notas (*.note)</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/notepad/NotepadPlugin.cpp" line="97"/>
+        <location filename="../desktop-plugins/notepad/NotepadPlugin.cpp" line="97"></location>
         <source>Text Files (*)</source>
         <translation>Archivos de Texto (*)</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/notepad/NotepadPlugin.cpp" line="98"/>
+        <location filename="../desktop-plugins/notepad/NotepadPlugin.cpp" line="98"></location>
         <source>Open a note file</source>
         <translation>Abrir un archivo de notas</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/notepad/NotepadPlugin.cpp" line="135"/>
+        <location filename="../desktop-plugins/notepad/NotepadPlugin.cpp" line="135"></location>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/notepad/NotepadPlugin.cpp" line="137"/>
+        <location filename="../desktop-plugins/notepad/NotepadPlugin.cpp" line="137"></location>
         <source>Invalid Note Name: Try Again</source>
         <translation>Nombre de Nota Inválido: Intente Nuevamente</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/notepad/NotepadPlugin.cpp" line="138"/>
+        <location filename="../desktop-plugins/notepad/NotepadPlugin.cpp" line="138"></location>
         <source>Select a Note Name</source>
         <translation>Seleccione el Nombre de la Nota</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/notepad/NotepadPlugin.cpp" line="165"/>
+        <location filename="../desktop-plugins/notepad/NotepadPlugin.cpp" line="165"></location>
         <source>Open Text File</source>
         <translation>Abrir Archivo de Texto</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/notepad/NotepadPlugin.cpp" line="166"/>
+        <location filename="../desktop-plugins/notepad/NotepadPlugin.cpp" line="166"></location>
         <source>Create a Note</source>
         <translation>Crear una Nota</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/notepad/NotepadPlugin.cpp" line="169"/>
+        <location filename="../desktop-plugins/notepad/NotepadPlugin.cpp" line="169"></location>
         <source>Rename Note</source>
         <translation>Renombrar Nota</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/notepad/NotepadPlugin.cpp" line="170"/>
+        <location filename="../desktop-plugins/notepad/NotepadPlugin.cpp" line="170"></location>
         <source>Delete Note</source>
         <translation>Eliminar Nota</translation>
     </message>
@@ -730,57 +730,57 @@
 <context>
     <name>PlayerWidget</name>
     <message>
-        <location filename="../desktop-plugins/audioplayer/PlayerWidget.ui" line="14"/>
+        <location filename="../desktop-plugins/audioplayer/PlayerWidget.ui" line="14"></location>
         <source>Form</source>
         <translation>Fomulario</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/audioplayer/PlayerWidget.cpp" line="67"/>
+        <location filename="../desktop-plugins/audioplayer/PlayerWidget.cpp" line="67"></location>
         <source>Clear Playlist</source>
         <translation>Limpiar Lista de Reproducción</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/audioplayer/PlayerWidget.cpp" line="68"/>
+        <location filename="../desktop-plugins/audioplayer/PlayerWidget.cpp" line="68"></location>
         <source>Shuffle Playlist</source>
         <translation>Lista de Reproducción Aleatoria</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/audioplayer/PlayerWidget.cpp" line="70"/>
+        <location filename="../desktop-plugins/audioplayer/PlayerWidget.cpp" line="70"></location>
         <source>Add Files</source>
         <translation>Añadir Archivos</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/audioplayer/PlayerWidget.cpp" line="71"/>
+        <location filename="../desktop-plugins/audioplayer/PlayerWidget.cpp" line="71"></location>
         <source>Add Directory</source>
         <translation>Añadir Directorio</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/audioplayer/PlayerWidget.cpp" line="72"/>
+        <location filename="../desktop-plugins/audioplayer/PlayerWidget.cpp" line="72"></location>
         <source>Add URL</source>
         <translation>Añadir URL</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/audioplayer/PlayerWidget.cpp" line="100"/>
+        <location filename="../desktop-plugins/audioplayer/PlayerWidget.cpp" line="100"></location>
         <source>Multimedia Files</source>
         <translation>Archivos Multimedia</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/audioplayer/PlayerWidget.cpp" line="101"/>
+        <location filename="../desktop-plugins/audioplayer/PlayerWidget.cpp" line="101"></location>
         <source>Select Multimedia Files</source>
         <translation>Seleccionar Archivos Multimedia</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/audioplayer/PlayerWidget.cpp" line="128"/>
+        <location filename="../desktop-plugins/audioplayer/PlayerWidget.cpp" line="128"></location>
         <source>Select Multimedia Directory</source>
         <translation>Seleccionar Directorio Multimedia</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/audioplayer/PlayerWidget.cpp" line="157"/>
+        <location filename="../desktop-plugins/audioplayer/PlayerWidget.cpp" line="157"></location>
         <source>Enter a valid URL for a multimedia file or stream:</source>
         <translation>Ingrese una URL válida de un archivo multimedia o transmisión:</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/audioplayer/PlayerWidget.cpp" line="159"/>
+        <location filename="../desktop-plugins/audioplayer/PlayerWidget.cpp" line="159"></location>
         <source>Multimedia URL</source>
         <translation>URL Multimedia</translation>
     </message>
@@ -788,155 +788,155 @@
 <context>
     <name>RSSFeedPlugin</name>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="14"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="14"></location>
         <source>Form</source>
         <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="62"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="62"></location>
         <source>View Options</source>
         <translation>Ver Opciones</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="89"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="89"></location>
         <source>Open Website</source>
         <translation>Abrir Sitio Web</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="92"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="92"></location>
         <source>More</source>
         <translation>Más</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="154"/>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="245"/>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="391"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="154"></location>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="245"></location>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="391"></location>
         <source>Back to Feeds</source>
         <translation>Regresar al Feed</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="172"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="172"></location>
         <source>Feed Information</source>
         <translation>Información del Feed</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="212"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="212"></location>
         <source>Remove Feed</source>
         <translation>Eliminar Feed</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="263"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="263"></location>
         <source>New Feed Subscription</source>
         <translation>Nueva Suscripción al Feed</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="287"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="287"></location>
         <source>RSS URL</source>
         <translation>URL del RSS</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="302"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="302"></location>
         <source>Load a preset RSS Feed</source>
         <translation>Cargar un Feed RSS predeterminado</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="332"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="332"></location>
         <source>Add to Feeds</source>
         <translation>Añadir a los Feeds</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="409"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="409"></location>
         <source>Feed Reader Settings</source>
         <translation>Configuración del Lector de Feeds</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="430"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="430"></location>
         <source>Manual Sync Only</source>
         <translation>Solo Sincronización Manual</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="437"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="437"></location>
         <source>Some RSS feeds may request custom update intervals instead of using this setting</source>
         <translation>Algunos feeds RSS pueden requerir intervalos de actualización personalizados en vez de usar esta configuración </translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="440"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="440"></location>
         <source>Default Sync Interval</source>
         <translation>Intervalo de Sincronización Predeterminado</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="471"/>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="483"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="471"></location>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="483"></location>
         <source>Hour(s)</source>
         <translation>Hora(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="478"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="478"></location>
         <source>Minutes</source>
         <translation>Minutos</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="522"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.ui" line="522"></location>
         <source>Save Settings</source>
         <translation>Guardar Configuración</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="70"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="70"></location>
         <source>Add RSS Feed</source>
         <translation>Añadir Feed RSS</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="71"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="71"></location>
         <source>View Feed Details</source>
         <translation>Ver los Detalles del Feed</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="72"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="72"></location>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="74"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="74"></location>
         <source>Update Feeds Now</source>
         <translation>Actualizar Feeds Ahora</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="78"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="78"></location>
         <source>Lumina Desktop RSS</source>
         <translation>RSS del Escritorio Lumina</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="143"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="143"></location>
         <source>Feed URL: %1</source>
         <translation>URL del Feed: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="144"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="144"></location>
         <source>Title: %1</source>
         <translation>Título: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="145"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="145"></location>
         <source>Description: %1</source>
         <translation>Descripción: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="146"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="146"></location>
         <source>Website: %1</source>
         <translation>Sitio Web: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="147"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="147"></location>
         <source>Last Build Date: %1</source>
         <translation>Última Actualización: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="148"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="148"></location>
         <source>Last Sync: %1</source>
         <translation>Última Sincronización: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="149"/>
+        <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="149"></location>
         <source>Next Sync: %1</source>
         <translation>Siguiente Sincronización: %1</translation>
     </message>
@@ -944,32 +944,32 @@
 <context>
     <name>SettingsMenu</name>
     <message>
-        <location filename="../SettingsMenu.cpp" line="30"/>
+        <location filename="../SettingsMenu.cpp" line="30"></location>
         <source>Screensaver</source>
         <translation>Protector de Pantalla</translation>
     </message>
     <message>
-        <location filename="../SettingsMenu.cpp" line="33"/>
+        <location filename="../SettingsMenu.cpp" line="33"></location>
         <source>Desktop</source>
         <translation>Escritorio</translation>
     </message>
     <message>
-        <location filename="../SettingsMenu.cpp" line="26"/>
+        <location filename="../SettingsMenu.cpp" line="26"></location>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
     <message>
-        <location filename="../SettingsMenu.cpp" line="36"/>
+        <location filename="../SettingsMenu.cpp" line="36"></location>
         <source>Display</source>
         <translation>Pantalla</translation>
     </message>
     <message>
-        <location filename="../SettingsMenu.cpp" line="51"/>
+        <location filename="../SettingsMenu.cpp" line="51"></location>
         <source>Control Panel</source>
         <translation>Panel de Control</translation>
     </message>
     <message>
-        <location filename="../SettingsMenu.cpp" line="57"/>
+        <location filename="../SettingsMenu.cpp" line="57"></location>
         <source>About Lumina</source>
         <translation>Acerca de Lumina</translation>
     </message>
@@ -977,114 +977,114 @@
 <context>
     <name>StartMenu</name>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="14"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="14"></location>
         <source>Form</source>
         <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="38"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="38"></location>
         <source>Type to search</source>
         <translation>Escribir para buscar</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="171"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="171"></location>
         <source>Browse Files</source>
         <translation>Explorar Archivos</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="199"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="199"></location>
         <source>Browse Applications</source>
         <translation>Buscar Aplicaciones</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="234"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="234"></location>
         <source>Control Panel</source>
         <translation>Panel de Control</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="305"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="305"></location>
         <source>Leave</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="379"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="379"></location>
         <source>Manage Applications</source>
         <translation>Administrar Aplicaciones</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="408"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="408"></location>
         <source>Show Categories</source>
         <translation>Mostrar Categorías</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="488"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="488"></location>
         <source>Configure Desktop</source>
         <translation>Configurar el Escritorio</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="1065"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="1065"></location>
         <source>Sign Out User</source>
         <translation>Cerrar Sesión</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="989"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="989"></location>
         <source>Restart System</source>
         <translation>Reiniciar Sistema</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="262"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="262"></location>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="1017"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="1017"></location>
         <source>Power Off System</source>
         <translation>Apagar Sistema</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="1036"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="1036"></location>
         <source>(System Performing Updates)</source>
         <translation>(Sistema Aplicando Actualizaciones)</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="924"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="924"></location>
         <source>Suspend System</source>
         <translation>Suspender el Sistema</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="1125"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.ui" line="1125"></location>
         <source>Back</source>
         <translation>Atrás</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="267"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="267"></location>
         <source>Apply Updates?</source>
-        <translation type="unfinished"></translation>
+        <translation>¿Aplicar Actualizaciones?</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="267"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="267"></location>
         <source>You have system updates waiting to be applied! Do you wish to install them now?</source>
-        <translation type="unfinished"></translation>
+        <translation>¡Tienes actualizaciones del sistema esperando ser aplicadas! ¿Desearías instalarlas ahora?</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="475"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="475"></location>
         <source>%1% (Plugged In)</source>
         <translation>%1% (Conectado)</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="479"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="479"></location>
         <source>%1% (%2 Estimated)</source>
         <translation>%1% (%2 Estimado)</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="480"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="480"></location>
         <source>%1% Remaining</source>
         <translation>%1% Restante</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="496"/>
-        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="655"/>
-        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="666"/>
+        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="496"></location>
+        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="655"></location>
+        <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="666"></location>
         <source>Workspace %1/%2</source>
         <translation>Área de Trabajo %1/%2</translation>
     </message>
@@ -1092,70 +1092,70 @@
 <context>
     <name>SystemWindow</name>
     <message>
-        <location filename="../SystemWindow.ui" line="14"/>
+        <location filename="../SystemWindow.ui" line="14"></location>
         <source>System Options</source>
         <translation>Opciones del Sistema</translation>
     </message>
     <message>
-        <location filename="../SystemWindow.ui" line="55"/>
+        <location filename="../SystemWindow.ui" line="55"></location>
         <source>Log Out</source>
         <translation>Cerrar Sesión</translation>
     </message>
     <message>
-        <location filename="../SystemWindow.ui" line="71"/>
+        <location filename="../SystemWindow.ui" line="71"></location>
         <source>Restart</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
-        <location filename="../SystemWindow.ui" line="87"/>
+        <location filename="../SystemWindow.ui" line="87"></location>
         <source>Shutdown</source>
         <translation>Apagar</translation>
     </message>
     <message>
-        <location filename="../SystemWindow.ui" line="127"/>
+        <location filename="../SystemWindow.ui" line="127"></location>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../SystemWindow.ui" line="156"/>
+        <location filename="../SystemWindow.ui" line="156"></location>
         <source>Lock</source>
         <translation>Bloquear</translation>
     </message>
     <message>
-        <location filename="../SystemWindow.ui" line="172"/>
+        <location filename="../SystemWindow.ui" line="172"></location>
         <source>Suspend</source>
         <translation>Suspender</translation>
     </message>
     <message>
-        <location filename="../SystemWindow.cpp" line="57"/>
+        <location filename="../SystemWindow.cpp" line="57"></location>
         <source>Apply Updates?</source>
-        <translation type="unfinished"></translation>
+        <translation>¿Aplicar Actualizaciones?</translation>
     </message>
     <message>
-        <location filename="../SystemWindow.cpp" line="57"/>
+        <location filename="../SystemWindow.cpp" line="57"></location>
         <source>You have system updates waiting to be applied! Do you wish to install them now?</source>
-        <translation type="unfinished"></translation>
+        <translation>!Tienes actualizaciones del sistema esperando ser aplicadas! ¿Quisieras instalarlas ahora?</translation>
     </message>
 </context>
 <context>
     <name>UserItemWidget</name>
     <message>
-        <location filename="../panel-plugins/userbutton/UserItemWidget.cpp" line="33"/>
+        <location filename="../panel-plugins/userbutton/UserItemWidget.cpp" line="33"></location>
         <source>Go Back</source>
         <translation>Retroceder</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserItemWidget.cpp" line="133"/>
+        <location filename="../panel-plugins/userbutton/UserItemWidget.cpp" line="133"></location>
         <source>Remove Shortcut</source>
         <translation>Eliminar Acceso Directo</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserItemWidget.cpp" line="138"/>
+        <location filename="../panel-plugins/userbutton/UserItemWidget.cpp" line="138"></location>
         <source>Delete File</source>
         <translation>Borrar Archivo</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserItemWidget.cpp" line="144"/>
+        <location filename="../panel-plugins/userbutton/UserItemWidget.cpp" line="144"></location>
         <source>Create Shortcut</source>
         <translation>Crear Acceso Directo</translation>
     </message>
@@ -1163,180 +1163,180 @@
 <context>
     <name>UserWidget</name>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="14"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="14"></location>
         <source>UserWidget</source>
         <translation>WidgetDeUsuario</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="24"/>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="27"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="24"></location>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="27"></location>
         <source>Favorites</source>
         <translation>Favoritos</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="65"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="65"></location>
         <source>Favorite Applications</source>
         <translation>Aplicaciones Favoritas</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="68"/>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="187"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="68"></location>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="187"></location>
         <source>Applications</source>
         <translation>Aplicaciones</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="102"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="102"></location>
         <source>Favorite Directories</source>
         <translation>Directorios Favoritos</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="105"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="105"></location>
         <source>Places</source>
         <translation>Lugares</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="139"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="139"></location>
         <source>Favorite FIles</source>
         <translation>Archivos Favoritos</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="142"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="142"></location>
         <source>Files</source>
         <translation>Archivos</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="184"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="184"></location>
         <source>Apps</source>
         <translation>Aplicaciones</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="290"/>
-        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="330"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="290"></location>
+        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="330"></location>
         <source>Home</source>
         <translation>Inicio</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="293"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="293"></location>
         <source>Home Directory</source>
         <translation>Directorio Personal</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="322"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="322"></location>
         <source>Search this Directory</source>
         <translation>Buscar en el Directorio</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="375"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="375"></location>
         <source>Go back to home directory</source>
         <translation>Regresar al Directorio Personal</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="350"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="350"></location>
         <source>Open Directory</source>
         <translation>Abrir Directorio</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="458"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="458"></location>
         <source>Config</source>
         <translation>Configuración</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="461"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="461"></location>
         <source>Desktop Preferences</source>
         <translation>Preferencias de Escritorio</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="473"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="473"></location>
         <source>Control Panel</source>
         <translation>Panel de Control</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="495"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="495"></location>
         <source>Desktop Appearance/Plugins</source>
         <translation>Apariencia de Escritorio/Plugins</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="517"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="517"></location>
         <source>Screen Configuration</source>
         <translation>Configuración de Pantalla</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="539"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="539"></location>
         <source>Screensaver Settings</source>
         <translation>Configuración del Protector de Pantalla</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="581"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.ui" line="581"></location>
         <source>About the Lumina Desktop</source>
         <translation>Acerca del Escritorio Lumina</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="289"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="289"></location>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="290"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="290"></location>
         <source>Multimedia</source>
         <translation>Multimedia</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="291"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="291"></location>
         <source>Development</source>
         <translation>Desarrollo</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="292"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="292"></location>
         <source>Education</source>
         <translation>Educación</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="293"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="293"></location>
         <source>Games</source>
         <translation>Juegos</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="294"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="294"></location>
         <source>Graphics</source>
         <translation>Gráficos</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="295"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="295"></location>
         <source>Network</source>
         <translation>Red</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="296"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="296"></location>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="297"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="297"></location>
         <source>Science</source>
         <translation>Ciencia</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="298"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="298"></location>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="299"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="299"></location>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="300"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="300"></location>
         <source>Utilities</source>
         <translation>Utilerías</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="301"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="301"></location>
         <source>Wine</source>
         <translation>Wine</translation>
     </message>
     <message>
-        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="302"/>
+        <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="302"></location>
         <source>Unsorted</source>
         <translation>Sin Ordenar</translation>
     </message>
diff --git a/src-qt5/core/lumina-info/i18n/lumina-info_el.ts b/src-qt5/core/lumina-info/i18n/lumina-info_el.ts
index 81a3adae..98a8182d 100644
--- a/src-qt5/core/lumina-info/i18n/lumina-info_el.ts
+++ b/src-qt5/core/lumina-info/i18n/lumina-info_el.ts
@@ -1,95 +1,95 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
 <TS version="2.1" language="el">
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../MainUI.ui" line="14"></location>
         <source>Lumina Desktop Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Πληροφορίες Γραφικού Περιβάλλοντος Lumina</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="60"/>
+        <location filename="../MainUI.ui" line="60"></location>
         <source>General</source>
         <translation>Γενικά</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="89"/>
+        <location filename="../MainUI.ui" line="89"></location>
         <source>Source Repository</source>
-        <translation type="unfinished"></translation>
+        <translation>Πηγή Αποθετηρίου</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="124"/>
+        <location filename="../MainUI.ui" line="124"></location>
         <source>Lumina Website</source>
-        <translation type="unfinished"></translation>
+        <translation>Η Ιστοσελίδα του Lumina</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="152"/>
+        <location filename="../MainUI.ui" line="152"></location>
         <source>Bug Reports</source>
-        <translation type="unfinished"></translation>
+        <translation>Aναφορές Σφαλμάτων (Bugs)</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="179"/>
+        <location filename="../MainUI.ui" line="179"></location>
         <source>Desktop Version:</source>
-        <translation type="unfinished"></translation>
+        <translation>Έκδοση Γραφικού Περιβάλλοντος</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="202"/>
+        <location filename="../MainUI.ui" line="202"></location>
         <source>OS Build:</source>
-        <translation type="unfinished"></translation>
+        <translation>Έκδοση Δόμησης OS:</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="218"/>
+        <location filename="../MainUI.ui" line="218"></location>
         <source>Qt Version:</source>
         <translation>Έκδοση Qt:</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="276"/>
+        <location filename="../MainUI.ui" line="276"></location>
         <source>Ask the Community</source>
-        <translation type="unfinished"></translation>
+        <translation>Ρωτήστε την Κοινότητα</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="233"/>
+        <location filename="../MainUI.ui" line="233"></location>
         <source>View Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Προβολή Πληροφοριών</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="298"/>
+        <location filename="../MainUI.ui" line="298"></location>
         <source>License</source>
-        <translation>Άδεια χρήσης</translation>
+        <translation>Άδεια Χρήσης</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="315"/>
+        <location filename="../MainUI.ui" line="315"></location>
         <source>Acknowledgements</source>
-        <translation type="unfinished"></translation>
+        <translation>Ευχαριστίες</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="333"/>
+        <location filename="../MainUI.ui" line="333"></location>
         <source>Project Lead:</source>
-        <translation type="unfinished"></translation>
+        <translation>Επικεφαλής του Έργου:</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="340"/>
-        <source>&lt;a href=&quot;https://github.com/beanpole135&quot;&gt;Ken Moore&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../MainUI.ui" line="340"></location>
+        <source>&lt;a href="https://github.com/beanpole135"&gt;Ken Moore&lt;/a&gt;</source>
+        <translation>&lt;a href="https://github.com/beanpole135"&gt;&lt;a href="https://github.com/beanpole135"&gt;Ken Moore&lt;/a&gt;&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="353"/>
+        <location filename="../MainUI.ui" line="353"></location>
         <source>Contributors:</source>
-        <translation type="unfinished"></translation>
+        <translation>Συντελεστές:</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="366"/>
+        <location filename="../MainUI.ui" line="366"></location>
         <source>Sponsors:</source>
         <translation>Χορηγοί</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="428"/>
-        <source>&lt;a href=&quot;https://github.com/pcbsd/lumina/graphs/contributors&quot;&gt;Open in web browser&lt;a&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../MainUI.ui" line="428"></location>
+        <source>&lt;a href="https://github.com/pcbsd/lumina/graphs/contributors"&gt;Open in web browser&lt;a&gt;</source>
+        <translation>&lt;a href="https://github.com/pcbsd/lumina/graphs/contributors"&gt;Άνοιγμα στον Φυλλομετρητή (Browser)&lt;a&gt;</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="454"/>
+        <location filename="../MainUI.ui" line="454"></location>
         <source>Close</source>
         <translation>Κλείσιμο</translation>
     </message>
diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_el.ts b/src-qt5/core/lumina-open/i18n/lumina-open_el.ts
index 36b1bdfc..39225222 100644
--- a/src-qt5/core/lumina-open/i18n/lumina-open_el.ts
+++ b/src-qt5/core/lumina-open/i18n/lumina-open_el.ts
@@ -1,207 +1,207 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
 <TS version="2.1" language="el">
 <context>
     <name>LFileDialog</name>
     <message>
-        <location filename="../LFileDialog.ui" line="14"/>
+        <location filename="../LFileDialog.ui" line="14"></location>
         <source>Open With...</source>
         <translation>Άνοιγμα με...</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.ui" line="68"/>
+        <location filename="../LFileDialog.ui" line="68"></location>
         <source>Preferred</source>
         <translation>Προτιμώμενη</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.ui" line="75"/>
+        <location filename="../LFileDialog.ui" line="75"></location>
         <source>Available</source>
         <translation>Διαθέσιμα</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.ui" line="82"/>
+        <location filename="../LFileDialog.ui" line="82"></location>
         <source>Custom</source>
         <translation>Προσαρμοσμένο</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.ui" line="131"/>
+        <location filename="../LFileDialog.ui" line="131"></location>
         <source>Binary Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Τοποθεσία Εφαρμογής</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.ui" line="138"/>
+        <location filename="../LFileDialog.ui" line="138"></location>
         <source>Find</source>
         <translation>Εύρεση</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.ui" line="199"/>
+        <location filename="../LFileDialog.ui" line="199"></location>
         <source>Set this application as the default </source>
         <translation>Ορισμός αυτής της εφαρμογής ως προεπιλεγμένης</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.ui" line="221"/>
+        <location filename="../LFileDialog.ui" line="221"></location>
         <source>OK</source>
         <translation>ΟΚ</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.ui" line="235"/>
+        <location filename="../LFileDialog.ui" line="235"></location>
         <source>Cancel</source>
-        <translation>Άκυρο</translation>
+        <translation>Ακύρωση</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.cpp" line="40"/>
+        <location filename="../LFileDialog.cpp" line="40"></location>
         <source>(Email Link)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Σύνδεσμος Ηλεκτρονικού Ταχυδρομείου)</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.cpp" line="41"/>
+        <location filename="../LFileDialog.cpp" line="41"></location>
         <source>(Internet URL - %1)</source>
-        <translation type="unfinished"></translation>
+        <translation>(URL Διαδικτύου -  %1)</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.cpp" line="114"/>
+        <location filename="../LFileDialog.cpp" line="114"></location>
         <source>Audio</source>
         <translation>Ήχος</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.cpp" line="115"/>
+        <location filename="../LFileDialog.cpp" line="115"></location>
         <source>Video</source>
         <translation>Βίντεο</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.cpp" line="116"/>
+        <location filename="../LFileDialog.cpp" line="116"></location>
         <source>Multimedia</source>
         <translation>Πολυμέσα</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.cpp" line="117"/>
+        <location filename="../LFileDialog.cpp" line="117"></location>
         <source>Development</source>
-        <translation type="unfinished"></translation>
+        <translation>Ανάπτυξη</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.cpp" line="118"/>
+        <location filename="../LFileDialog.cpp" line="118"></location>
         <source>Education</source>
-        <translation type="unfinished"></translation>
+        <translation>Εκπαίδευση</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.cpp" line="119"/>
+        <location filename="../LFileDialog.cpp" line="119"></location>
         <source>Game</source>
         <translation>Παιχνίδια</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.cpp" line="120"/>
+        <location filename="../LFileDialog.cpp" line="120"></location>
         <source>Graphics</source>
         <translation>Γραφικά</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.cpp" line="121"/>
+        <location filename="../LFileDialog.cpp" line="121"></location>
         <source>Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Δίκτυο</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.cpp" line="122"/>
+        <location filename="../LFileDialog.cpp" line="122"></location>
         <source>Office</source>
-        <translation type="unfinished"></translation>
+        <translation>Σουΐτα Γραφείου</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.cpp" line="123"/>
+        <location filename="../LFileDialog.cpp" line="123"></location>
         <source>Science</source>
-        <translation type="unfinished"></translation>
+        <translation>Επιστήμη</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.cpp" line="124"/>
+        <location filename="../LFileDialog.cpp" line="124"></location>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Ρυθμίσεις</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.cpp" line="125"/>
+        <location filename="../LFileDialog.cpp" line="125"></location>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation>Σύστημα</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.cpp" line="126"/>
+        <location filename="../LFileDialog.cpp" line="126"></location>
         <source>Utilities</source>
-        <translation type="unfinished"></translation>
+        <translation>Εργαλεία</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.cpp" line="127"/>
+        <location filename="../LFileDialog.cpp" line="127"></location>
         <source>Other</source>
-        <translation type="unfinished"></translation>
+        <translation>Άλλο</translation>
     </message>
     <message>
-        <location filename="../LFileDialog.cpp" line="271"/>
+        <location filename="../LFileDialog.cpp" line="271"></location>
         <source>Find Application Binary</source>
-        <translation type="unfinished"></translation>
+        <translation>Βρείτε Εκτελέσιμη Εφαρμογή</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../main.cpp" line="51"/>
+        <location filename="../main.cpp" line="51"></location>
         <source>File Error</source>
-        <translation>Σφάλμα αρχείου</translation>
+        <translation>Σφάλμα Αρχείου</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="187"/>
-        <location filename="../main.cpp" line="193"/>
+        <location filename="../main.cpp" line="187"></location>
+        <location filename="../main.cpp" line="193"></location>
         <source>Audio Volume %1%</source>
         <translation>Ένταση ήχου %1%</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="201"/>
-        <location filename="../main.cpp" line="210"/>
+        <location filename="../main.cpp" line="201"></location>
+        <location filename="../main.cpp" line="210"></location>
         <source>Screen Brightness %1%</source>
         <translation>Φωτεινότητα οθόνης %1%</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="242"/>
+        <location filename="../main.cpp" line="242"></location>
         <source>Invalid file or URL: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Μη έγκυρο αρχείο ή URL: %1</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="264"/>
+        <location filename="../main.cpp" line="264"></location>
         <source>File could not be opened: %1</source>
-        <translation>Αδυναμία ανοίγματος αρχείου%1%</translation>
+        <translation>Αδυναμία ανοίγματος αρχείου: %1</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="273"/>
+        <location filename="../main.cpp" line="273"></location>
         <source>Application shortcut is missing the launching information (malformed shortcut): %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Οι πληροφορίες εκτέλεσης λείπουν απο την συντόμευση της εφαρμογής (Δυσλειτουργία συντόμευσης): %1</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="284"/>
+        <location filename="../main.cpp" line="284"></location>
         <source>URL shortcut is missing the URL: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Απο την URL συντόμευση λείπει το URL: %1</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="295"/>
+        <location filename="../main.cpp" line="295"></location>
         <source>Directory shortcut is missing the path to the directory: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Απο την συντόμευση του καταλόγου λείπει η διαδρομή προς τον κατάλογο: %1</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="300"/>
+        <location filename="../main.cpp" line="300"></location>
         <source>Unknown type of shortcut : %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Άγνωστος τύπος συντόμευσης: %1</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="362"/>
+        <location filename="../main.cpp" line="362"></location>
         <source>Binary Missing</source>
-        <translation type="unfinished"></translation>
+        <translation>Το Εκτελέσιμο λείπει</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="362"/>
-        <source>Could not find &quot;%1&quot;. Please ensure it is installed first.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../main.cpp" line="362"></location>
+        <source>Could not find "%1". Please ensure it is installed first.</source>
+        <translation>Αδυναμία έυρεσης "%1".  Παρακαλώ βεβαιωθείτε ότι έχει ήδη εγκατασταθεί.</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="412"/>
+        <location filename="../main.cpp" line="412"></location>
         <source>Application Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Πρόβλημα Εφαρμογής</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="412"/>
+        <location filename="../main.cpp" line="412"></location>
         <source>The following application experienced an error and needed to close:</source>
-        <translation type="unfinished"></translation>
+        <translation>Η παρακάτω εφαρμογή αντιμετώπισε ένα σφάλμα και πρέπει να τερματιστεί:</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp
index 5f9ca6c4..0e88a227 100644
--- a/src-qt5/core/lumina-session/session.cpp
+++ b/src-qt5/core/lumina-session/session.cpp
@@ -95,7 +95,7 @@ void LSession::start(){
   //Compositing manager
   QSettings settings("lumina-desktop","sessionsettings");
   if(settings.value("enableCompositing",true).toBool()){
-    if(LUtils::isValidBinary("compton")){ 
+    if(LUtils::isValidBinary("compton")){
       QString set = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/compton.conf";
       if(!QFile::exists(set)){
         if(QFile::exists(LOS::LuminaShare()+"/compton.conf")){
@@ -106,6 +106,16 @@ void LSession::start(){
         qDebug() << "Using default compton settings";
         startProcess("compositing","compton");
       }else{
+        //Auto-detect if GLX is available on the system and turn it on/off as needed
+       if(LUtils::isValidBinary("glxinfo")){
+         bool hasAccel =! LUtils::getCmdOutput("glxinfo -B").filter("direct rendering:").filter("Yes").isEmpty();
+         qDebug() << "Detected GPU Acceleration:" << hasAccel;
+         QStringList info = LUtils::readFile(set);
+         for(int i=0; i<info.length(); i++){ 
+           if(info[i].section("=",0,0).simplified()=="backend"){ info[i] = QString("backend = \"")+ (hasAccel ? "glx" : "xrender")+"\""; break; } //replace this line
+         }
+         LUtils::writeFile(set, info, true);
+       }
         startProcess("compositing","compton --config \""+set+"\"", QStringList() << set);
       }
     }else if(LUtils::isValidBinary("xcompmgr")){ startProcess("compositing","xcompmgr"); }
diff --git a/src-qt5/desktop-utils/lumina-fm/Browser.cpp b/src-qt5/desktop-utils/lumina-fm/Browser.cpp
new file mode 100644
index 00000000..b207604c
--- /dev/null
+++ b/src-qt5/desktop-utils/lumina-fm/Browser.cpp
@@ -0,0 +1,81 @@
+//===========================================
+//  Lumina-DE source code
+//  Copyright (c) 2016, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+#include "Browser.h"
+
+Browser::Browser(QObject *parent) : QObject(parent){
+  watcher = new QFileSystemWatcher(this);
+  connect(watcher, SIGNAL(fileChanged(const QString&)), this, SLOT(fileChanged(QString)) );
+  connect(watcher, SIGNAL(directoryChanged(const QString&)), this, SLOT(dirChanged(QString)) );
+  showHidden = false;
+}
+
+Browser::~Browser(){
+  watcher->deleteLater();
+}
+
+QString Browser::currentDirectory(){ return currentDir; }
+
+void Browser::showHiddenFiles(bool show){
+  if(show !=showHidden){
+    showHidden = show;
+    QTimer::singleShot(0, this, SLOT(loadDirectory()) );
+  }
+}
+bool Browser::showingHiddenFiles(){
+  return showHidden;
+}
+
+//   PRIVATE
+void Browser::loadItem(QFileInfo info){
+  LFileInfo linfo(info);
+  QIcon ico;
+  if(linfo.isImage()){
+    QPixmap pix;
+    if(pix.load(info.absoluteFilePath()) ){
+      if(pix.height()>128){ pix = pix.scaled(128, 128, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); }
+      ico.addPixmap(pix);
+    }
+  }else if(linfo.isDirectory()){
+    ico = LXDG::findIcon("folder","inode/directory");
+  }
+  if(ico.isNull()){ ico = LXDG::findIcon(linfo.mimetype(), "unknown"); }
+  emit ItemDataAvailable(ico, linfo);
+}
+
+// PRIVATE SLOTS
+void Browser::fileChanged(QString file){
+  if(file.startsWith(currentDir+"/")){ emit itemUpdated(file); }
+  else if(file==currentDir){ QTimer::singleShot(0, this, SLOT(loadDirectory()) ); }
+}
+
+void Browser::dirChanged(QString dir){
+  if(dir==currentDir){ QTimer::singleShot(0, this, SLOT(loadDirectory()) ); }
+  else if(dir.startsWith(currentDir)){ emit itemUpdated(dir); }
+}
+
+// PUBLIC SLOTS
+QString Browser::loadDirectory(QString dir){
+  if(dir.isEmpty()){ dir = currentDir; } //reload current directory
+  if(dir.isEmpty()){ return; } //nothing to do - nothing previously loaded
+  //clean up the watcher first
+  QStringList watched; watched << watcher->files() << watcher->directories();
+  if(!watched.isEmpty()){ watcher->removePaths(watched); }
+  emit clearItems(); //let the main widget know to clear all current items
+  //QApplication::processEvents();
+  // read the given directory
+  QDir directory(dir);
+  if(directory.exists()){
+    QFileInfoList files;
+    if(showHidden){ files = directory.entryInfoList( QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoDotOrDotDot, QDir::NoSort); }
+    else{ files = directory.entryInfoList( QDir::Dirs | QDir::Files | QDir::NoDotOrDotDot, QDir::NoSort); }
+    for(int i=0; i<files.length(); i++){
+      watcher->addPath(files[i].absoluteFilePath());
+      QtConcurrent::run(this, &Browser::loadDirectory, files[i]);
+    }
+    watcher->addPath(directory.absolutePath());
+  }
+}
diff --git a/src-qt5/desktop-utils/lumina-fm/Browser.h b/src-qt5/desktop-utils/lumina-fm/Browser.h
new file mode 100644
index 00000000..ccc10c02
--- /dev/null
+++ b/src-qt5/desktop-utils/lumina-fm/Browser.h
@@ -0,0 +1,47 @@
+//===========================================
+//  Lumina-DE source code
+//  Copyright (c) 2016, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+//  This is the main browsing backend for the file manager
+//===========================================
+#ifndef _LUMINA_FM_BROWSE_BACKEND_H
+#define _LUMINA_FM_BROWSE_BACKEND_H
+
+class Browser : public QObject{
+	Q_OBJECT
+public:
+	Browser(QObject *parent = 0);
+	~Browser();
+
+	QString currentDirectory();
+	void showHiddenFiles(bool);
+	bool showingHiddenFiles();
+
+private:
+	QString currentDir;
+	QFileSystemWatcher *watcher;
+	bool showHidden;
+
+	void loadItem(QFileInfo info); //this is the main loader class - multiple instances each run in a separate thread
+
+private slots:
+	void fileChanged(QString); //tied into the watcher - for file change notifications
+	void dirChanged(QString); // tied into the watcher - for new/removed files in the current dir
+
+public slots:
+	QString loadDirectory(QString dir = "");
+
+signals:
+	//Main Signals
+	void itemUpdated(QString item); //emitted if a file changes after the initial scan
+	void clearItems(); //emitted when dirs change for example
+	void itemDataAvailable(QIcon, LFileInfo);
+
+	//Start/Stop signals for loading of data
+	void itemsLoading(int); //number of items which are getting loaded
+
+};
+
+#endif
diff --git a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp
new file mode 100644
index 00000000..12fd36fe
--- /dev/null
+++ b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp
@@ -0,0 +1,70 @@
+//===========================================
+//  Lumina-DE source code
+//  Copyright (c) 2016, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+#include "BrowserWidget.h"
+BrowserWidget::BrowserWidget(QString objID, QWidget *parent) : QWidget(parent){
+  //Setup the Widget/UI
+  this->setLayout( new QVBoxLayout(this) );
+  
+  //Setup the backend browser object
+  BROWSER = new Browser(this);
+  connect(BROWSER, SIGNAL(clearItems()), this, SLOT(clearItems()) );
+  connect(BROWSER, SIGNAL(itemUpdated(QString)), this, SLOT(itemUpdated(QString)) );
+  connect(BROWSER, SIGNAL(itemUpdated(QString)), this, SLOT(itemUpdated(QString)) );
+  connect(BROWSER, SIGNAL(itemUpdated(QString)), this, SLOT(itemUpdated(QString)) );
+
+  listWidget = 0;
+  treeWidget = 0;
+}
+
+BrowserWidget::~BrowserWidget(){
+
+}
+
+void BrowserWidget::changeDirectory(QString dir){
+  if(BROWSER->currentDirectory()==dir){ return; } //already on this directory
+  BROWSER->loadDirectory(dir);
+}
+
+// =================
+//    PRIVATE SLOTS
+// =================
+void BrowserWidget::clearItems(){
+  if(listWidget!=0){ listWidget->clear(); }
+  else if(treeWidget!=0){ treeWidget->clear(); }
+  this->setEnabled(false);
+}
+
+void BrowserWidget::itemUpdated(QString item){
+  if(treeWidget==0){ return; } //only used for the tree widget/details
+  qDebug() << "item updated" << item;
+  QList<QTreeWidgetItem*> found = treeWidget->findItems(item.section("/",-1), Qt::MatchExactly, 0); //look for exact name match
+  if(found.isEmpty()){ return; } //no match
+  QTreeWidgetItem *it = found[0]; //onlyp update the first match (should only ever be one - duplicate file names are disallowed)
+  //it->setText(
+}
+
+void BrowserWidget::itemDataAvailable(QIcon ico, LFileInfo info){
+  int num = 0;
+  if(listWidget!=0){
+    listWidget->addItem( new QListWidgetItem(ico, info.fileName(), listWidget) );
+    num = listWidget->count();
+  }else if(treeWidget!=0){
+    //TODO
+  }
+  if(num < numItems){
+    //Still loading items
+    //this->setEnabled(false);
+  }else{
+    //Done loading items
+    this->setEnabled(true);
+  }
+}
+
+void BrowserWidget::itemsLoading(int total){
+  numItems = total; //save this for later
+}
+
diff --git a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.h b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.h
new file mode 100644
index 00000000..a0dc535a
--- /dev/null
+++ b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.h
@@ -0,0 +1,97 @@
+//  Lumina-DE source code
+//  Copyright (c) 2016, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+//  This is the main browsing frontend for the file manager
+//===========================================
+#ifndef _LUMINA_FM_BROWSE_FRONTEND_H
+#define _LUMINA_FM_BROWSE_FRONTEND_H
+
+#include "Browser.h"
+#include "widgets/DDListWidgets.h"
+
+class BrowserWidget : public QWidget{
+	Q_OBJECT
+private:
+	Browser *DIR:
+	QString ID;
+	int numItems; //used for checking if all the items have loaded yet
+	bool details; //show details or not
+
+	//The drag and drop brower widgets
+	DDListWidget *listWidget;
+	DDTreeWidget *treeWidget;
+
+public:
+	BrowserWidget(QString objID, QWidget *parent = 0);
+	~BrowserWidget();
+
+	QString id(){ return ID; }
+
+	void changeDirectory(QString dir);
+
+	void showDetails(bool show);
+	bool hasDetails();
+
+public slots:
+
+private slots:
+	//Brower connections
+	void clearItems();
+	void itemUpdated(QString);
+	void itemDataAvailable(QIcon, LFileInfo);
+	void itemsLoading(int total);
+
+signals:
+	//void activated(QString); //current dir path
+	void dirChanged(QString); //current dir path
+	
+};
+
+/*
+ * Virtual class for managing the sort of folders/files items. The problem with base class is that it only manages texts fields and
+ * we have dates and sizes.
+ *
+ * On this class, we overwrite the function operator<.
+ */
+
+class CQTreeWidgetItem : public QTreeWidgetItem {
+public:
+    CQTreeWidgetItem(int type = Type) : QTreeWidgetItem(type) {}
+    CQTreeWidgetItem(const QStringList & strings, int type = Type) : QTreeWidgetItem(strings, type) {}
+    CQTreeWidgetItem(QTreeWidget * parent, int type = Type) : QTreeWidgetItem(parent, type) {}
+    CQTreeWidgetItem(QTreeWidget * parent, const QStringList & strings, int type = Type) : QTreeWidgetItem(parent, strings, type) {}
+    CQTreeWidgetItem(QTreeWidget * parent, QTreeWidgetItem * preceding, int type = Type) : QTreeWidgetItem(parent, preceding, type) {}
+    CQTreeWidgetItem(QTreeWidgetItem * parent, int type = Type) : QTreeWidgetItem(parent, type) {}
+    CQTreeWidgetItem(QTreeWidgetItem * parent, const QStringList & strings, int type = Type) : QTreeWidgetItem(parent, strings, type) {}
+    CQTreeWidgetItem(QTreeWidgetItem * parent, QTreeWidgetItem * preceding, int type = Type) : QTreeWidgetItem(parent, preceding, type) {}
+    virtual ~CQTreeWidgetItem() {}
+    inline virtual bool operator<(const QTreeWidgetItem &tmp) const {
+      int column = this->treeWidget()->sortColumn();
+      // We are in date text
+      if(column == DirWidget::DATEMOD || column == DirWidget::DATECREATE)
+        return this->whatsThis(column) < tmp.whatsThis(column);
+      // We are in size text
+      else if(column == DirWidget::SIZE) {
+        QString text = this->text(column);
+        QString text_tmp = tmp.text(column);
+        double filesize, filesize_tmp;
+        // On folders, text is empty so we check for that
+        // In case we are in folders, we put -1 for differentiate of regular files with 0 bytes.
+        // Doing so, all folders we'll be together instead of mixing with files with 0 bytes.
+        if(text.isEmpty())
+          filesize = -1;
+        else
+          filesize = LUtils::DisplaySizeToBytes(text);
+        if(text_tmp.isEmpty())
+          filesize_tmp = -1;
+        else
+          filesize_tmp = LUtils::DisplaySizeToBytes(text_tmp);
+        return filesize < filesize_tmp;
+      }
+      // In other cases, we trust base class implementation
+      return QTreeWidgetItem::operator<(tmp);
+    }
+};
+#endif
diff --git a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
index abe14c0d..59b671b5 100644
--- a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
@@ -59,11 +59,11 @@ QSize orig = settings->value("preferences/MainWindowSize", QSize()).toSize();
     connect(worker, SIGNAL(DirDataAvailable(QString, QString, LFileInfoList)), this, SLOT(DirDataAvailable(QString, QString, LFileInfoList)) );
     connect(worker, SIGNAL(SnapshotDataAvailable(QString, QString, QStringList)), this, SLOT(SnapshotDataAvailable(QString, QString, QStringList)) );
     worker->moveToThread(workThread);
-  if(DEBUG){ qDebug() << " - File System Model"; }
-  fsmod = new QFileSystemModel(this);
-    fsmod->setRootPath(QDir::homePath());
-  dirCompleter = new QCompleter(fsmod, this);
-    dirCompleter->setModelSorting( QCompleter::CaseInsensitivelySortedModel );
+  //if(DEBUG){ qDebug() << " - File System Model"; }
+  //fsmod = new QFileSystemModel(this);
+    //fsmod->setRootPath(QDir::homePath());
+  //dirCompleter = new QCompleter(fsmod, this);
+    //dirCompleter->setModelSorting( QCompleter::CaseInsensitivelySortedModel );
   if(DEBUG){ qDebug() << " - Context Menu"; }
   contextMenu = new QMenu(this);
   radio_view_details = new QRadioButton(tr("Detailed List"), this);
@@ -187,7 +187,7 @@ void MainUI::OpenDirs(QStringList dirs){
     DW->setDetails(details); //Which details to show and in which order (L->R)
     DW->setShowThumbnails(ui->actionShow_Thumbnails->isChecked());
     DW->setThumbnailSize(settings->value("iconsize", 32).toInt());
-    DW->setDirCompleter(dirCompleter);
+    //DW->setDirCompleter(dirCompleter);
     DW->setShowCloseButton(!radio_view_tabs->isChecked());
     //Now load the directory
     DW->ChangeDir(dirs[i]); //kick off loading the directory info
diff --git a/src-qt5/desktop-utils/lumina-fm/MainUI.h b/src-qt5/desktop-utils/lumina-fm/MainUI.h
index 6df10a89..19b40406 100644
--- a/src-qt5/desktop-utils/lumina-fm/MainUI.h
+++ b/src-qt5/desktop-utils/lumina-fm/MainUI.h
@@ -77,7 +77,7 @@ private:
 	DirData *worker;
 	//Internal non-ui widgets
 	QTabBar *tabBar;
-	QFileSystemModel *fsmod;
+	//QFileSystemModel *fsmod;
 	QMenu *contextMenu;
 	QRadioButton *radio_view_details, *radio_view_list, *radio_view_tabs, *radio_view_cols;
 	QWidgetAction *detWA, *listWA, *tabsWA, *colsWA;
@@ -89,7 +89,7 @@ private:
 	
     QSettings *settings;
     QShortcut *nextTabLShort, *nextTabRShort, *togglehiddenfilesShort, *focusDirWidgetShort;
-	QCompleter *dirCompleter;
+	//QCompleter *dirCompleter;
 
 	//Simplification Functions
 	void setupConnections(); 	//used during initialization
diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget.cpp b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget.cpp
index b8b4da0b..d5f15a50 100644
--- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget.cpp
@@ -26,7 +26,7 @@
 #define DEBUG 0
 
 
-const QString sessionsettings_config_file = QDir::homePath() + "/.lumina/LuminaDE/sessionsettings.conf";
+const QString sessionsettings_config_file = QDir::homePath() + "/.config/lumina-desktop/sessionsettings.conf";
 
 DirWidget::DirWidget(QString objID, QWidget *parent) : QWidget(parent), ui(new Ui::DirWidget){
   ui->setupUi(this); //load the designer file
diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget.h b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget.h
index 3ef9940b..afbb98cc 100644
--- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget.h
+++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget.h
@@ -73,7 +73,7 @@ public slots:
 	void UpdateButtons();
 
 	//Keyboard Shortcuts triggered
-    void TryRenameSelection();
+	void TryRenameSelection();
 	void TryCutSelection();
 	void TryCopySelection();
 	void TryPasteSelection();