Merge branch 'refs/heads/master' into blueprintcontinuousblueprint

1 files changed, 105 insertions, 48 deletions

diff --git a/installer/translations/nl_NL.ts b/installer/translations/nl_NL.ts
index ef11631..ccfad6f 100644
--- a/installer/translations/nl_NL.ts
+++ b/installer/translations/nl_NL.ts
@@ -4,50 +4,58 @@
 <context>
     <name>InstallWorker</name>
     <message>
-        <location filename="../process/installworker.cpp" line="65"/>
-        <location filename="../process/installworker.cpp" line="184"/>
+        <location filename="../process/installworker.cpp" line="88"/>
+        <location filename="../process/installworker.cpp" line="248"/>
         <source>Downloading %1...</source>
         <translation>%1 Downloaden...</translation>
     </message>
     <message>
-        <location filename="../process/installworker.cpp" line="88"/>
+        <location filename="../process/installworker.cpp" line="117"/>
         <source>Unpacking %1...</source>
         <translation>%1 Uitpakken...</translation>
     </message>
     <message>
-        <location filename="../process/installworker.cpp" line="102"/>
+        <location filename="../process/installworker.cpp" line="134"/>
         <source>Configuring %1...</source>
         <translation>%1 Instellen...</translation>
     </message>
     <message>
-        <location filename="../process/installworker.cpp" line="193"/>
+        <location filename="../process/installworker.cpp" line="257"/>
         <source>%1 of %2</source>
         <translation>%1 van %2</translation>
     </message>
     <message numerus="yes">
-        <location filename="../process/installworker.cpp" line="205"/>
+        <location filename="../process/installworker.cpp" line="269"/>
         <source>%n days remaining</source>
-        <translation><numerusform>%n dag resterend</numerusform>
-        <numerusform>%n dagen resterend</numerusform>
-        </translation></message>
+        <translation>
+            <numerusform>%n dag resterend</numerusform>
+            <numerusform>%n dagen resterend</numerusform>
+        </translation>
+    </message>
     <message numerus="yes">
-        <location filename="../process/installworker.cpp" line="207"/>
+        <location filename="../process/installworker.cpp" line="271"/>
         <source>%n hours remaining</source>
-        <translation><numerusform>%n uur resterend</numerusform>
-        <numerusform>%n uren resterend</numerusform>
-        </translation></message>
+        <translation>
+            <numerusform>%n uur resterend</numerusform>
+            <numerusform>%n uren resterend</numerusform>
+        </translation>
+    </message>
     <message numerus="yes">
-        <location filename="../process/installworker.cpp" line="209"/>
+        <location filename="../process/installworker.cpp" line="273"/>
         <source>%n minutes remaining</source>
-        <translation><numerusform>%n minuut resterend</numerusform>
-        <numerusform>%n minuten resterend</numerusform>
-        </translation></message>
+        <translation>
+            <numerusform>%n minuut resterend</numerusform>
+            <numerusform>%n minuten resterend</numerusform>
+        </translation>
+    </message>
     <message numerus="yes">
-        <location filename="../process/installworker.cpp" line="211"/>
+        <location filename="../process/installworker.cpp" line="275"/>
         <source>%n seconds remaining</source>
-        <translation><numerusform>%n seconde resterend</numerusform>
-        <numerusform>%n seconden resterend</numerusform>
-        </translation></message>
+        <translation>
+            <numerusform>%n seconde resterend</numerusform>
+            <numerusform>%n seconden resterend</numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -73,7 +81,7 @@
     </message>
     <message>
         <location filename="../mainwindow.ui" line="225"/>
-        <location filename="../mainwindow.ui" line="481"/>
+        <location filename="../mainwindow.ui" line="527"/>
         <source>Install Now</source>
         <translation>Nu Installeren</translation>
     </message>
@@ -83,107 +91,156 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="339"/>
+        <location filename="../mainwindow.ui" line="385"/>
         <source>Install To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="349"/>
+        <location filename="../mainwindow.ui" line="395"/>
         <source>Install for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="356"/>
+        <location filename="../mainwindow.ui" line="402"/>
         <source>Stream</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="363"/>
+        <location filename="../mainwindow.ui" line="409"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="391"/>
+        <location filename="../mainwindow.ui" line="437"/>
         <source>Everyone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="407"/>
+        <location filename="../mainwindow.ui" line="453"/>
         <source>This user only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="438"/>
+        <location filename="../mainwindow.ui" line="484"/>
         <source>Stable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="454"/>
+        <location filename="../mainwindow.ui" line="500"/>
         <source>Blueprint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="606"/>
+        <location filename="../mainwindow.ui" line="640"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="682"/>
         <source>Installation is complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="668"/>
+        <location filename="../mainwindow.ui" line="744"/>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="723"/>
+        <location filename="../mainwindow.ui" line="799"/>
         <source>Installation failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="748"/>
+        <location filename="../mainwindow.ui" line="824"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="755"/>
+        <location filename="../mainwindow.ui" line="831"/>
         <source>Try Again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="39"/>
+        <location filename="../mainwindow.cpp" line="58"/>
         <source>Invalid metadata was received</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="46"/>
+        <location filename="../mainwindow.cpp" line="65"/>
         <source>Application name not in metadata</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="56"/>
+        <location filename="../mainwindow.cpp" line="75"/>
         <source>Open %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="76"/>
         <source>Install %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="65"/>
+        <location filename="../mainwindow.cpp" line="108"/>
+        <source>Update Now</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="125"/>
+        <location filename="../mainwindow.cpp" line="126"/>
+        <source>GNU General Public License, version 3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="130"/>
+        <location filename="../mainwindow.cpp" line="131"/>
+        <source>GNU General Public License, version 3, or later</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="135"/>
+        <location filename="../mainwindow.cpp" line="136"/>
+        <source>GNU General Public License, version 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="140"/>
+        <location filename="../mainwindow.cpp" line="141"/>
+        <source>GNU General Public License, version 2, or later</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="148"/>
+        <source>By installing %1, you&apos;re indicating agreement to the terms of the %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="162"/>
         <source>Couldn&apos;t retrieve metadata</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="69"/>
+        <location filename="../mainwindow.cpp" line="166"/>
         <source>Couldn&apos;t connect securely to the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="119"/>
+        <location filename="../mainwindow.cpp" line="248"/>
+        <source>%1 currently running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="248"/>
+        <source>Before we continue, you&apos;ll need to close %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="260"/>
         <source>Getting ready to install %1...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="159"/>
+        <location filename="../mainwindow.cpp" line="306"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
@@ -232,27 +289,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maintainwindow.cpp" line="35"/>
+        <location filename="../maintainwindow.cpp" line="43"/>
         <source>Modify %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maintainwindow.cpp" line="36"/>
+        <location filename="../maintainwindow.cpp" line="44"/>
         <source>Are you sure you want to uninstall %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maintainwindow.cpp" line="90"/>
+        <location filename="../maintainwindow.cpp" line="98"/>
         <source>%1 currently running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maintainwindow.cpp" line="90"/>
+        <location filename="../maintainwindow.cpp" line="98"/>
         <source>Before we continue, you&apos;ll need to close %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maintainwindow.cpp" line="111"/>
+        <location filename="../maintainwindow.cpp" line="119"/>
         <source>Getting ready to uninstall %1...</source>
         <translation type="unfinished"></translation>
     </message>