Skip to content
This repository was archived by the owner on Jul 22, 2021. It is now read-only.

Commit 170ae8e

Browse files
DylanVanAsscheDylanVanAssche
authored
Merge pull request #3 from iRail/upgrade-1.1
V1.1 BETA release
2 parents 0c9c457 + 2d3e168 commit 170ae8e

File tree

6 files changed

+76
-55
lines changed

6 files changed

+76
-55
lines changed

‎harbour-berail.pro.user‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE QtCreatorProject>
3-
<!-- Written by QtCreator 4.0.1, 2017-06-04T20:03:06. -->
3+
<!-- Written by QtCreator 4.0.1, 2017-06-07T11:03:05. -->
44
<qtcreator>
55
<data>
66
<variable>EnvironmentId</variable>
77
<value type="QByteArray">{f3ecafd1-b01f-4e43-9e3b-2de7d2f262d2}</value>
88
</data>
99
<data>
1010
<variable>ProjectExplorer.Project.ActiveTarget</variable>
11-
<value type="int">1</value>
11+
<value type="int">0</value>
1212
</data>
1313
<data>
1414
<variable>ProjectExplorer.Project.EditorSettings</variable>

‎qml/pages/AboutPage.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Page {
3333

3434
PageHeader { title: qsTr("About %1 V%2").arg(app.name).arg(app.version) }
3535

36-
SectionHeader { text: qsTr("What's %1").arg(app.name) }
36+
SectionHeader { text: qsTr("What's %1 ?").arg(app.name) }
3737
TextLabel { labelText: qsTr("%1 is an opensource application to plan your NMBS/SNCB railway journeys on your Sailfish OS smartphone!").arg(app.name) }
3838

3939
SectionHeader { text: qsTr("Privacy & licensing") }

‎qml/pages/FirstPage.qml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,19 @@ Page {
6060
MenuItem {
6161
text: qsTr("About")
6262
onClicked: pageStack.push(Qt.resolvedUrl("AboutPage.qml"))
63+
enabled: !_loading
6364
}
6465

6566
MenuItem {
6667
text: qsTr("Settings")
6768
onClicked: pageStack.push(Qt.resolvedUrl("SettingsPage.qml"))
69+
enabled: !_loading
6870
}
6971

7072
MenuItem {
7173
text: qsTr("Liveboard")
7274
onClicked: pageStack.push(Qt.resolvedUrl("LiveboardPage.qml"))
75+
enabled: !_loading
7376
}
7477
}
7578

‎translations/harbour-berail-de.ts‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!DOCTYPE TS>
3-
<TS version="2.1" language="de">
1+
<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.1">
42
<context>
53
<name>AboutPage</name>
64
<message>
@@ -21,39 +19,39 @@
2119
</message>
2220
<message>
2321
<source>About %1 V%2</source>
24-
<translation type="unfinished"></translation>
25-
</message>
26-
<message>
27-
<source>What&apos;s %1</source>
28-
<translation type="unfinished"></translation>
22+
<translation>Über %1 V%2</translation>
2923
</message>
3024
<message>
3125
<source>%1 is an opensource application to plan your NMBS/SNCB railway journeys on your Sailfish OS smartphone!</source>
32-
<translation type="unfinished"></translation>
26+
<translation>%1 ist ein Open Source Programm um Bahnfahrten mit der belgischen NMBS/SNCB auf dem Smartphone zu planen!</translation>
3327
</message>
3428
<message>
3529
<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>
36-
<translation type="unfinished"></translation>
30+
<translation>%1 selbst wird niemals Ihre persönlichen Informationen sammeln, aber dies kann für keine weitere in %1 involvierte Partei garantiert werden.</translation>
3731
</message>
3832
<message>
3933
<source>This application is released under GPLv3. The source code and the license is available in the Github repo of %1</source>
40-
<translation type="unfinished"></translation>
34+
<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>
4135
</message>
4236
<message>
4337
<source>Donate with %1</source>
44-
<translation type="unfinished"></translation>
38+
<translation>Per %1 spenden</translation>
4539
</message>
4640
<message>
4741
<source>%1 can be translated into your language but for that we need your help! You can translate this app on %2</source>
48-
<translation type="unfinished"></translation>
42+
<translation>%1 kann mit deiner Hilfe in deine Sprache übersetzt werden! Übersetzte dieses Programm auf %2</translation>
4943
</message>
5044
<message>
5145
<source>%1 project</source>
52-
<translation type="unfinished"></translation>
46+
<translation>Projekt %1</translation>
5347
</message>
5448
<message>
5549
<source>Icon by %1</source>
56-
<translation type="unfinished"></translation>
50+
<translation>Icon von %1</translation>
51+
</message>
52+
<message>
53+
<source>What&apos;s %1 ?</source>
54+
<translation>Was ist %1</translation>
5755
</message>
5856
</context>
5957
<context>
@@ -190,23 +188,23 @@
190188
</message>
191189
<message>
192190
<source>Routeplanner</source>
193-
<translation type="unfinished"></translation>
191+
<translation>Routenplaner</translation>
194192
</message>
195193
<message>
196194
<source>Time is</source>
197-
<translation type="unfinished"></translation>
195+
<translation>Es ist jetzt</translation>
198196
</message>
199197
<message>
200198
<source>departure</source>
201-
<translation type="unfinished"></translation>
199+
<translation>Abfahrt</translation>
202200
</message>
203201
<message>
204202
<source>arrival</source>
205-
<translation type="unfinished"></translation>
203+
<translation>Ankunft</translation>
206204
</message>
207205
<message>
208206
<source>Select here if you want to use the given time as either the time of arrival or departure.</source>
209-
<translation type="unfinished"></translation>
207+
<translation>Wähle diesen Zeitpunkt als Abfahrts- oder Ankunftszeit.</translation>
210208
</message>
211209
</context>
212210
<context>

‎translations/harbour-berail-nl.ts‎

Lines changed: 48 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,56 @@
22
<context>
33
<name>AboutPage</name>
44
<message>
5-
<source>About</source>
6-
<translation>Over</translation>
5+
<source>Privacy &amp; licensing</source>
6+
<translation>Privacy &amp; licentie</translation>
77
</message>
88
<message>
9-
<source>What&apos;s</source>
10-
<translation>Wat is</translation>
9+
<source>Developer &amp; source code</source>
10+
<translation>Ontwikkelaar &amp; broncode</translation>
1111
</message>
1212
<message>
13-
<source>is an opensource application to plan your NMBS/SNCB railway journeys on your Sailfish OS smartphone!</source>
14-
<translation>is een opensource applicatie om je reizen met de Belgische spoorwegen te plannen op je Sailfish OS smartphone!</translation>
13+
<source>Source code</source>
14+
<translation>Broncode</translation>
1515
</message>
1616
<message>
17-
<source>Privacy &amp; licensing</source>
18-
<translation>Privacy &amp; licentie</translation>
17+
<source>Powered by</source>
18+
<translation>Met dank aan</translation>
1919
</message>
2020
<message>
21-
<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>
22-
<translation>zal nooit persoonlijke informatie verzamelen over de gebruiker, maar dit kan niet gegarandeerd worden van alle derde partijen die gebruikt worden in</translation>
21+
<source>About %1 V%2</source>
22+
<translation>Over %1 V%2</translation>
2323
</message>
2424
<message>
25-
<source>This application is released under GPLv3. The source code and the license is available in the Github repo of</source>
26-
<translation>Deze applicatie is uitgegeven onder de GPLv3-licentie. Broncode en licentie zijn beschikbaar in de GitHub-repository van</translation>
25+
<source>%1 is an opensource application to plan your NMBS/SNCB railway journeys on your Sailfish OS smartphone!</source>
26+
<translation>%1 is een opensource applicatie om je reizen met de Belgische spoorwegen te plannen op je Sailfish OS smartphone!</translation>
2727
</message>
2828
<message>
29-
<source>Developer &amp; source code</source>
30-
<translation>Ontwikkelaar &amp; broncode</translation>
29+
<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>
30+
<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>
3131
</message>
3232
<message>
33-
<source>Source code</source>
34-
<translation>Broncode</translation>
33+
<source>This application is released under GPLv3. The source code and the license is available in the Github repo of %1</source>
34+
<translation>Deze applicatie is uitgegeven onder de GPLv3-licentie. Broncode en licentie zijn beschikbaar in de GitHub-repository van %1</translation>
3535
</message>
3636
<message>
37-
<source>can be translated into your language but for that we need your help! You can translate this app on</source>
38-
<translation>kan in je taal vertaald worden, maar daarvoor hebben we je hulp nodig! Je kan deze app vertalen op</translation>
37+
<source>Donate with %1</source>
38+
<translation>Doneren met %1</translation>
3939
</message>
4040
<message>
41-
<source>project</source>
42-
<translation>project</translation>
41+
<source>%1 can be translated into your language but for that we need your help! You can translate this app on %2</source>
42+
<translation>%1 kan in je taal vertaald worden, maar daarvoor hebben we je hulp nodig! Je kan deze app vertalen op %2</translation>
4343
</message>
4444
<message>
45-
<source>Powered by</source>
46-
<translation>Met dank aan</translation>
45+
<source>%1 project</source>
46+
<translation>%1 project</translation>
47+
</message>
48+
<message>
49+
<source>Icon by %1</source>
50+
<translation>Icoon dankzij %1</translation>
4751
</message>
4852
<message>
49-
<source>Donate with PayPal</source>
50-
<translation>Doneer met PayPal</translation>
53+
<source>What&apos;s %1 ?</source>
54+
<translation>Wat is %1 ?</translation>
5155
</message>
5256
</context>
5357
<context>
@@ -174,10 +178,6 @@
174178
<source>Liveboard</source>
175179
<translation>Vertrekoverzicht</translation>
176180
</message>
177-
<message>
178-
<source>Favourite stations</source>
179-
<translation>Favoriete stations</translation>
180-
</message>
181181
<message>
182182
<source>Enable favourite stations</source>
183183
<translation>Favoriete stations inschakelen</translation>
@@ -186,6 +186,26 @@
186186
<source>Travelling from/to work or school? Then is this option for you! Select your favourite stations below.</source>
187187
<translation>Verplaats je je van het werk of naar school? Dan is deze optie voor jou! Selecteer je favoriete stations hieronder.</translation>
188188
</message>
189+
<message>
190+
<source>Routeplanner</source>
191+
<translation>Routeplanner</translation>
192+
</message>
193+
<message>
194+
<source>Time is</source>
195+
<translation>Tijd is</translation>
196+
</message>
197+
<message>
198+
<source>departure</source>
199+
<translation>vertrek</translation>
200+
</message>
201+
<message>
202+
<source>arrival</source>
203+
<translation>aankomen</translation>
204+
</message>
205+
<message>
206+
<source>Select here if you want to use the given time as either the time of arrival or departure.</source>
207+
<translation>Selecteer hier of je de gegeven tijd wilt gebruiken als de vertrek- of aankomsttijd.</translation>
208+
</message>
189209
</context>
190210
<context>
191211
<name>StationListPage</name>

‎translations/harbour-berail.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
<source>About %1 V%2</source>
2424
<translation type="unfinished"></translation>
2525
</message>
26-
<message>
27-
<source>What&apos;s %1</source>
28-
<translation type="unfinished"></translation>
29-
</message>
3026
<message>
3127
<source>%1 is an opensource application to plan your NMBS/SNCB railway journeys on your Sailfish OS smartphone!</source>
3228
<translation type="unfinished"></translation>
@@ -55,6 +51,10 @@
5551
<source>Icon by %1</source>
5652
<translation type="unfinished"></translation>
5753
</message>
54+
<message>
55+
<source>What&apos;s %1 ?</source>
56+
<translation type="unfinished"></translation>
57+
</message>
5858
</context>
5959
<context>
6060
<name>CancelOverlay</name>

0 commit comments

Comments
 (0)