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

3 files changed, 386 insertions, 15 deletions

diff --git a/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_ca.ts b/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_ca.ts
index 30449ad2..46926497 100644
--- a/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_ca.ts
+++ b/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_ca.ts
@@ -59,12 +59,12 @@
     <message>
         <location filename="../mainUI.ui" line="368"/>
         <source>Love this song</source>
-        <translation>M'agrada aquesta cançó</translation>
+        <translation>M&apos;agrada aquesta cançó</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="384"/>
         <source>Tired of this song (will not play for a month)</source>
-        <translation>Cansat d'aquesta cançó (no sonarà durant un mes)</translation>
+        <translation>Cansat d&apos;aquesta cançó (no sonarà durant un mes)</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="397"/>
@@ -84,7 +84,7 @@
     <message>
         <location filename="../mainUI.ui" line="479"/>
         <source>Delete current station</source>
-        <translation>Suprimeix l'emissora actual</translation>
+        <translation>Suprimeix l&apos;emissora actual</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="482"/>
@@ -129,17 +129,17 @@
     <message>
         <location filename="../mainUI.ui" line="573"/>
         <source>Audio Quality</source>
-        <translation>Qualitat de l'àudio</translation>
+        <translation>Qualitat de l&apos;àudio</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="583"/>
         <source>Proxy URL</source>
-        <translation>URL de l'intermediari</translation>
+        <translation>URL de l&apos;intermediari</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="593"/>
         <source>Control Proxy URL</source>
-        <translation>Control de l'URL de l'intermediari</translation>
+        <translation>Control de l&apos;URL de l&apos;intermediari</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="618"/>
@@ -149,7 +149,7 @@
     <message>
         <location filename="../mainUI.ui" line="656"/>
         <source>Audio Driver</source>
-        <translation>Controlador d'àudio</translation>
+        <translation>Controlador d&apos;àudio</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="681"/>
@@ -164,7 +164,7 @@
     <message>
         <location filename="../mainUI.ui" line="699"/>
         <source>toolBar</source>
-        <translation>Barra d'eines</translation>
+        <translation>Barra d&apos;eines</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="726"/>
@@ -199,7 +199,7 @@
     <message>
         <location filename="../mainUI.ui" line="754"/>
         <source>Raise audio volume</source>
-        <translation>Apuja el volum de l'àudio</translation>
+        <translation>Apuja el volum de l&apos;àudio</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="759"/>
@@ -209,12 +209,12 @@
     <message>
         <location filename="../mainUI.ui" line="762"/>
         <source>Lower audio volume</source>
-        <translation>Abaixa el volum de l'àudio</translation>
+        <translation>Abaixa el volum de l&apos;àudio</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="767"/>
         <source>Close Application</source>
-        <translation>Tanca l'aplicació</translation>
+        <translation>Tanca l&apos;aplicació</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="770"/>
@@ -229,12 +229,12 @@
     <message>
         <location filename="../mainUI.ui" line="789"/>
         <source>From current artist</source>
-        <translation>De l'artista actual</translation>
+        <translation>De l&apos;artista actual</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="792"/>
         <source>Create station from current artist</source>
-        <translation>Crea una emissora de l'artista actual</translation>
+        <translation>Crea una emissora de l&apos;artista actual</translation>
     </message>
     <message>
         <location filename="../mainUI.ui" line="797"/>
@@ -285,7 +285,7 @@
     <message>
         <location filename="../mainUI.cpp" line="105"/>
         <source>Please install the `pianobar` utility to enable this functionality</source>
-        <translation>Si us plau, instal·leu la utilitat "pianobar" per habilitar aquesta funcionalitat.</translation>
+        <translation>Si us plau, instal·leu la utilitat &quot;pianobar&quot; per habilitar aquesta funcionalitat.</translation>
     </message>
     <message>
         <location filename="../mainUI.cpp" line="109"/>
@@ -337,7 +337,7 @@
     <message>
         <location filename="../mainUI.cpp" line="492"/>
         <source>Media Buffering...</source>
-        <translation>S'omple la memòria intermèdia...</translation>
+        <translation>S&apos;omple la memòria intermèdia...</translation>
     </message>
     <message>
         <location filename="../mainUI.cpp" line="576"/>
