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

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
DylanVanAssche committed Feb 20, 2019
2 parents f4a6517 + 74ff441 commit 6addf32
Show file tree
Hide file tree
Showing 7 changed files with 273 additions and 7 deletions.
3 changes: 2 additions & 1 deletion harbour-berail.pro
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ DISTFILES += \
qml/pages/DisturbancesPage.qml \
qml/pages/SettingsPage.qml \
qml/components/GlassStationButton.qml \
qml/pages/TripDetailHeader.qml
qml/pages/TripDetailHeader.qml \
translations/harbour-berail-nl_BE.ts

RESOURCES += \
qml/resources/resources.qrc
Expand Down
2 changes: 1 addition & 1 deletion qml/components/TimeSelectorClockItem.qml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
import QtQuick 2.0
import Sailfish.Silica 1.0
import org.nemomobile.configuration 1.0
import Nemo.Configuration 1.0

Row {
//: "translate as non-empty if am/pm indicator starts the 12h time pattern"
Expand Down
4 changes: 2 additions & 2 deletions qml/harbour-berail.qml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

import QtQuick 2.2
import Sailfish.Silica 1.0
import org.nemomobile.configuration 1.0
import org.nemomobile.dbus 2.0
import Nemo.Configuration 1.0
import Nemo.DBus 2.0
import Harbour.BeRail.API 1.0
import Harbour.BeRail.SFOS 1.0
import "pages"
Expand Down
6 changes: 5 additions & 1 deletion rpm/harbour-berail.changes
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
# * date Author's Name <author's email> version-release
# - Summary of changes

* Mon Jan 8 2018 Dylan Van Assche <dylan.van.assche@protonmail.com> 2.1-1
* Wed Feb 20 2019 Dylan Van Assche <dylan.van.assche@protonmail.com> 2.1-2
- [UPGRADE] Adapt to import syntax changes for Nemo libs (Github issue #27).
- [TRANSLATIONS] Updated translations from Transifex.

* Mon Feb 18 2019 Dylan Van Assche <dylan.van.assche@protonmail.com> 2.1-1
- [MAJOR BUGFIX] Time selection for route planner works again.

* Mon Jan 8 2018 Dylan Van Assche <dylan.van.assche@protonmail.com> 2.0-2
Expand Down
2 changes: 1 addition & 1 deletion rpm/harbour-berail.spec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Name: harbour-berail
%{?qtc_builddir:%define _builddir %qtc_builddir}
Summary: BeRail
Version: 2.1
Release: 1
Release: 2
Group: Qt/Qt
License: GPLv3
URL: http://dylanvanassche.be/
Expand Down
2 changes: 1 addition & 1 deletion rpm/harbour-berail.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Name: harbour-berail
Summary: BeRail
Version: 2.1
Release: 1
Release: 2
# The contents of the Group field should be one of the groups listed here:
# http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS
Group: Qt/Qt
Expand Down
261 changes: 261 additions & 0 deletions translations/harbour-berail-nl_BE.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,261 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl_BE" version="2.1">
<context>
<name/>
<message id="berail-from">
<source>From</source>
<translation>Van</translation>
</message>
<message id="berail-to">
<source>To</source>
<translation>Naar</translation>
</message>
<message id="berail-date">
<source>Date</source>
<translation>Datum</translation>
</message>
<message id="berail-time">
<source>Time</source>
<translation>Tijd</translation>
</message>
<message id="berail-plan-trip">
<source>Plan my trip</source>
<extracomment>Clicking on this button will start the trip planner</extracomment>
<translation>Pland mijn route</translation>
</message>
<message id="berail-liveboard">
<source>Liveboard</source>
<extracomment>Liveboard title</extracomment>
<translation>Vertrekoverzicht</translation>
<extra-A>list of all departing/arriving trains in a station.</extra-A>
</message>
<message id="berail-settings">
<source>Settings</source>
<extracomment>Settings title</extracomment>
<translation>Instellingen</translation>
</message>
<message id="berail-now">
<source>Now</source>
<translation>Nu</translation>
</message>
<message id="components-la-time_start_with_ap">
<source/>
<extracomment>&quot;translate as non-empty if am/pm indicator starts the 12h time pattern&quot;</extracomment>
<translation>components-la-time_start_with_ap</translation>
</message>
<message id="components-la-12h_time_pattern_without_ap">
<source>h:mm</source>
<extracomment>Pattern for 12h time, h, hh, m, mm are supported, everything else left as is. escaping with ' not supported</extracomment>
<translation>h:mm</translation>
</message>
<message id="jolla-clock-la-am">
<source>AM</source>
<translation>AM</translation>
</message>
<message id="jolla-clock-la-pm">
<source>PM</source>
<translation>PM</translation>
</message>
<message id="berail-official-irail-app">
<source>The official iRail app</source>
<translation>Den officiëlen iRail-app</translation>
</message>
<message id="berail-today">
<source>Today</source>
<translation>Vandaag</translation>
</message>
<message id="berail-trip-planner">
<source>Trip planner</source>
<extracomment>The planner for the user it's trips between two stations</extracomment>
<translation>Routeplanner</translation>
</message>
<message id="berail-time-is">
<source>Time is</source>
<translation>Tijd is</translation>
</message>
<message id="berail-departure">
<source>departure</source>
<translation>vertrek</translation>
</message>
<message id="berail-arrival">
<source>arrival</source>
<translation>aankomen</translation>
</message>
<message id="berail-time-is-hint">
<source>Select here if you want to use the given time as either the time of arrival or departure.</source>
<translation>Selecteerd hier of da’ ge de gegeven tijd wild gebruiken als de vertrek- of aankomsttijd.</translation>
</message>
<message id="berail-favourite-stations">
<source>Enable favourite stations</source>
<translation>Favoriete stations inschakelen</translation>
</message>
<message id="berail-favourite-stations-hint">
<source>Travelling from/to work or school? Then is this option for you! Select your favourite stations below.</source>
<translation>Verplaatst ge u van ’t werk of naar school? Dan is deze optie voor u! Selecteerd uw favoriete stations hieronder.</translation>
</message>
<message id="berail-about">
<source>About</source>
<oldsource>About %0 V%1</oldsource>
<extracomment>About title</extracomment>
<translation>Over</translation>
</message>
<message id="berail-what-is">
<source>What&apos;s %0 ?</source>
<oldsource>What's %1 ?</oldsource>
<translation>Wat is %0 ?</translation>
</message>
<message id="berail-what-is-text">
<source>%0 is an opensource application to plan your NMBS/SNCB railway journeys on your Sailfish OS smartphone!</source>
<oldsource>%1 is an opensource application to plan your NMBS/SNCB railway journeys on your Sailfish OS smartphone!</oldsource>
<translation>%0 is nen openbronapp voor uw reizen met de Belgische spoorwegen te plannen op uwe Sailfish OS-smartphone!</translation>
</message>
<message id="berail-privacy-licensing">
<source>Privacy &amp; licensing</source>
<translation>Privacy &amp; licentie</translation>
</message>
<message id="berail-privacy-licensing-text">
<source>%0 will never collect any personal information about the user, but this can&apos;t be guaranteed from any third-party company used in %0. This application is released under GPLv3. The source code and the license is available in the Github repo of %0.</source>
<oldsource>%0 will never collect any personal information about the user,</oldsource>
<translation>%0 zal nooit persoonlijke informatie verzamelen over de gebruiker, maar dit kan nie’ gegarandeerd worden van alle derde partijen die gebruikt worden in %0. Dezen app is uitgegeven onder de GPLv3-licentie. De broncode en licentie zijn beschikbaar in den GitHub-pakketbron van %0.</translation>
</message>
<message id="berail-developer-source">
<source>Developer &amp; source code</source>
<translation>Ontwikkelaar &amp; broncode</translation>
</message>
<message id="berail-donate-with">
<source>Donate with %0</source>
<translation>Doneer met %0</translation>
</message>
<message id="berail-source">
<source>Source code</source>
<translation>Broncode</translation>
</message>
<message id="berail-translations">
<source>Translations</source>
<oldsource>%0 can be translated into your language but for that we need your help! You can translate this app on %1</oldsource>
<translation>Vertalingen</translation>
</message>
<message id="berail-powered-by">
<source>Powered by</source>
<translation>Met dank aan</translation>
</message>
<message id="berail-disturbances">
<source>Disturbances</source>
<extracomment>Network interruptions</extracomment>
<translation>Storingen</translation>
</message>
<message id="berail-disturbances-number">
<source>Disturbances (%L0)</source>
<extracomment>Network interruptions</extracomment>
<translation>Storingen (%L0)</translation>
</message>
<message id="berail-version">
<source>About %0 V%1</source>
<translation>Over %0 V%1</translation>
</message>
<message id="berail-stations">
<source>Stations</source>
<translation>Stations</translation>
</message>
<message id="berail-liveboard-error">
<source>Retrieving liveboard failed, please try again later</source>
<extracomment>Error shown to the user when the liveboard of the station can't be retrieved</extracomment>
<translation>Ophalen van het vertrekoverzicht is mislukt, probeerd het later opnieuw</translation>
<extra-The>liveboard is a list of all departing/arriving trains in a station.</extra-The>
</message>
<message id="berail-select-station">
<source>Select station</source>
<extracomment>When clicked, the user will see a list of station from which the user can choose one.</extracomment>
<translation>Selecteerd een station</translation>
</message>
<message id="berail-canceled">
<source>Canceled</source>
<translation>Afgeschaft</translation>
</message>
<message id="berail-json-error">
<source>Invalid JSON data received, please try again later</source>
<extracomment>Error shown to the user when the data is invalid JSON data</extracomment>
<translation>Ongeldige JSON-gegevens ontvangen, probeerd het later opnieuw</translation>
</message>
<message id="berail-ssl-error">
<source>SSL error, please check your device is running with the correct date and time</source>
<extracomment>Error shown to the user when an SSL error occurs due a bad certificate or incorrect time settings.</extracomment>
<translation>SSL-fout, controleerd of dat uw apparaat de juisten tijd en datum gebruikt</translation>
</message>
<message id="berail-transport-show">
<source>Show</source>
<translation>Tonen</translation>
</message>
<message id="berail-transport-all">
<source>all trains</source>
<translation>alle treinen</translation>
</message>
<message id="berail-transport-no-international">
<source>only locale trains</source>
<oldsource>no international trains</oldsource>
<translation>alleen lokale treinen</translation>
</message>
<message id="berail-transport-hint">
<source>If you like, you can filter out the international trains from your trips.</source>
<translation>Als ge wild kunde de internationale treinen uit uw routes filteren.</translation>
</message>
<message id="berail-trip-platform">
<source>Platform %0</source>
<extracomment>The platform where the train arrives or departures</extracomment>
<translation>Perron %0</translation>
</message>
<message id="berail-translations-text">
<source>%0 can be translated into your language but for that we need your help! You can translate this app on %1</source>
<translation>%0 kan in uw taal vertaald worden, maar daarvoor hebben we uw hulp nodig! Ge kund dezen app vertalen op %1</translation>
</message>
<message id="berail-translations-project">
<source>%0 project</source>
<translation>%0-project</translation>
</message>
<message id="berail-powered-by-icon">
<source>%0 icon by %1</source>
<translation>%0-pictogram dankzij %1</translation>
</message>
<message id="berail-recent-connections">
<source>Recent connections</source>
<extracomment>Recent connections of the user</extracomment>
<translation>Recente routes</translation>
</message>
<message id="berail-oops">
<source>Oops!</source>
<extracomment>To acknowledging a minor mistake 'Oops' is used</extracomment>
<translation>Oeps!</translation>
</message>
<message id="berail-oops-hint">
<source>Something went wrong, please try again later</source>
<translation>Der is iets misgegaan, probeerd het later opnieuw</translation>
</message>
<message id="berail-api-error">
<source>iRail API couldn&apos;t complete your request</source>
<oldsource>iRail API couldn't find your data</oldsource>
<extracomment>Error shown to the user when the iRail API failed to retrieve the requested data</extracomment>
<translation>iRail-API kan uw aanvraag nie’ verwerken</translation>
</message>
<message id="berail-trip-missed-via">
<source>MISSED</source>
<extracomment>The user missed the via</extracomment>
<translation>GEMIST</translation>
</message>
<message id="berail-trip-walking">
<source>Walk to the next station</source>
<extracomment>Sometimes walking is needed between 2 stations</extracomment>
<translation>Wandeld naar het volgend station</translation>
</message>
<message id="berail-trip-extra-stop">
<source>Extra stop added by Traffic Control</source>
<extracomment>Sometimes Traffic Control adds extra stops in case of disturbances on the network</extracomment>
<translation>Extra stop toegevoegd door de Verkeersleiding</translation>
</message>
</context>
<context>
<name>CoverPage</name>
<message>
<source>BeRail</source>
<translation>BeRail</translation>
</message>
</context>
</TS>

0 comments on commit 6addf32

Please sign in to comment.