Merge lp:~osomon/unav/update-pot-script into lp:unav

[Olivier Tilloy]

Automate updating the translation template with the top-level Makefile.
Run `make po/unav.pot` to update the translation template.

[lp:~osomon/unav/update-pot-script]

105. By Olivier Tilloy on 2016-08-25

Ensure all files to include in translation template are really sorted.

106. By Olivier Tilloy on 2016-08-25

Move translation template to newly-created top-level 'po' folder.

107. By Olivier Tilloy on 2016-08-25

Convert update-pot.sh into makefile rules.

108. By Olivier Tilloy on 2016-08-25

Update translation template.

109. By Olivier Tilloy on 2016-08-25

Updated instructions.

[costales (costales)]

With:
make po/unav.pot
is working great.
Thanks Olivier!

review: Approve

[lp:~osomon/unav/update-pot-script]

110. By Olivier Tilloy on 2016-08-25

Add myself to contributors.

[costales (costales)]

One point please,
make po/unav.pot
is generating new files in nav/ directory. Any way to avoid that?
Thanks.

[Olivier Tilloy (osomon)]

`make clean` will clean up those temporary files.
Or `bzr clean-tree --unknown`.

[lp:~osomon/unav/update-pot-script]

111. By Olivier Tilloy on 2016-08-26

Updated translation template.

=== modified file 'Makefile'
--- Makefile	2016-03-26 18:53:17 +0000
+++ Makefile	2016-08-26 16:26:36 +0000
@@ -1,39 +1,29 @@
-# More information: https://wiki.ubuntu.com/Touch/Testing
-#
-# Notes for autopilot tests:
-# ---------------------------------------------------------------
-# In order to run autopilot tests:
-# sudo apt-add-repository ppa:autopilot/ppa
-# sudo apt-get update
-# sudo apt-get install python-autopilot autopilot-qt
-#
-# Notes for translations:
-# ---------------------------------------------------------------
-# In order to create translation files manually:
-# 1) run make once to create and update the po/unav.pot
-# 2) copy the template file and set the name to the language you want to
-#    translate to:   cp po/unav.pot po/en.po
-# 3) edit the po file
-# 4) run make build-translations to build the translation files
-#
-# Steps 1) and 4) are automatically executed by QtCreator
-#################################################################
+#!/usr/bin/make -f
+# -*- makefile -*-
 
 #APP_ID needs to match the "name" field of the click manifest
 APP_ID=costales.unav
 
