uNav

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

  1. update-pot-script
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Merged at revision: 102
Proposed branch: lp:~osomon/unav/update-pot-script
Merge into: lp:unav
Diff against target: 746 lines (+304/-326)
4 files modified
Makefile (+25/-35)
nav/locales/generate/README (+2/-37)
po/unav.pot (+276/-254)
qml/AboutPage.qml (+1/-0)
To merge this branch: bzr merge lp:~osomon/unav/update-pot-script
Reviewer Review Type Date Requested Status
costales Approve
Review via email: mp+303845@code.launchpad.net

Commit message

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

To post a comment you must log in.
lp:~osomon/unav/update-pot-script updated
105. By Olivier Tilloy

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

106. By Olivier Tilloy

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

107. By Olivier Tilloy

Convert update-pot.sh into makefile rules.

108. By Olivier Tilloy

Update translation template.

109. By Olivier Tilloy

Updated instructions.

Revision history for this message
costales (costales) wrote :

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

review: Approve
lp:~osomon/unav/update-pot-script updated
110. By Olivier Tilloy

Add myself to contributors.

Revision history for this message
costales (costales) wrote :

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

Revision history for this message
Olivier Tilloy (osomon) wrote :

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

lp:~osomon/unav/update-pot-script updated
111. By Olivier Tilloy