diff --git a/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_en_AU.ts b/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_en_AU.ts
new file mode 100644
index 00000000..785e0df2
--- /dev/null
+++ b/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_en_AU.ts
@@ -0,0 +1,370 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en_GB">
+<context>
+    <name>MainUI</name>
+    <message>
+        <location filename="../mainUI.ui" line="14"/>
+        <location filename="../mainUI.cpp" line="285"/>
+        <source>Media Player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="50"/>
+        <location filename="../mainUI.ui" line="261"/>
+        <location filename="../mainUI.cpp" line="631"/>
+        <source>Now Playing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="74"/>
+        <source>(No Running Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="105"/>
+        <source>Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="167"/>
+        <source>up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="183"/>
+        <source>down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="267"/>
+        <source>Current Song</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="303"/>
+        <source>TITLE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="327"/>
+        <source>ARTIST</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="337"/>
+        <source>ALBUM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="368"/>
+        <source>Love this song</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="384"/>
+        <source>Tired of this song (will not play for a month)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="397"/>
+        <source>Ban this song (will never play again)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="417"/>
+        <source>View details about song (launches web browser)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="448"/>
+        <source>Current Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="479"/>
+        <source>Delete current station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="482"/>
+        <source>rm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="492"/>
+        <source>Create new station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="495"/>
+        <source>add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="512"/>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="521"/>
+        <source>Pandora Account Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="527"/>
+        <source>Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="537"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="557"/>
+        <source>&lt;a href=https://www.pandora.com/account/register&gt;Need an account?&lt;/a&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="573"/>
+        <source>Audio Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="583"/>
+        <source>Proxy URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="593"/>
+        <source>Control Proxy URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="618"/>
+        <source>Apply Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="656"/>
+        <source>Audio Driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="681"/>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="688"/>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="699"/>
+        <source>toolBar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="726"/>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="731"/>
+        <source>Pause</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="736"/>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="741"/>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="746"/>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="751"/>
+        <source>VolUp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="754"/>
+        <source>Raise audio volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="759"/>
+        <source>VolDown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="762"/>
+        <source>Lower audio volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="767"/>
+        <source>Close Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="770"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="784"/>
+        <source>Close to tray when active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="789"/>
+        <source>From current artist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="792"/>
+        <source>Create station from current artist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="797"/>
+        <source>From current song</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="800"/>
+        <source>Create station from current song</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="811"/>
+        <source>Show song notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="816"/>
+        <source>Search...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="819"/>
+        <source>Search for a new station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="831"/>
+        <location filename="../mainUI.cpp" line="276"/>
+        <source>Pandora Radio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="834"/>
+        <source>Stream from Pandora Radio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="842"/>
+        <source>Local Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.ui" line="845"/>
+        <source>Play Local Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.cpp" line="105"/>
+        <source>Please install the `pianobar` utility to enable this functionality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.cpp" line="109"/>
+        <source>Stream music from the Pandora online radio service</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.cpp" line="122"/>
+        <source>Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.cpp" line="123"/>
+        <source>Medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.cpp" line="124"/>
+        <source>High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.cpp" line="358"/>
+        <source>Open Multimedia Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.cpp" line="406"/>
+        <source>Now Playing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.cpp" line="471"/>
+        <source>[PLAYBACK ERROR]
+%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.cpp" line="488"/>
+        <source>Media Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.cpp" line="490"/>
+        <source>Media Stalled...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.cpp" line="492"/>
+        <source>Media Buffering...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.cpp" line="576"/>
+        <source>Pandora: Create Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.cpp" line="576"/>
+        <source>Search Term</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.cpp" line="654"/>
+        <source>Pandora Question</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainUI.cpp" line="659"/>
+        <source>Pandora Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PianoBarProcess</name>
+    <message>
+        <location filename="../PianoBarProcess.cpp" line="358"/>
+        <source>Could not find any matches. Please try a different search term</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer.pro b/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer.pro
index 90dd2da8..d117cb01 100644
--- a/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer.pro
+++ b/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer.pro
@@ -39,6 +39,7 @@ TRANSLATIONS =  i18n/l-mediap_af.ts \
                 i18n/l-mediap_el.ts \
                 i18n/l-mediap_en_GB.ts \
                 i18n/l-mediap_en_ZA.ts \
+                i18n/l-mediap_en_AU.ts \
                 i18n/l-mediap_es.ts \
                 i18n/l-mediap_et.ts \
                 i18n/l-mediap_eu.ts \