-#provides a way for the IDE to set a specific target folder for the translations
-TRANSLATION_ROOT=.
-
-MO_FILES=$(shell for infile in `find po -name "*.po"`; do basename -s .po $$infile | awk '{print "$(TRANSLATION_ROOT)/share/locale/" $$0 "/LC_MESSAGES/$(APP_ID).mo";}' ; done)
-QMLJS_FILES=$(shell find . -name "*.qml" -o -name "*.js" | grep -v ./tests)
-
-all: po/unav.pot
-
-#translation targets
-build-translations: $(MO_FILES)
-
-po/unav.pot:$(QMLJS_FILES)
-	mkdir -p $(CURDIR)/po && xgettext -o po/unav.pot --add-comments=TRANSLATORS --keyword=tr --keyword=tr:1,2 $(QMLJS_FILES) --from-code=UTF-8
-$(TRANSLATION_ROOT)/share/locale/%/LC_MESSAGES/$(APP_ID).mo: po/%.po
-	mkdir -p $(TRANSLATION_ROOT)/share/locale/$*/LC_MESSAGES && msgfmt -o $(@) $(<)
+POT_FILE=po/unav.pot
+
+all: $(POT_FILE)
+
+HTML_STRINGS_FILE=nav/index.html.strings
+$(HTML_STRINGS_FILE): nav/index.html
+	grep -Po 'data-localize=([^>]*)' $< > $@
+$(HTML_STRINGS_FILE).h: $(HTML_STRINGS_FILE)
+	intltool-extract --type=gettext/quoted $<
+
+QML_FILES=$(shell find -iname *.qml -printf '%P\n')
+JS_FILES=$(shell ls nav/class/*.js qml/js/*.js)
+
+I18N_FILES=$(sort $(QML_FILES) $(JS_FILES) $(HTML_STRINGS_FILE).h)
+
+$(POT_FILE): $(I18N_FILES)
+	xgettext -o $@ --from-code=UTF-8 -C --qt --add-comments=TRANSLATORS \
+	    --keyword=tr --keyword=tr:1,2 --keyword=t --keyword=N_ \
+	    --package-name=unav -D . $^
+
+clean:
+	rm $(HTML_STRINGS_FILE) $(HTML_STRINGS_FILE).h
+

=== renamed file 'nav/locales/generate/TODO' => 'nav/locales/generate/README'
--- nav/locales/generate/TODO	2016-04-17 14:55:20 +0000
+++ nav/locales/generate/README	2016-08-26 16:26:36 +0000
@@ -1,40 +1,5 @@
-	xgettext -C --qt --add-comments=TRANSLATORS --keyword=tr --from-code utf-8 qml/*.qml -o nav/locales/unav1.pot
-	echo 'msgid "Search"' >> nav/locales/unav1.pot
-	echo 'msgstr ""' >> nav/locales/unav1.pot
-	echo 'msgid "Favorites"' >> nav/locales/unav1.pot
-	echo 'msgstr ""' >> nav/locales/unav1.pot
-	echo 'msgid "Nearby"' >> nav/locales/unav1.pot
-	echo 'msgstr ""' >> nav/locales/unav1.pot
-	echo 'msgid "Coordinates"' >> nav/locales/unav1.pot
-	echo 'msgstr ""' >> nav/locales/unav1.pot
-	echo 'msgid "Share"' >> nav/locales/unav1.pot
-	echo 'msgstr ""' >> nav/locales/unav1.pot
-	echo 'msgid "Cancel Route"' >> nav/locales/unav1.pot
-	echo 'msgstr ""' >> nav/locales/unav1.pot
-	
-	echo 'msgid "Current"' >> nav/locales/unav1.pot
-	echo 'msgstr ""' >> nav/locales/unav1.pot
-	echo 'msgid "Destination"' >> nav/locales/unav1.pot
-	echo 'msgstr ""' >> nav/locales/unav1.pot
-	echo 'msgid "From Map"' >> nav/locales/unav1.pot
-	echo 'msgstr ""' >> nav/locales/unav1.pot
-
-	echo 'msgid "translator-credits"' >> nav/locales/unav1.pot
-	echo 'msgstr ""' >> nav/locales/unav1.pot
-	grep -Po 'data-localize=([^>]*)' nav/index.html | cut -d= -f2 | sed 's/^/msgid /' | sed 's/$/\nmsgstr ""/' >> nav/locales/unav1.pot
-	xgettext -C --qt --keyword=tr --from-code utf-8 qml/js/PoiCategories.js -o nav/locales/unav2.pot
-	xgettext -C --keyword=t --from-code utf-8 nav/class/*.js -o nav/locales/unav3.pot
-	xgettext -C --qt --add-comments=TRANSLATORS --keyword=tr --from-code utf-8 qml/tuto/*.qml -o nav/locales/unav4.pot
-	xgettext -C --qt --add-comments=TRANSLATORS --keyword=tr --from-code utf-8 qml/tuto/components/*.qml -o nav/locales/unav5.pot
-	sed '1,18d' nav/locales/unav2.pot -i
-	sed '1,18d' nav/locales/unav3.pot -i
-	sed '1,18d' nav/locales/unav4.pot -i
-	sed '1,18d' nav/locales/unav5.pot -i
-	cat nav/locales/unav1.pot nav/locales/unav2.pot nav/locales/unav3.pot nav/locales/unav4.pot nav/locales/unav5.pot > nav/locales/unav.pot
-	rm nav/locales/unav1.pot nav/locales/unav2.pot nav/locales/unav3.pot nav/locales/unav4.pot nav/locales/unav5.pot
-	msguniq -o nav/locales/unav.pot nav/locales/unav.pot
-	msgfmt -c nav/locales/unav.pot
-	rm messages.mo
+To update the translation template, cd to the root of the source tree,
+and run `make po/unav.pot`.
 
 Translate javascript: Download .po files from LP, then:
 	wget https://raw.githubusercontent.com/fileformat/lptools/master/po2json.py

=== added directory 'po'
=== renamed file 'nav/locales/unav.pot' => 'po/unav.pot'
--- nav/locales/unav.pot	2016-08-06 21:08:30 +0000
+++ po/unav.pot	2016-08-26 16:26:36 +0000
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the unav package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: unav\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-06 23:08+0200\n"
+"POT-Creation-Date: 2016-08-26 18:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,6 +17,253 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: nav/class/Navigator.js:259
+msgid "You are near to the destination"
+msgstr ""
+
+#: nav/class/Navigator.js:285
+msgid "Go"
+msgstr ""
+
+#: nav/class/Navigator.js:288
+msgid "Go to your right"
+msgstr ""
+
+#: nav/class/Navigator.js:291
+msgid "Go to your left"
+msgstr ""
+
+#: nav/class/Navigator.js:294 nav/class/UI.js:546
+msgid "You have arrived at your destination"
+msgstr ""
+
+#: nav/class/Navigator.js:297
+msgid "Your destination is on the right"
+msgstr ""
+
+#: nav/class/Navigator.js:300
+msgid "Your destination is on the left"
+msgstr ""
+
+#: nav/class/Navigator.js:303
+msgid "Current road becomes"
+msgstr ""
+
+#: nav/class/Navigator.js:306
+msgid "Continue"
+msgstr ""
+
+#: nav/class/Navigator.js:309
+msgid "Bear right"
+msgstr ""
+
+#: nav/class/Navigator.js:312
+msgid "Turn right"
+msgstr ""
+
+#: nav/class/Navigator.js:315
+msgid "Make a sharp right"
+msgstr ""
+
+#: nav/class/Navigator.js:318
+msgid "Make a right U-turn"
+msgstr ""
+
+#: nav/class/Navigator.js:321
+msgid "Make a left U-turn"
+msgstr ""
+
+#: nav/class/Navigator.js:324
+msgid "Make a sharp left"
+msgstr ""
+
+#: nav/class/Navigator.js:327
+msgid "Turn left"
+msgstr ""
+
+#: nav/class/Navigator.js:330
+msgid "Bear left"
+msgstr ""
+
+#: nav/class/Navigator.js:333
+msgid "Stay straight on ramp"
+msgstr ""
+
+#: nav/class/Navigator.js:336
+msgid "Turn right on ramp"
+msgstr ""
+
+#: nav/class/Navigator.js:339
+msgid "Turn left on ramp"
+msgstr ""
+
+#: nav/class/Navigator.js:342
+msgid "Take the exit on the right"
+msgstr ""
+
+#: nav/class/Navigator.js:345
+msgid "Take the exit on the left"
+msgstr ""
+
+#: nav/class/Navigator.js:348
+msgid "Keep straight at the fork"
+msgstr ""
+
+#: nav/class/Navigator.js:351
+msgid "Keep right at the fork"
+msgstr ""
+
+#: nav/class/Navigator.js:354
+msgid "Keep left at the fork"
+msgstr ""
+
+#: nav/class/Navigator.js:357
+msgid "Merge"
+msgstr ""
+
+#: nav/class/Navigator.js:360
+msgid "Enter the roundabout"
+msgstr ""
+
+#: nav/class/Navigator.js:363 nav/class/Navigator.js:366
+#: nav/class/Navigator.js:369 nav/class/Navigator.js:372
+#: nav/class/Navigator.js:375 nav/class/Navigator.js:378
+#: nav/class/Navigator.js:381 nav/class/Navigator.js:384
+#: nav/class/Navigator.js:387
+#, qt-format
+msgid "Enter the roundabout and take the exit %1"
+msgstr ""
+
+#: nav/class/Navigator.js:390
+msgid "Exit the roundabout"
+msgstr ""
+
+#: nav/class/Navigator.js:393 nav/class/Navigator.js:396
+#: nav/class/Navigator.js:399 nav/class/Navigator.js:402
+#: nav/class/Navigator.js:405 nav/class/Navigator.js:408
+#: nav/class/Navigator.js:411 nav/class/Navigator.js:414
+#: nav/class/Navigator.js:417
+#, qt-format
+msgid "Take the exit %1"
+msgstr ""
+
+#: nav/class/Navigator.js:420
+msgid "Take the Ferry"
+msgstr ""
+
+#: nav/class/Navigator.js:423
+msgid "Leave the Ferry"
+msgstr ""
+
+#: nav/class/Navigator.js:488
+#, qt-format
+msgid " onto %1"
+msgstr ""
+
+#: nav/class/Navigator.js:491
+#, qt-format
+msgid ". Exit %1"
+msgstr ""
+
+#: nav/class/Navigator.js:493
+#, qt-format
+msgid " to take the %1"
+msgstr ""
+
+#: nav/class/Navigator.js:495
+#, qt-format
+msgid " toward %1"
+msgstr ""
+
+#: nav/class/Navigator.js:497
+#, qt-format
+msgid ", %1"
+msgstr ""
+
+#: nav/class/UI.js:38 qml/Favorites.qml:214 qml/Main.qml:766
+msgid "Current Position"
+msgstr ""
+
+#: nav/class/UI.js:47
+msgid "Current Start"
+msgstr ""
+
+#: nav/class/UI.js:56
+msgid "Current End"
+msgstr ""
+
+#: nav/class/UI.js:481
+msgid "Waiting for a GPS signal…"
+msgstr ""
+
+#: nav/class/UI.js:488
+msgid "Searching for a route…"
+msgstr ""
+
+#: nav/class/UI.js:492
+msgid "Drawing route…"
+msgstr ""
+
+#: nav/class/UI.js:496
+msgid "Trying search again soon…"
+msgstr ""
+
+#: nav/class/UI.js:500
+msgid "Recalculating route…"
+msgstr ""
+
+#: nav/class/UI.js:521
+msgid "Navigation will start soon"
+msgstr ""
+
+#: nav/class/UI.js:553
+msgid "Simulating route…"
+msgstr ""
+
+#: nav/class/UI.js:557
+msgid "Error simulating route. Try different points"
+msgstr ""
+
+#: nav/class/UI.js:578
+msgid "Click onto the icon for reviewing the route"
+msgstr ""
+
+#: nav/index.html.strings:1
+msgid "Start"
+msgstr ""
+
+#: nav/index.html.strings:2 qml/Favorites.qml:229 qml/SettingsPage.qml:437
+msgid "Cancel"
+msgstr ""
+
+#: nav/index.html.strings:3
+msgid "Route so long"
+msgstr ""
+
+#: nav/index.html.strings:4
+msgid "More than 1000km could affect the performance"
+msgstr ""
+
+#: nav/index.html.strings:5
+msgid "We recommend you a waypoint in the middle as destination"
+msgstr ""
+
+#: nav/index.html.strings:10 qml/Coordinate.qml:152 qml/Coordinate.qml:386
+msgid "Close"
+msgstr ""
+
+#: nav/index.html.strings:7
+msgid "GPS Denied"
+msgstr ""
+
+#: nav/index.html.strings:8
+msgid "Error reading the GPS status"
+msgstr ""
+
+#: nav/index.html.strings:9
+msgid "Please review your device settings"
+msgstr ""
+
 #: qml/AboutPage.qml:27 qml/SettingsPage.qml:44
 msgid "About"
 msgstr ""
@@ -43,7 +290,7 @@
 msgstr ""
 
 #: qml/AboutPage.qml:44 qml/AboutPage.qml:45 qml/AboutPage.qml:46
-#: qml/AboutPage.qml:47
+#: qml/AboutPage.qml:47 qml/AboutPage.qml:48
 msgid "Developers"
 msgstr ""
 
@@ -51,34 +298,34 @@
 msgid "Founder"
 msgstr ""
 
-#: qml/AboutPage.qml:52 qml/AboutPage.qml:55 qml/AboutPage.qml:58
-#: qml/AboutPage.qml:61 qml/AboutPage.qml:64 qml/AboutPage.qml:67
+#: qml/AboutPage.qml:53 qml/AboutPage.qml:56 qml/AboutPage.qml:59
+#: qml/AboutPage.qml:62 qml/AboutPage.qml:65 qml/AboutPage.qml:68
 msgid "Voice"
 msgstr ""
 
-#: qml/AboutPage.qml:71
+#: qml/AboutPage.qml:72
 msgid "Logo"
 msgstr ""
 
-#: qml/AboutPage.qml:74
+#: qml/AboutPage.qml:75
 msgid "translator-credits"
 msgstr ""
 
-#: qml/AboutPage.qml:76
+#: qml/AboutPage.qml:77
 msgid "Translators"
 msgstr ""
 
-#: qml/AboutPage.qml:80 qml/AboutPage.qml:81 qml/AboutPage.qml:82
-#: qml/AboutPage.qml:83 qml/AboutPage.qml:84 qml/AboutPage.qml:85
-#: qml/AboutPage.qml:86 qml/AboutPage.qml:87 qml/AboutPage.qml:88
-#: qml/AboutPage.qml:89 qml/AboutPage.qml:90 qml/AboutPage.qml:91
-#: qml/AboutPage.qml:92 qml/AboutPage.qml:93 qml/AboutPage.qml:94
-#: qml/AboutPage.qml:95
+#: qml/AboutPage.qml:81 qml/AboutPage.qml:82 qml/AboutPage.qml:83
+#: qml/AboutPage.qml:84 qml/AboutPage.qml:85 qml/AboutPage.qml:86
+#: qml/AboutPage.qml:87 qml/AboutPage.qml:88 qml/AboutPage.qml:89
+#: qml/AboutPage.qml:90 qml/AboutPage.qml:91 qml/AboutPage.qml:92
+#: qml/AboutPage.qml:93 qml/AboutPage.qml:94 qml/AboutPage.qml:95
+#: qml/AboutPage.qml:96
 msgid "Powered by"
 msgstr ""
 
 #. TRANSLATORS: %1 and %2 are links that do not have to be translated: Year + Project + License
-#: qml/AboutPage.qml:136
+#: qml/AboutPage.qml:137
 #, qt-format
 msgid "Version %1. Under License %2"
 msgstr ""
@@ -114,10 +361,6 @@
 "Expected format is:"
 msgstr ""
 
-#: qml/Coordinate.qml:152 qml/Coordinate.qml:386
-msgid "Close"
-msgstr ""
-
 #: qml/Coordinate.qml:384
 msgid ""
 "Enter valid sexagesimal coordinates\n"
@@ -147,14 +390,6 @@
 msgid "Insert a favorite name"
 msgstr ""
 
-#: qml/Favorites.qml:214 qml/Main.qml:766 nav/class/UI.js:38
-msgid "Current Position"
-msgstr ""
-
-#: qml/Favorites.qml:229 qml/SettingsPage.qml:437
-msgid "Cancel"
-msgstr ""
-
 #: qml/Favorites.qml:236
 msgid "Overwrite"
 msgstr ""
@@ -203,6 +438,7 @@
 msgstr ""
 
 #: qml/Location.qml:230 qml/PoiListPage.qml:163
+#: qml/components/POIQuickAccessGridView.qml:181
 msgid "Searching…"
 msgstr ""
 
@@ -519,34 +755,16 @@
 msgid "Share location to"
 msgstr ""
 
-msgid "Share"
-msgstr ""
-
-msgid "Current"
-msgstr ""
-
-msgid "From Map"
-msgstr ""
-
-msgid "Start"
-msgstr ""
-
-msgid "Route so long"
-msgstr ""
-
-msgid "More than 1000km could affect the performance"
-msgstr ""
-
-msgid "We recommend you a waypoint in the middle as destination"
-msgstr ""
-
-msgid "GPS Denied"
-msgstr ""
-
-msgid "Error reading the GPS status"
-msgstr ""
-
-msgid "Please review your device settings"
+#: qml/components/POIQuickAccessGridView.qml:92
+msgid "Error getting results. Please, check your data connection."
+msgstr ""
+
+#: qml/components/POIQuickAccessGridView.qml:97
+msgid "Sorry, no results found nearby."
+msgstr ""
+
+#: qml/components/POIQuickAccessGridView.qml:175
+msgid "Current position unknown. Try again after a position update."
 msgstr ""
 
 #: qml/js/PoiCategories.js:4
@@ -1025,204 +1243,8 @@
 msgid "Town Hall"
 msgstr ""
 
-#: nav/class/Navigator.js:259
-msgid "You are near to the destination"
-msgstr ""
-
-#: nav/class/Navigator.js:285
-msgid "Go"
-msgstr ""
-
-#: nav/class/Navigator.js:288
-msgid "Go to your right"
-msgstr ""
-
-#: nav/class/Navigator.js:291
-msgid "Go to your left"
-msgstr ""
-
-#: nav/class/Navigator.js:294 nav/class/UI.js:546
-msgid "You have arrived at your destination"
-msgstr ""
-
-#: nav/class/Navigator.js:297
-msgid "Your destination is on the right"
-msgstr ""
-
-#: nav/class/Navigator.js:300
-msgid "Your destination is on the left"
-msgstr ""
-
-#: nav/class/Navigator.js:303
-msgid "Current road becomes"
-msgstr ""
-
-#: nav/class/Navigator.js:306
-msgid "Continue"
-msgstr ""
-
-#: nav/class/Navigator.js:309
-msgid "Bear right"
-msgstr ""
-
-#: nav/class/Navigator.js:312
-msgid "Turn right"
-msgstr ""
-
-#: nav/class/Navigator.js:315
-msgid "Make a sharp right"
-msgstr ""
-
-#: nav/class/Navigator.js:318
-msgid "Make a right U-turn"
-msgstr ""
-
-#: nav/class/Navigator.js:321
-msgid "Make a left U-turn"
-msgstr ""
-
-#: nav/class/Navigator.js:324
-msgid "Make a sharp left"
-msgstr ""
-
-#: nav/class/Navigator.js:327
-msgid "Turn left"
-msgstr ""
-
-#: nav/class/Navigator.js:330
-msgid "Bear left"
-msgstr ""
-
-#: nav/class/Navigator.js:333
-msgid "Stay straight on ramp"
-msgstr ""
-
-#: nav/class/Navigator.js:336
-msgid "Turn right on ramp"
-msgstr ""
-
-#: nav/class/Navigator.js:339
-msgid "Turn left on ramp"
-msgstr ""
-
-#: nav/class/Navigator.js:342
-msgid "Take the exit on the right"
-msgstr ""
-
-#: nav/class/Navigator.js:345
-msgid "Take the exit on the left"
-msgstr ""
-
-#: nav/class/Navigator.js:348
-msgid "Keep straight at the fork"
-msgstr ""
-
-#: nav/class/Navigator.js:351
-msgid "Keep right at the fork"
-msgstr ""
-
-#: nav/class/Navigator.js:354
-msgid "Keep left at the fork"
-msgstr ""
-
-#: nav/class/Navigator.js:357
-msgid "Merge"
-msgstr ""
-
-#: nav/class/Navigator.js:360
-msgid "Enter the roundabout"
-msgstr ""
-
-#: nav/class/Navigator.js:363 nav/class/Navigator.js:366
-#: nav/class/Navigator.js:369 nav/class/Navigator.js:372
-#: nav/class/Navigator.js:375 nav/class/Navigator.js:378
-#: nav/class/Navigator.js:381 nav/class/Navigator.js:384
-#: nav/class/Navigator.js:387
-msgid "Enter the roundabout and take the exit %1"
-msgstr ""
-
-#: nav/class/Navigator.js:390
-msgid "Exit the roundabout"
-msgstr ""
-
-#: nav/class/Navigator.js:393 nav/class/Navigator.js:396
-#: nav/class/Navigator.js:399 nav/class/Navigator.js:402
-#: nav/class/Navigator.js:405 nav/class/Navigator.js:408
-#: nav/class/Navigator.js:411 nav/class/Navigator.js:414
-#: nav/class/Navigator.js:417
-msgid "Take the exit %1"
-msgstr ""
-
-#: nav/class/Navigator.js:420
-msgid "Take the Ferry"
-msgstr ""
-
-#: nav/class/Navigator.js:423
-msgid "Leave the Ferry"
-msgstr ""
-
-#: nav/class/Navigator.js:488
-msgid " onto %1"
-msgstr ""
-
-#: nav/class/Navigator.js:491
-msgid ". Exit %1"
-msgstr ""
-
-#: nav/class/Navigator.js:493
-msgid " to take the %1"
-msgstr ""
-
-#: nav/class/Navigator.js:495
-msgid " toward %1"
-msgstr ""
-
-#: nav/class/Navigator.js:497
-msgid ", %1"
-msgstr ""
-
-#: nav/class/UI.js:47
-msgid "Current Start"
-msgstr ""
-
-#: nav/class/UI.js:56
-msgid "Current End"
-msgstr ""
-
-#: nav/class/UI.js:481
-msgid "Waiting for a GPS signal…"
-msgstr ""
-
-#: nav/class/UI.js:488
-msgid "Searching for a route…"
-msgstr ""
-
-#: nav/class/UI.js:492
-msgid "Drawing route…"
-msgstr ""
-
-#: nav/class/UI.js:496
-msgid "Trying search again soon…"
-msgstr ""
-
-#: nav/class/UI.js:500
-msgid "Recalculating route…"
-msgstr ""
-
-#: nav/class/UI.js:521
-msgid "Navigation will start soon"
-msgstr ""
-
-#: nav/class/UI.js:553
-msgid "Simulating route…"
-msgstr ""
-
-#: nav/class/UI.js:557
-msgid "Error simulating route. Try different points"
-msgstr ""
-
-#: nav/class/UI.js:578
-msgid "Click onto the icon for reviewing the route"
+#: qml/js/utils.js:58
+msgid "Current Location"
 msgstr ""
 
 #: qml/tuto/Slide1.qml:40

=== modified file 'qml/AboutPage.qml'
--- qml/AboutPage.qml	2016-08-06 06:22:10 +0000
+++ qml/AboutPage.qml	2016-08-26 16:26:36 +0000
@@ -45,6 +45,7 @@
             creditsModel.append({ category: i18n.tr("Developers"), name: "JkB", link: "https://launchpad.net/~joergberroth" })
             creditsModel.append({ category: i18n.tr("Developers"), name: "Marcos Costales (" + i18n.tr("Founder") + ")", link: "https://wiki.ubuntu.com/costales" })
             creditsModel.append({ category: i18n.tr("Developers"), name: "Nekhelesh Ramananthan", link: "https://launchpad.net/~nik90" })
+            creditsModel.append({ category: i18n.tr("Developers"), name: "Olivier Tilloy", link: "https://launchpad.net/~osomon" })
 
             // Voices
             switch (Qt.locale().name.substring(0,2).toLowerCase()) {