Updated translation template.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2016-03-26 18:53:17 +0000
+++ Makefile 2016-08-26 16:26:36 +0000
@@ -1,39 +1,29 @@
1# More information: https://wiki.ubuntu.com/Touch/Testing1#!/usr/bin/make -f
2#2# -*- makefile -*-
3# Notes for autopilot tests:
4# ---------------------------------------------------------------
5# In order to run autopilot tests:
6# sudo apt-add-repository ppa:autopilot/ppa
7# sudo apt-get update
8# sudo apt-get install python-autopilot autopilot-qt
9#
10# Notes for translations:
11# ---------------------------------------------------------------
12# In order to create translation files manually:
13# 1) run make once to create and update the po/unav.pot
14# 2) copy the template file and set the name to the language you want to
15# translate to: cp po/unav.pot po/en.po
16# 3) edit the po file
17# 4) run make build-translations to build the translation files
18#
19# Steps 1) and 4) are automatically executed by QtCreator
20#################################################################
213
22#APP_ID needs to match the "name" field of the click manifest4#APP_ID needs to match the "name" field of the click manifest
23APP_ID=costales.unav5APP_ID=costales.unav
246
25#provides a way for the IDE to set a specific target folder for the translations7POT_FILE=po/unav.pot
26TRANSLATION_ROOT=.8
279all: $(POT_FILE)
28MO_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)10
29QMLJS_FILES=$(shell find . -name "*.qml" -o -name "*.js" | grep -v ./tests)11HTML_STRINGS_FILE=nav/index.html.strings
3012$(HTML_STRINGS_FILE): nav/index.html
31all: po/unav.pot13 grep -Po 'data-localize=([^>]*)' $< > $@
3214$(HTML_STRINGS_FILE).h: $(HTML_STRINGS_FILE)
33#translation targets15 intltool-extract --type=gettext/quoted $<
34build-translations: $(MO_FILES)16
3517QML_FILES=$(shell find -iname *.qml -printf '%P\n')
36po/unav.pot:$(QMLJS_FILES)18JS_FILES=$(shell ls nav/class/*.js qml/js/*.js)
37 mkdir -p $(CURDIR)/po && xgettext -o po/unav.pot --add-comments=TRANSLATORS --keyword=tr --keyword=tr:1,2 $(QMLJS_FILES) --from-code=UTF-819
38$(TRANSLATION_ROOT)/share/locale/%/LC_MESSAGES/$(APP_ID).mo: po/%.po20I18N_FILES=$(sort $(QML_FILES) $(JS_FILES) $(HTML_STRINGS_FILE).h)
39 mkdir -p $(TRANSLATION_ROOT)/share/locale/$*/LC_MESSAGES && msgfmt -o $(@) $(<)21
22$(POT_FILE): $(I18N_FILES)
23 xgettext -o $@ --from-code=UTF-8 -C --qt --add-comments=TRANSLATORS \
24 --keyword=tr --keyword=tr:1,2 --keyword=t --keyword=N_ \
25 --package-name=unav -D . $^
26
27clean:
28 rm $(HTML_STRINGS_FILE) $(HTML_STRINGS_FILE).h
29
4030
=== 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 @@
1 xgettext -C --qt --add-comments=TRANSLATORS --keyword=tr --from-code utf-8 qml/*.qml -o nav/locales/unav1.pot1To update the translation template, cd to the root of the source tree,
2 echo 'msgid "Search"' >> nav/locales/unav1.pot2and run `make po/unav.pot`.
3 echo 'msgstr ""' >> nav/locales/unav1.pot
4 echo 'msgid "Favorites"' >> nav/locales/unav1.pot
5 echo 'msgstr ""' >> nav/locales/unav1.pot
6 echo 'msgid "Nearby"' >> nav/locales/unav1.pot
7 echo 'msgstr ""' >> nav/locales/unav1.pot
8 echo 'msgid "Coordinates"' >> nav/locales/unav1.pot
9 echo 'msgstr ""' >> nav/locales/unav1.pot
10 echo 'msgid "Share"' >> nav/locales/unav1.pot
11 echo 'msgstr ""' >> nav/locales/unav1.pot
12 echo 'msgid "Cancel Route"' >> nav/locales/unav1.pot
13 echo 'msgstr ""' >> nav/locales/unav1.pot
14
15 echo 'msgid "Current"' >> nav/locales/unav1.pot
16 echo 'msgstr ""' >> nav/locales/unav1.pot
17 echo 'msgid "Destination"' >> nav/locales/unav1.pot
18 echo 'msgstr ""' >> nav/locales/unav1.pot
19 echo 'msgid "From Map"' >> nav/locales/unav1.pot
20 echo 'msgstr ""' >> nav/locales/unav1.pot
21
22 echo 'msgid "translator-credits"' >> nav/locales/unav1.pot
23 echo 'msgstr ""' >> nav/locales/unav1.pot
24 grep -Po 'data-localize=([^>]*)' nav/index.html | cut -d= -f2 | sed 's/^/msgid /' | sed 's/$/\nmsgstr ""/' >> nav/locales/unav1.pot
25 xgettext -C --qt --keyword=tr --from-code utf-8 qml/js/PoiCategories.js -o nav/locales/unav2.pot
26 xgettext -C --keyword=t --from-code utf-8 nav/class/*.js -o nav/locales/unav3.pot
27 xgettext -C --qt --add-comments=TRANSLATORS --keyword=tr --from-code utf-8 qml/tuto/*.qml -o nav/locales/unav4.pot
28 xgettext -C --qt --add-comments=TRANSLATORS --keyword=tr --from-code utf-8 qml/tuto/components/*.qml -o nav/locales/unav5.pot
29 sed '1,18d' nav/locales/unav2.pot -i
30 sed '1,18d' nav/locales/unav3.pot -i
31 sed '1,18d' nav/locales/unav4.pot -i
32 sed '1,18d' nav/locales/unav5.pot -i
33 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
34 rm nav/locales/unav1.pot nav/locales/unav2.pot nav/locales/unav3.pot nav/locales/unav4.pot nav/locales/unav5.pot
35 msguniq -o nav/locales/unav.pot nav/locales/unav.pot
36 msgfmt -c nav/locales/unav.pot
37 rm messages.mo
383
39Translate javascript: Download .po files from LP, then:4Translate javascript: Download .po files from LP, then:
40 wget https://raw.githubusercontent.com/fileformat/lptools/master/po2json.py5 wget https://raw.githubusercontent.com/fileformat/lptools/master/po2json.py
416
=== 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 @@
1# SOME DESCRIPTIVE TITLE.1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER2# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the PACKAGE package.3# This file is distributed under the same license as the unav package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#5#
6#, fuzzy6#, fuzzy
7msgid ""7msgid ""
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: unav\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2016-08-06 23:08+0200\n"11"POT-Creation-Date: 2016-08-26 18:24+0200\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,253 @@
17"Content-Type: text/plain; charset=UTF-8\n"17"Content-Type: text/plain; charset=UTF-8\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: nav/class/Navigator.js:259
21msgid "You are near to the destination"
22msgstr ""
23
24#: nav/class/Navigator.js:285
25msgid "Go"
26msgstr ""
27
28#: nav/class/Navigator.js:288
29msgid "Go to your right"
30msgstr ""
31
32#: nav/class/Navigator.js:291
33msgid "Go to your left"
34msgstr ""
35
36#: nav/class/Navigator.js:294 nav/class/UI.js:546
37msgid "You have arrived at your destination"
38msgstr ""
39
40#: nav/class/Navigator.js:297
41msgid "Your destination is on the right"
42msgstr ""
43
44#: nav/class/Navigator.js:300
45msgid "Your destination is on the left"
46msgstr ""
47
48#: nav/class/Navigator.js:303
49msgid "Current road becomes"
50msgstr ""
51
52#: nav/class/Navigator.js:306
53msgid "Continue"
54msgstr ""
55
56#: nav/class/Navigator.js:309
57msgid "Bear right"
58msgstr ""
59
60#: nav/class/Navigator.js:312
61msgid "Turn right"
62msgstr ""
63
64#: nav/class/Navigator.js:315
65msgid "Make a sharp right"
66msgstr ""
67
68#: nav/class/Navigator.js:318
69msgid "Make a right U-turn"
70msgstr ""
71
72#: nav/class/Navigator.js:321
73msgid "Make a left U-turn"
74msgstr ""
75
76#: nav/class/Navigator.js:324
77msgid "Make a sharp left"
78msgstr ""
79
80#: nav/class/Navigator.js:327
81msgid "Turn left"
82msgstr ""
83
84#: nav/class/Navigator.js:330
85msgid "Bear left"
86msgstr ""
87
88#: nav/class/Navigator.js:333
89msgid "Stay straight on ramp"
90msgstr ""
91
92#: nav/class/Navigator.js:336
93msgid "Turn right on ramp"
94msgstr ""
95
96#: nav/class/Navigator.js:339
97msgid "Turn left on ramp"
98msgstr ""
99
100#: nav/class/Navigator.js:342
101msgid "Take the exit on the right"
102msgstr ""
103
104#: nav/class/Navigator.js:345
105msgid "Take the exit on the left"
106msgstr ""
107
108#: nav/class/Navigator.js:348
109msgid "Keep straight at the fork"
110msgstr ""
111
112#: nav/class/Navigator.js:351
113msgid "Keep right at the fork"
114msgstr ""
115
116#: nav/class/Navigator.js:354
117msgid "Keep left at the fork"
118msgstr ""
119
120#: nav/class/Navigator.js:357
121msgid "Merge"
122msgstr ""
123
124#: nav/class/Navigator.js:360
125msgid "Enter the roundabout"
126msgstr ""
127
128#: nav/class/Navigator.js:363 nav/class/Navigator.js:366
129#: nav/class/Navigator.js:369 nav/class/Navigator.js:372
130#: nav/class/Navigator.js:375 nav/class/Navigator.js:378
131#: nav/class/Navigator.js:381 nav/class/Navigator.js:384
132#: nav/class/Navigator.js:387
133#, qt-format
134msgid "Enter the roundabout and take the exit %1"
135msgstr ""
136
137#: nav/class/Navigator.js:390
138msgid "Exit the roundabout"
139msgstr ""
140
141#: nav/class/Navigator.js:393 nav/class/Navigator.js:396
142#: nav/class/Navigator.js:399 nav/class/Navigator.js:402
143#: nav/class/Navigator.js:405 nav/class/Navigator.js:408
144#: nav/class/Navigator.js:411 nav/class/Navigator.js:414
145#: nav/class/Navigator.js:417
146#, qt-format
147msgid "Take the exit %1"
148msgstr ""
149
150#: nav/class/Navigator.js:420
151msgid "Take the Ferry"
152msgstr ""
153
154#: nav/class/Navigator.js:423
155msgid "Leave the Ferry"
156msgstr ""
157
158#: nav/class/Navigator.js:488
159#, qt-format
160msgid " onto %1"
161msgstr ""
162
163#: nav/class/Navigator.js:491
164#, qt-format
165msgid ". Exit %1"
166msgstr ""
167
168#: nav/class/Navigator.js:493
169#, qt-format
170msgid " to take the %1"
171msgstr ""
172
173#: nav/class/Navigator.js:495
174#, qt-format
175msgid " toward %1"
176msgstr ""
177
178#: nav/class/Navigator.js:497
179#, qt-format
180msgid ", %1"
181msgstr ""
182
183#: nav/class/UI.js:38 qml/Favorites.qml:214 qml/Main.qml:766
184msgid "Current Position"
185msgstr ""
186
187#: nav/class/UI.js:47
188msgid "Current Start"
189msgstr ""
190
191#: nav/class/UI.js:56
192msgid "Current End"
193msgstr ""
194
195#: nav/class/UI.js:481
196msgid "Waiting for a GPS signal…"
197msgstr ""
198
199#: nav/class/UI.js:488
200msgid "Searching for a route…"
201msgstr ""
202
203#: nav/class/UI.js:492
204msgid "Drawing route…"
205msgstr ""
206
207#: nav/class/UI.js:496
208msgid "Trying search again soon…"
209msgstr ""
210
211#: nav/class/UI.js:500
212msgid "Recalculating route…"
213msgstr ""
214
215#: nav/class/UI.js:521
216msgid "Navigation will start soon"
217msgstr ""
218
219#: nav/class/UI.js:553
220msgid "Simulating route…"
221msgstr ""
222
223#: nav/class/UI.js:557
224msgid "Error simulating route. Try different points"
225msgstr ""
226
227#: nav/class/UI.js:578
228msgid "Click onto the icon for reviewing the route"
229msgstr ""
230
231#: nav/index.html.strings:1
232msgid "Start"
233msgstr ""
234
235#: nav/index.html.strings:2 qml/Favorites.qml:229 qml/SettingsPage.qml:437
236msgid "Cancel"
237msgstr ""
238
239#: nav/index.html.strings:3
240msgid "Route so long"
241msgstr ""
242
243#: nav/index.html.strings:4
244msgid "More than 1000km could affect the performance"
245msgstr ""
246
247#: nav/index.html.strings:5
248msgid "We recommend you a waypoint in the middle as destination"
249msgstr ""
250
251#: nav/index.html.strings:10 qml/Coordinate.qml:152 qml/Coordinate.qml:386
252msgid "Close"
253msgstr ""
254
255#: nav/index.html.strings:7
256msgid "GPS Denied"
257msgstr ""
258
259#: nav/index.html.strings:8
260msgid "Error reading the GPS status"
261msgstr ""
262
263#: nav/index.html.strings:9
264msgid "Please review your device settings"
265msgstr ""
266
20#: qml/AboutPage.qml:27 qml/SettingsPage.qml:44267#: qml/AboutPage.qml:27 qml/SettingsPage.qml:44
21msgid "About"268msgid "About"
22msgstr ""269msgstr ""
@@ -43,7 +290,7 @@
43msgstr ""290msgstr ""
44291
45#: qml/AboutPage.qml:44 qml/AboutPage.qml:45 qml/AboutPage.qml:46292#: qml/AboutPage.qml:44 qml/AboutPage.qml:45 qml/AboutPage.qml:46
46#: qml/AboutPage.qml:47293#: qml/AboutPage.qml:47 qml/AboutPage.qml:48
47msgid "Developers"294msgid "Developers"
48msgstr ""295msgstr ""
49296
@@ -51,34 +298,34 @@
51msgid "Founder"298msgid "Founder"
52msgstr ""299msgstr ""
53300
54#: qml/AboutPage.qml:52 qml/AboutPage.qml:55 qml/AboutPage.qml:58301#: qml/AboutPage.qml:53 qml/AboutPage.qml:56 qml/AboutPage.qml:59
55#: qml/AboutPage.qml:61 qml/AboutPage.qml:64 qml/AboutPage.qml:67302#: qml/AboutPage.qml:62 qml/AboutPage.qml:65 qml/AboutPage.qml:68
56msgid "Voice"303msgid "Voice"
57msgstr ""304msgstr ""
58305
59#: qml/AboutPage.qml:71306#: qml/AboutPage.qml:72
60msgid "Logo"307msgid "Logo"
61msgstr ""308msgstr ""
62309
63#: qml/AboutPage.qml:74310#: qml/AboutPage.qml:75
64msgid "translator-credits"311msgid "translator-credits"
65msgstr ""312msgstr ""
66313
67#: qml/AboutPage.qml:76314#: qml/AboutPage.qml:77
68msgid "Translators"315msgid "Translators"
69msgstr ""316msgstr ""
70317
71#: qml/AboutPage.qml:80 qml/AboutPage.qml:81 qml/AboutPage.qml:82318#: qml/AboutPage.qml:81 qml/AboutPage.qml:82 qml/AboutPage.qml:83
72#: qml/AboutPage.qml:83 qml/AboutPage.qml:84 qml/AboutPage.qml:85319#: qml/AboutPage.qml:84 qml/AboutPage.qml:85 qml/AboutPage.qml:86
73#: qml/AboutPage.qml:86 qml/AboutPage.qml:87 qml/AboutPage.qml:88320#: qml/AboutPage.qml:87 qml/AboutPage.qml:88 qml/AboutPage.qml:89
74#: qml/AboutPage.qml:89 qml/AboutPage.qml:90 qml/AboutPage.qml:91321#: qml/AboutPage.qml:90 qml/AboutPage.qml:91 qml/AboutPage.qml:92
75#: qml/AboutPage.qml:92 qml/AboutPage.qml:93 qml/AboutPage.qml:94322#: qml/AboutPage.qml:93 qml/AboutPage.qml:94 qml/AboutPage.qml:95
76#: qml/AboutPage.qml:95323#: qml/AboutPage.qml:96
77msgid "Powered by"324msgid "Powered by"
78msgstr ""325msgstr ""
79326
80#. TRANSLATORS: %1 and %2 are links that do not have to be translated: Year + Project + License327#. TRANSLATORS: %1 and %2 are links that do not have to be translated: Year + Project + License
81#: qml/AboutPage.qml:136328#: qml/AboutPage.qml:137
82#, qt-format329#, qt-format
83msgid "Version %1. Under License %2"330msgid "Version %1. Under License %2"
84msgstr ""331msgstr ""
@@ -114,10 +361,6 @@
114"Expected format is:"361"Expected format is:"
115msgstr ""362msgstr ""
116363
117#: qml/Coordinate.qml:152 qml/Coordinate.qml:386
118msgid "Close"
119msgstr ""
120
121#: qml/Coordinate.qml:384364#: qml/Coordinate.qml:384
122msgid ""365msgid ""
123"Enter valid sexagesimal coordinates\n"366"Enter valid sexagesimal coordinates\n"
@@ -147,14 +390,6 @@
147msgid "Insert a favorite name"390msgid "Insert a favorite name"
148msgstr ""391msgstr ""
149392
150#: qml/Favorites.qml:214 qml/Main.qml:766 nav/class/UI.js:38
151msgid "Current Position"
152msgstr ""
153
154#: qml/Favorites.qml:229 qml/SettingsPage.qml:437
155msgid "Cancel"
156msgstr ""
157
158#: qml/Favorites.qml:236393#: qml/Favorites.qml:236
159msgid "Overwrite"394msgid "Overwrite"
160msgstr ""395msgstr ""
@@ -203,6 +438,7 @@
203msgstr ""438msgstr ""
204439
205#: qml/Location.qml:230 qml/PoiListPage.qml:163440#: qml/Location.qml:230 qml/PoiListPage.qml:163
441#: qml/components/POIQuickAccessGridView.qml:181
206msgid "Searching…"442msgid "Searching…"
207msgstr ""443msgstr ""
208444
@@ -519,34 +755,16 @@
519msgid "Share location to"755msgid "Share location to"
520msgstr ""756msgstr ""
521757
522msgid "Share"758#: qml/components/POIQuickAccessGridView.qml:92
523msgstr ""759msgid "Error getting results. Please, check your data connection."
524760msgstr ""
525msgid "Current"761
526msgstr ""762#: qml/components/POIQuickAccessGridView.qml:97
527763msgid "Sorry, no results found nearby."
528msgid "From Map"764msgstr ""
529msgstr ""765
530766#: qml/components/POIQuickAccessGridView.qml:175
531msgid "Start"767msgid "Current position unknown. Try again after a position update."
532msgstr ""
533
534msgid "Route so long"
535msgstr ""
536
537msgid "More than 1000km could affect the performance"
538msgstr ""
539
540msgid "We recommend you a waypoint in the middle as destination"
541msgstr ""
542
543msgid "GPS Denied"
544msgstr ""
545
546msgid "Error reading the GPS status"
547msgstr ""
548
549msgid "Please review your device settings"
550msgstr ""768msgstr ""
551769
552#: qml/js/PoiCategories.js:4770#: qml/js/PoiCategories.js:4
@@ -1025,204 +1243,8 @@
1025msgid "Town Hall"1243msgid "Town Hall"
1026msgstr ""1244msgstr ""
10271245
1028#: nav/class/Navigator.js:2591246#: qml/js/utils.js:58
1029msgid "You are near to the destination"1247msgid "Current Location"
1030msgstr ""
1031
1032#: nav/class/Navigator.js:285
1033msgid "Go"
1034msgstr ""
1035
1036#: nav/class/Navigator.js:288
1037msgid "Go to your right"
1038msgstr ""
1039
1040#: nav/class/Navigator.js:291
1041msgid "Go to your left"
1042msgstr ""
1043
1044#: nav/class/Navigator.js:294 nav/class/UI.js:546
1045msgid "You have arrived at your destination"
1046msgstr ""
1047
1048#: nav/class/Navigator.js:297
1049msgid "Your destination is on the right"
1050msgstr ""
1051
1052#: nav/class/Navigator.js:300
1053msgid "Your destination is on the left"
1054msgstr ""
1055
1056#: nav/class/Navigator.js:303
1057msgid "Current road becomes"
1058msgstr ""
1059
1060#: nav/class/Navigator.js:306
1061msgid "Continue"
1062msgstr ""
1063
1064#: nav/class/Navigator.js:309
1065msgid "Bear right"
1066msgstr ""
1067
1068#: nav/class/Navigator.js:312
1069msgid "Turn right"
1070msgstr ""
1071
1072#: nav/class/Navigator.js:315
1073msgid "Make a sharp right"
1074msgstr ""
1075
1076#: nav/class/Navigator.js:318
1077msgid "Make a right U-turn"
1078msgstr ""
1079
1080#: nav/class/Navigator.js:321
1081msgid "Make a left U-turn"
1082msgstr ""
1083
1084#: nav/class/Navigator.js:324
1085msgid "Make a sharp left"
1086msgstr ""
1087
1088#: nav/class/Navigator.js:327
1089msgid "Turn left"
1090msgstr ""
1091
1092#: nav/class/Navigator.js:330
1093msgid "Bear left"
1094msgstr ""
1095
1096#: nav/class/Navigator.js:333
1097msgid "Stay straight on ramp"
1098msgstr ""
1099
1100#: nav/class/Navigator.js:336
1101msgid "Turn right on ramp"
1102msgstr ""
1103
1104#: nav/class/Navigator.js:339
1105msgid "Turn left on ramp"
1106msgstr ""
1107
1108#: nav/class/Navigator.js:342
1109msgid "Take the exit on the right"
1110msgstr ""
1111
1112#: nav/class/Navigator.js:345
1113msgid "Take the exit on the left"
1114msgstr ""
1115
1116#: nav/class/Navigator.js:348
1117msgid "Keep straight at the fork"
1118msgstr ""
1119
1120#: nav/class/Navigator.js:351
1121msgid "Keep right at the fork"
1122msgstr ""
1123
1124#: nav/class/Navigator.js:354
1125msgid "Keep left at the fork"
1126msgstr ""
1127
1128#: nav/class/Navigator.js:357
1129msgid "Merge"
1130msgstr ""
1131
1132#: nav/class/Navigator.js:360
1133msgid "Enter the roundabout"
1134msgstr ""
1135
1136#: nav/class/Navigator.js:363 nav/class/Navigator.js:366
1137#: nav/class/Navigator.js:369 nav/class/Navigator.js:372
1138#: nav/class/Navigator.js:375 nav/class/Navigator.js:378
1139#: nav/class/Navigator.js:381 nav/class/Navigator.js:384
1140#: nav/class/Navigator.js:387
1141msgid "Enter the roundabout and take the exit %1"
1142msgstr ""
1143
1144#: nav/class/Navigator.js:390
1145msgid "Exit the roundabout"
1146msgstr ""
1147
1148#: nav/class/Navigator.js:393 nav/class/Navigator.js:396
1149#: nav/class/Navigator.js:399 nav/class/Navigator.js:402
1150#: nav/class/Navigator.js:405 nav/class/Navigator.js:408
1151#: nav/class/Navigator.js:411 nav/class/Navigator.js:414
1152#: nav/class/Navigator.js:417
1153msgid "Take the exit %1"
1154msgstr ""
1155
1156#: nav/class/Navigator.js:420
1157msgid "Take the Ferry"
1158msgstr ""
1159
1160#: nav/class/Navigator.js:423
1161msgid "Leave the Ferry"
1162msgstr ""
1163
1164#: nav/class/Navigator.js:488
1165msgid " onto %1"
1166msgstr ""
1167
1168#: nav/class/Navigator.js:491
1169msgid ". Exit %1"
1170msgstr ""
1171
1172#: nav/class/Navigator.js:493
1173msgid " to take the %1"
1174msgstr ""
1175
1176#: nav/class/Navigator.js:495
1177msgid " toward %1"
1178msgstr ""
1179
1180#: nav/class/Navigator.js:497
1181msgid ", %1"
1182msgstr ""
1183
1184#: nav/class/UI.js:47
1185msgid "Current Start"
1186msgstr ""
1187
1188#: nav/class/UI.js:56
1189msgid "Current End"
1190msgstr ""
1191
1192#: nav/class/UI.js:481
1193msgid "Waiting for a GPS signal…"
1194msgstr ""
1195
1196#: nav/class/UI.js:488
1197msgid "Searching for a route…"
1198msgstr ""
1199
1200#: nav/class/UI.js:492
1201msgid "Drawing route…"
1202msgstr ""
1203
1204#: nav/class/UI.js:496
1205msgid "Trying search again soon…"
1206msgstr ""
1207
1208#: nav/class/UI.js:500
1209msgid "Recalculating route…"
1210msgstr ""
1211
1212#: nav/class/UI.js:521
1213msgid "Navigation will start soon"
1214msgstr ""
1215
1216#: nav/class/UI.js:553
1217msgid "Simulating route…"
1218msgstr ""
1219
1220#: nav/class/UI.js:557
1221msgid "Error simulating route. Try different points"
1222msgstr ""
1223
1224#: nav/class/UI.js:578
1225msgid "Click onto the icon for reviewing the route"
1226msgstr ""1248msgstr ""
12271249
1228#: qml/tuto/Slide1.qml:401250#: qml/tuto/Slide1.qml:40
12291251
=== 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 @@
45 creditsModel.append({ category: i18n.tr("Developers"), name: "JkB", link: "https://launchpad.net/~joergberroth" })45 creditsModel.append({ category: i18n.tr("Developers"), name: "JkB", link: "https://launchpad.net/~joergberroth" })
46 creditsModel.append({ category: i18n.tr("Developers"), name: "Marcos Costales (" + i18n.tr("Founder") + ")", link: "https://wiki.ubuntu.com/costales" })46 creditsModel.append({ category: i18n.tr("Developers"), name: "Marcos Costales (" + i18n.tr("Founder") + ")", link: "https://wiki.ubuntu.com/costales" })
47 creditsModel.append({ category: i18n.tr("Developers"), name: "Nekhelesh Ramananthan", link: "https://launchpad.net/~nik90" })47 creditsModel.append({ category: i18n.tr("Developers"), name: "Nekhelesh Ramananthan", link: "https://launchpad.net/~nik90" })
48 creditsModel.append({ category: i18n.tr("Developers"), name: "Olivier Tilloy", link: "https://launchpad.net/~osomon" })
4849
49 // Voices50 // Voices
50 switch (Qt.locale().name.substring(0,2).toLowerCase()) {51 switch (Qt.locale().name.substring(0,2).toLowerCase()) {

Subscribers

People subscribed via source and target branches