Merge remote-tracking branch 'upstream/master'

5 files changed, 28 insertions, 24 deletions

diff --git a/src-qt5/core/lumina-open/LFileDialog.cpp b/src-qt5/core/lumina-open/LFileDialog.cpp
index a0fef17c..a400c60b 100644
--- a/src-qt5/core/lumina-open/LFileDialog.cpp
+++ b/src-qt5/core/lumina-open/LFileDialog.cpp
@@ -161,11 +161,13 @@ void LFileDialog::generateAppList(bool shownetwork){
   XDGDesktopList applist;
     applist.updateList();
   PREFAPPS = getPreferredApplications();
-  //qDebug() << "Preferred Apps:" << PREFAPPS;
+  qDebug() << "Preferred Apps:" << PREFAPPS;
   ui->combo_rec->clear();
   //Now get the application mimetype for the file extension (if available)
   QStringList mimetypes = LXDG::findAppMimeForFile(filePath, true).split("::::"); //use all mimetypes
     mimetypes.removeDuplicates();
+  QString defapp = getDefaultApp(mimetypes.first()); //default application
+  if(!defapp.isEmpty() && !PREFAPPS.contains(defapp) ){ PREFAPPS << defapp; } //ensure this is listed in the preferred apps list
   //Now add all the detected applications
   QHash< QString, QList<XDGDesktop*> > hash = LXDG::sortDesktopCats( applist.apps(false,true) );
   QStringList cat = hash.keys();
@@ -205,7 +207,9 @@ void LFileDialog::generateAppList(bool shownetwork){
   for(int i=0; i<PREFAPPS.length(); i++){
     XDGDesktop dFile(PREFAPPS[i]);
     if( dFile.isValid() ){
-      ui->combo_rec->addItem( LXDG::findIcon(dFile.icon, "application-x-desktop"), dFile.name);
+      QString txt = dFile.name;
+      if(PREFAPPS[i] == defapp){ txt.prepend( tr("[default] ") ); }
+      ui->combo_rec->addItem( LXDG::findIcon(dFile.icon, "application-x-desktop"), txt);
       if(i==0){ ui->combo_rec->setCurrentIndex(0); } //make sure the first item is selected
     }else{
       PREFAPPS.removeAt(i); //invalid app
diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_da.ts b/src-qt5/core/lumina-open/i18n/lumina-open_da.ts
index 757d5128..4f6d82c2 100644
--- a/src-qt5/core/lumina-open/i18n/lumina-open_da.ts
+++ b/src-qt5/core/lumina-open/i18n/lumina-open_da.ts
@@ -31,7 +31,7 @@
     <message>
         <location filename="../LFileDialog.ui" line="138"/>
         <source>Find</source>
-        <translation>Søg</translation>
+        <translation>Find</translation>
     </message>
     <message>
         <location filename="../LFileDialog.ui" line="199"/>
@@ -41,22 +41,22 @@
     <message>
         <location filename="../LFileDialog.ui" line="221"/>
         <source>OK</source>
-        <translation>Ok</translation>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../LFileDialog.ui" line="235"/>
         <source>Cancel</source>
-        <translation>Annullér</translation>
+        <translation>Annuller</translation>
     </message>
     <message>
         <location filename="../LFileDialog.cpp" line="40"/>
         <source>(Email Link)</source>
-        <translation>Email henvisning</translation>
+        <translation>(e-maillink)</translation>
     </message>
     <message>
         <location filename="../LFileDialog.cpp" line="41"/>
         <source>(Internet URL - %1)</source>
-        <translation>(Internet URL - %1)</translation>
+        <translation>(Internet-URL - %1)</translation>
     </message>
     <message>
         <location filename="../LFileDialog.cpp" line="114"/>
@@ -121,7 +121,7 @@
     <message>
         <location filename="../LFileDialog.cpp" line="126"/>
         <source>Utilities</source>
-        <translation>Værktøjer</translation>
+        <translation>Redskaber</translation>
     </message>
     <message>
         <location filename="../LFileDialog.cpp" line="127"/>
@@ -145,13 +145,13 @@
         <location filename="../main.cpp" line="188"/>
         <location filename="../main.cpp" line="194"/>
         <source>Audio Volume %1%</source>
-        <translation>Lyd Volume %1%</translation>
+        <translation>Lydstyrke %1%</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="202"/>
         <location filename="../main.cpp" line="211"/>
         <source>Screen Brightness %1%</source>
-        <translation>skærm-lysstyrke %1%</translation>
+        <translation>Skærm-lysstyrke %1%</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="243"/>
@@ -161,7 +161,7 @@
     <message>
         <location filename="../main.cpp" line="264"/>
         <source>Application entry is invalid: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Programpost er ugyldig: %1</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="273"/>
@@ -171,7 +171,7 @@
     <message>
         <location filename="../main.cpp" line="284"/>
         <source>URL shortcut is missing the URL: %1</source>
-        <translation>URL genvej mangler URL&apos;en: %1</translation>
+        <translation>URL genvej mangler URL'en: %1</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="295"/>
@@ -190,8 +190,8 @@
     </message>
     <message>
         <location filename="../main.cpp" line="363"/>
-        <source>Could not find &quot;%1&quot;. Please ensure it is installed first.</source>
-        <translation>Kunne ikke finde &quot;%1&quot;. Sørg for at programmet er installeret først.</translation>
+        <source>Could not find "%1". Please ensure it is installed first.</source>
+        <translation>Kunne ikke finde "%1". Sørg for at programmet er installeret først.</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="413"/>
diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_de.ts b/src-qt5/core/lumina-open/i18n/lumina-open_de.ts
index 8af30d78..08e0bb7e 100644
--- a/src-qt5/core/lumina-open/i18n/lumina-open_de.ts
+++ b/src-qt5/core/lumina-open/i18n/lumina-open_de.ts
@@ -161,7 +161,7 @@
     <message>
         <location filename="../main.cpp" line="264"/>
         <source>Application entry is invalid: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Anwendungseintrag ist ungültig: %1</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="273"/>
@@ -171,17 +171,17 @@
     <message>
         <location filename="../main.cpp" line="284"/>
         <source>URL shortcut is missing the URL: %1</source>
-        <translation>fehlende URL für URL: %1</translation>
+        <translation>URL-Verknüpfung fehlt die URL: %1</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="295"/>
         <source>Directory shortcut is missing the path to the directory: %1</source>
-        <translation>fehlender Pfad zum Verzeichnis der Verknüpfung: %1</translation>
+        <translation>Verzeichnisverknüpfung fehlt der Pfad zum Verzeichnis: %1</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="300"/>
         <source>Unknown type of shortcut : %1</source>
-        <translation>unbekannter Typ für Vernüpfung: %1</translation>
+        <translation>Unbekannter Typ für Vernüpfung: %1</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="363"/>
@@ -190,8 +190,8 @@
     </message>
     <message>
         <location filename="../main.cpp" line="363"/>
-        <source>Could not find &quot;%1&quot;. Please ensure it is installed first.</source>
-        <translation>Konnte &quot;%1&quot; nicht finden. Bitte stellen Sie zuerst sicher, dass es installiert ist.</translation>
+        <source>Could not find "%1". Please ensure it is installed first.</source>
+        <translation>Konnte "%1" nicht finden. Bitte stellen Sie zuerst sicher, dass es installiert ist.</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="413"/>
diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_it.ts b/src-qt5/core/lumina-open/i18n/lumina-open_it.ts
index 341374d2..415476ca 100644
--- a/src-qt5/core/lumina-open/i18n/lumina-open_it.ts
+++ b/src-qt5/core/lumina-open/i18n/lumina-open_it.ts
@@ -26,7 +26,7 @@
     <message>
         <location filename="../LFileDialog.ui" line="131"/>
         <source>Binary Location</source>
-        <translation type="unfinished">Posizione codice binario</translation>
+        <translation>Posizione codice binario</translation>
     </message>
     <message>
         <location filename="../LFileDialog.ui" line="138"/>
diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_lt.ts b/src-qt5/core/lumina-open/i18n/lumina-open_lt.ts
index acb59691..fce7de40 100644
--- a/src-qt5/core/lumina-open/i18n/lumina-open_lt.ts
+++ b/src-qt5/core/lumina-open/i18n/lumina-open_lt.ts
@@ -161,7 +161,7 @@
     <message>
         <location filename="../main.cpp" line="264"/>
         <source>Application entry is invalid: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Programos įrašas yra neteisingas: %1</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="273"/>
@@ -190,8 +190,8 @@
     </message>
     <message>
         <location filename="../main.cpp" line="363"/>
-        <source>Could not find &quot;%1&quot;. Please ensure it is installed first.</source>
-        <translation>Nepavyko rasti &quot;%1&quot;. Iš pradžių, įsitikinkite ar ji įdiegta.</translation>
+        <source>Could not find "%1". Please ensure it is installed first.</source>
+        <translation>Nepavyko rasti "%1". Iš pradžių, įsitikinkite ar ji įdiegta.</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="413"/>