lp:~aerostitch/navit/trunk

Created by Joseph and last modified
Get this branch:
bzr branch lp:~aerostitch/navit/trunk

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Joseph
Project:
Navit
Status:
Merged

Import details

Import Status: Failed

This branch is an import of the HEAD branch of the Git repository at https://github.com/navit-gps/navit.git,branch=trunk.

The import has been suspended because it failed 5 or more times in succession.

Last successful import was .

Import started on alnitak and finished taking 15 seconds — see the log
Import started on alnitak and finished taking 15 seconds — see the log
Import started on izar and finished taking 15 seconds — see the log
Import started on alnitak and finished taking 15 seconds — see the log

Recent revisions

6638. By Joseph

Update CHANGELOG.md for release 0.5.3

6637. By Joseph

Update Sailfish spec for release 0.5.3

6636. By Joseph

Update Patch version for release 0.5.3

6635. By Wildemann Stefan <email address hidden>

Update Cmake NAVIT_VERSION_PATCH for release 0.5.2

Navi version shown in internal GUI is created by patching in cmake
PACKAGE_VERSION to the translation .po files. Increase
NAVIT_VERSION_PATCH to 2 in order to make this show 0.5.2 as well.

6634. By Wildemann Stefan <email address hidden>

Update Sailfish spec for release 0.5.2

6633. By Joseph

Update CHANGELOG.md for release 0.5.2

6632. By Joseph

update:release:Add more keywords for gitchangelog

6631. By Joseph

update:doc:Update AUTHORS file

6630. By Joseph Herlant <email address hidden>

cleanup:android:Fix android checkstyle complains (#645)

* Add files via upload

store translations in artefacts

* Add files via upload

* Add files via upload

* Add files via upload

* remove the last java files from cmakelists in po

* move all java UI strings into strings.xml

* translate UI strings by their id's

* Fix android indentation

* cleanup:android:Fix WhitespaceAround checkstyle issues

* cleanup:android:Fix NeedBraces checkstyle issues

* cleanup:android:Fix EmptyLineSeparator checkstyle issues

* cleanup:android:Fix WhitespaceAround checkstyle issues

* Fix linebreaks for codefactor

* cleanup:android:Fix a forgotten linebreak issue

* cleanup:android:Fix ArrayTypeStyle checkstyle issues

* cleanup:android:Fix CustomImportOrder checkstyle issues

* Fix checkstyle indentation warnings on NavitRestoreTask

* cleanup:android:Use try-with-resource construct to avoid emtpy catch block + fix AbbreviationAsWordInName in NavitRestoreTask

* cleanup:android:We support Java pre-7 so no try-with-resource block

* cleanup:android:Some more indentation cleanup and case fix

* fix:checkstyle:The array indentation should be 4 like the rest

* cleanup:android:Fix indentation warnings from checkstyle

* cleanup:android:Fix checkstyle OperatorWrap

* cleanup:android:Fix checkstyle LineLength

* cleanup:android:Fix checkstyle MethodParamPad and ParenPad

* cleanup:android:Fix checkstyle SeparatorWrapComma

* cleanup:android:Fix checkstyle NoWhitespaceBefore

6629. By Charles Curley <email address hidden>

Curley distance poi (#638)

* 1) Changed the translation string for "Distance(m)" from "" to "Distance". Rational: the "m" is ambiguous, it could be meters or miles. However, in the POI context, feet are more likely than miles. So take it out entirely. I did it this way rather than run sed on the entire collection of po input files.

2) The display code sorts the entries by distance. It has no way of knowing if "5" is five miles or five feet. So we leave the distances in feet or meters (depending on the setting for imperial). Allowing kilometers or miles might be a future enhancement.

3) See bug 556 (https://github.com/navit-gps/navit/issues/556). Rather than remove the spurious one as part of this fix, I will leave that to later. But both now have the same English "translation", "Select a search radius from screen center". This hides the problem, at least from English users. This affects all four en_*.po.in files.

4) Someone who knows more than I do about the translation strings might have a better idea. Particularly, is there a graceful way to indicate the input units, either miles or kilometers?

 modified: navit/gui/gtk/gui_gtk_poi.c
 modified: po/en.po.in
 modified: po/en_AU.po.in
 modified: po/en_CA.po.in
 modified: po/en_GB.po.in

* Made it prettier. Reformatted one commented and tabified the thing.

 modified: navit/gui/gtk/gui_gtk_poi.c

* Replaced one of the two source strings for the PoI window prompt for inputting the search radius. Pull Request 557.

 modified: navit/gui/gtk/gui_gtk_poi.c
 modified: po/af.po.in
 modified: po/ar.po.in
 modified: po/ast.po.in
 modified: po/be.po.in
 modified: po/bg.po.in
 modified: po/bs.po.in
 modified: po/ca.po.in
 modified: po/ckb.po.in
 modified: po/cs.po.in
 modified: po/cy.po.in
 modified: po/da.po.in
 modified: po/de.po.in
 modified: po/de_CH.po.in
 modified: po/el.po.in
 modified: po/en.po.in
 modified: po/en_AU.po.in
 modified: po/en_CA.po.in
 modified: po/en_GB.po.in
 modified: po/eo.po.in
 modified: po/es.po.in
 modified: po/et.po.in
 modified: po/eu.po.in
 modified: po/fa.po.in
 modified: po/fi.po.in
 modified: po/fil.po.in
 modified: po/fo.po.in
 modified: po/fr.po.in
 modified: po/fr_CH.po.in
 modified: po/fy.po.in
 modified: po/gl.po.in
 modified: po/he.po.in
 modified: po/hi.po.in
 modified: po/hr.po.in
 modified: po/hu.po.in
 modified: po/id.po.in
 modified: po/it.po.in
 modified: po/ja.po.in
 modified: po/jv.po.in
 modified: po/kk.po.in
 modified: po/kn.po.in
 modified: po/ko.po.in
 modified: po/ku.po.in
 modified: po/lb.po.in
 modified: po/lt.po.in
 modified: po/lv.po.in
 modified: po/mk.po.in
 modified: po/ml.po.in
 modified: po/mn.po.in
 modified: po/mr.po.in
 modified: po/nb.po.in
 modified: po/nds.po.in
 modified: po/nl.po.in
 modified: po/nn.po.in
 modified: po/pl.po.in
 modified: po/pms.po.in
 modified: po/pt.po.in
 modified: po/pt_BR.po.in
 modified: po/ro.po.in
 modified: po/ru.po.in
 modified: po/sc.po.in
 modified: po/si.po.in
 modified: po/sk.po.in
 modified: po/sl.po.in
 modified: po/sq.po.in
 modified: po/sr.po.in
 modified: po/sv.po.in
 modified: po/sw.po.in
 modified: po/ta.po.in
 modified: po/te.po.in
 modified: po/th.po.in
 modified: po/tr.po.in
 modified: po/uk.po.in
 modified: po/ur.po.in
 modified: po/vi.po.in
 modified: po/zh_CN.po.in
 modified: po/zh_HK.po.in
 modified: po/zh_TW.po.in

* The distance to points of interest has been rendered in kilometers
even if the user has asked for imperial. This commit fixes that.

We convert to feet only, and not miles, because the code sorts on the
numeric value of the distance, so it doesn't like two different
units. Currently, the distance is an int. Can it be made a float?
Possible future enhancement?

 modified: navit/gui/gtk/gui_gtk_poi.c

* Improved comment.

 modified: navit/gui/gtk/gui_gtk_poi.c

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.

Subscribers