Merge pull request #3 from iRail/upgrade-1.1

V1.1 BETA release
iRail · Jun 8, 2017 · 170ae8e · 170ae8e
2 parents 0c9c457 + 2d3e168
commit 170ae8e
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 55 deletions.
diff --git a/harbour-berail.pro.user b/harbour-berail.pro.user
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.1, 2017-06-04T20:03:06. -->
+<!-- Written by QtCreator 4.0.1, 2017-06-07T11:03:05. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
   <value type="QByteArray">{f3ecafd1-b01f-4e43-9e3b-2de7d2f262d2}</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
-  <value type="int">1</value>
+  <value type="int">0</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.EditorSettings</variable>

diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml
@@ -33,7 +33,7 @@ Page {
 
             PageHeader { title: qsTr("About %1 V%2").arg(app.name).arg(app.version) }
 
-            SectionHeader { text: qsTr("What's %1").arg(app.name) }
+            SectionHeader { text: qsTr("What's %1 ?").arg(app.name) }
             TextLabel { labelText: qsTr("%1 is an opensource application to plan your NMBS/SNCB railway journeys on your Sailfish OS smartphone!").arg(app.name) }
 
             SectionHeader { text: qsTr("Privacy & licensing") }

diff --git a/qml/pages/FirstPage.qml b/qml/pages/FirstPage.qml
@@ -60,16 +60,19 @@ Page {
             MenuItem {
                 text: qsTr("About")
                 onClicked: pageStack.push(Qt.resolvedUrl("AboutPage.qml"))
+                enabled: !_loading
             }
 
             MenuItem {
                 text: qsTr("Settings")
                 onClicked: pageStack.push(Qt.resolvedUrl("SettingsPage.qml"))
+                enabled: !_loading
             }
 
             MenuItem {
                 text: qsTr("Liveboard")
                 onClicked: pageStack.push(Qt.resolvedUrl("LiveboardPage.qml"))
+                enabled: !_loading
             }
         }
 

diff --git a/translations/harbour-berail-de.ts b/translations/harbour-berail-de.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="de">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.1">
 <context>
     <name>AboutPage</name>
     <message>
@@ -21,39 +19,39 @@
     </message>
     <message>
         <source>About %1 V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>What&apos;s %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Über %1 V%2</translation>
     </message>
     <message>
         <source>%1 is an opensource application to plan your NMBS/SNCB railway journeys on your Sailfish OS smartphone!</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ist ein Open Source Programm um Bahnfahrten mit der belgischen NMBS/SNCB auf dem Smartphone zu planen!</translation>
     </message>
     <message>
         <source>%1 will never collect any personal information about the user, but this can&apos;t be guaranteed from any third-party company used in %1</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 selbst wird niemals Ihre persönlichen Informationen sammeln, aber dies kann für keine weitere in %1  involvierte Partei garantiert werden.</translation>
     </message>
     <message>
         <source>This application is released under GPLv3. The source code and the license is available in the Github repo of %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieses Programm wird unter der GPLv3 zur Verfügung gestellt. Der Quellcode und die Lizenz sind im Github repo von %1 verfügbar.</translation>
     </message>
     <message>
         <source>Donate with %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Per %1 spenden</translation>
     </message>
     <message>
         <source>%1 can be translated into your language but for that we need your help! You can translate this app on %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 kann mit deiner Hilfe in deine Sprache übersetzt werden! Übersetzte dieses Programm auf %2</translation>
     </message>
     <message>
         <source>%1 project</source>
-        <translation type="unfinished"></translation>
+        <translation>Projekt %1</translation>
     </message>
     <message>
         <source>Icon by %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Icon von %1</translation>
+    </message>
+    <message>
+        <source>What&apos;s %1 ?</source>
+        <translation>Was ist %1</translation>
     </message>
 </context>
 <context>
@@ -190,23 +188,23 @@
     </message>
     <message>
         <source>Routeplanner</source>
-        <translation type="unfinished"></translation>
+        <translation>Routenplaner</translation>
     </message>
     <message>
         <source>Time is</source>
-        <translation type="unfinished"></translation>
+        <translation>Es ist jetzt</translation>
     </message>
     <message>
         <source>departure</source>
-        <translation type="unfinished"></translation>
+        <translation>Abfahrt</translation>
     </message>
     <message>
         <source>arrival</source>
-        <translation type="unfinished"></translation>
+        <translation>Ankunft</translation>
     </message>
     <message>
         <source>Select here if you want to use the given time as either the time of arrival or departure.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wähle diesen Zeitpunkt als Abfahrts- oder Ankunftszeit.</translation>
     </message>
 </context>
 <context>

diff --git a/translations/harbour-berail-nl.ts b/translations/harbour-berail-nl.ts
@@ -2,52 +2,56 @@
 <context>
     <name>AboutPage</name>
     <message>
-        <source>About</source>
-        <translation>Over</translation>
+        <source>Privacy &amp; licensing</source>
+        <translation>Privacy &amp; licentie</translation>
     </message>
     <message>
-        <source>What&apos;s</source>
-        <translation>Wat is</translation>
+        <source>Developer &amp; source code</source>
+        <translation>Ontwikkelaar &amp; broncode</translation>
     </message>
     <message>
-        <source>is an opensource application to plan your NMBS/SNCB railway journeys on your Sailfish OS smartphone!</source>
-        <translation>is een opensource applicatie om je reizen met de Belgische spoorwegen te plannen op je Sailfish OS smartphone!</translation>
+        <source>Source code</source>
+        <translation>Broncode</translation>
     </message>
     <message>
-        <source>Privacy &amp; licensing</source>
-        <translation>Privacy &amp; licentie</translation>
+        <source>Powered by</source>
+        <translation>Met dank aan</translation>
     </message>
     <message>
-        <source>will never collect any personal information about the user, but this can&apos;t be guaranteed from any third-party company used in</source>
-        <translation>zal nooit persoonlijke informatie verzamelen over de gebruiker, maar dit kan niet gegarandeerd worden van alle derde partijen die gebruikt worden in</translation>
+        <source>About %1 V%2</source>
+        <translation>Over %1 V%2</translation>
     </message>
     <message>
-        <source>This application is released under GPLv3. The source code and the license is available in the Github repo of</source>
-        <translation>Deze applicatie is uitgegeven onder de GPLv3-licentie. Broncode en licentie zijn beschikbaar in de GitHub-repository van</translation>
+        <source>%1 is an opensource application to plan your NMBS/SNCB railway journeys on your Sailfish OS smartphone!</source>
+        <translation>%1 is een opensource applicatie om je reizen met de Belgische spoorwegen te plannen op je Sailfish OS smartphone!</translation>
     </message>
     <message>
-        <source>Developer &amp; source code</source>
-        <translation>Ontwikkelaar &amp; broncode</translation>
+        <source>%1 will never collect any personal information about the user, but this can&apos;t be guaranteed from any third-party company used in %1</source>
+        <translation>%1 zal nooit persoonlijke informatie verzamelen over de gebruiker, maar dit kan niet gegarandeerd worden van alle derde partijen die gebruikt worden in %1</translation>
     </message>
     <message>
-        <source>Source code</source>
-        <translation>Broncode</translation>
+        <source>This application is released under GPLv3. The source code and the license is available in the Github repo of %1</source>
+        <translation>Deze applicatie is uitgegeven onder de GPLv3-licentie. Broncode en licentie zijn beschikbaar in de GitHub-repository van %1</translation>
     </message>
     <message>
-        <source>can be translated into your language but for that we need your help! You can translate this app on</source>
-        <translation>kan in je taal vertaald worden, maar daarvoor hebben we je hulp nodig! Je kan deze app vertalen op</translation>
+        <source>Donate with %1</source>
+        <translation>Doneren met %1</translation>
     </message>
     <message>
-        <source>project</source>
-        <translation>project</translation>
+        <source>%1 can be translated into your language but for that we need your help! You can translate this app on %2</source>
+        <translation>%1 kan in je taal vertaald worden, maar daarvoor hebben we je hulp nodig! Je kan deze app vertalen op %2</translation>
     </message>
     <message>
-        <source>Powered by</source>
-        <translation>Met dank aan</translation>
+        <source>%1 project</source>
+        <translation>%1 project</translation>
+    </message>
+    <message>
+        <source>Icon by %1</source>
+        <translation>Icoon dankzij %1</translation>
     </message>
     <message>
-        <source>Donate with PayPal</source>
-        <translation>Doneer met PayPal</translation>
+        <source>What&apos;s %1 ?</source>
+        <translation>Wat is %1 ?</translation>
     </message>
 </context>
 <context>
@@ -174,10 +178,6 @@
         <source>Liveboard</source>
         <translation>Vertrekoverzicht</translation>
     </message>
-    <message>
-        <source>Favourite stations</source>
-        <translation>Favoriete stations</translation>
-    </message>
     <message>
         <source>Enable favourite stations</source>
         <translation>Favoriete stations inschakelen</translation>
@@ -186,6 +186,26 @@
         <source>Travelling from/to work or school? Then is this option for you! Select your favourite stations below.</source>
         <translation>Verplaats je je van het werk of naar school? Dan is deze optie voor jou! Selecteer je favoriete stations hieronder.</translation>
     </message>
+    <message>
+        <source>Routeplanner</source>
+        <translation>Routeplanner</translation>
+    </message>
+    <message>
+        <source>Time is</source>
+        <translation>Tijd is</translation>
+    </message>
+    <message>
+        <source>departure</source>
+        <translation>vertrek</translation>
+    </message>
+    <message>
+        <source>arrival</source>
+        <translation>aankomen</translation>
+    </message>
+    <message>
+        <source>Select here if you want to use the given time as either the time of arrival or departure.</source>
+        <translation>Selecteer hier of je de gegeven tijd wilt gebruiken als de vertrek- of aankomsttijd.</translation>
+    </message>
 </context>
 <context>
     <name>StationListPage</name>

diff --git a/translations/harbour-berail.ts b/translations/harbour-berail.ts
@@ -23,10 +23,6 @@
         <source>About %1 V%2</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>What&apos;s %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>%1 is an opensource application to plan your NMBS/SNCB railway journeys on your Sailfish OS smartphone!</source>
         <translation type="unfinished"></translation>
@@ -55,6 +51,10 @@
         <source>Icon by %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>What&apos;s %1 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CancelOverlay</name>