summaryrefslogtreecommitdiff
path: root/po/gl.po.in
diff options
context:
space:
mode:
authormvglasow <mvglasow@ffa7fe5e-494d-0410-b361-a75ebd5db220>2015-05-15 20:25:40 +0000
committermvglasow <mvglasow@ffa7fe5e-494d-0410-b361-a75ebd5db220>2015-05-15 20:25:40 +0000
commit5e956d5a19d41466b76fe6c8cea6c9458921c0db (patch)
tree1e6bf9f414bf37d2761a81ef4ba0758d424c8af2 /po/gl.po.in
parentd414008072abf34ff7d2896a84d53e5138e707c2 (diff)
downloadnavit-svn-5e956d5a19d41466b76fe6c8cea6c9458921c0db.tar.gz
Add:core:Merge project highfive|Thx jandegr and robotaxi for contributing!
Major rewrite of navigation.c: Major improvements of maneuver announcements (what and when) New maneuvers (U turn, keep left/right, highway merge/exit) Announce names and numbers of highway exits and interchanges Improve some announcement strings Squashed commit of the following: commit 3364214f5d7219829c3bdfa6770e970ea047421f Merge: fd3c26b 8fa54e3 Author: mvglasow <michael -at- vonglasow.com> Date: Thu May 14 14:38:06 2015 +0200 Merge branch 'master' into highfive commit fd3c26b877e8fbc18da2d606e6089b41eff308f9 Author: mvglasow <michael -at- vonglasow.com> Date: Thu May 14 13:28:36 2015 +0200 Add:Translations:Add English Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 0e723fa842f8a50a655499cd537f45206e9fc576 Author: mvglasow <michael -at- vonglasow.com> Date: Sun May 3 02:55:48 2015 +0200 Fix:Translations:Restore some lost translations Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 4bfcfd5345ee57a232b5649fa0d9ff1790e7c9a7 Author: mvglasow <michael -at- vonglasow.com> Date: Sun May 3 02:37:16 2015 +0200 Refactor:Translations:Update .po.in files Signed-off-by: mvglasow <michael -at- vonglasow.com> commit f639054f896a7f00ac00cc9dba3ef2345f195923 Merge: 3e2262c 1f11d37 Author: mvglasow <michael -at- vonglasow.com> Date: Sun May 3 01:03:13 2015 +0200 Merge branch 'master' into highfive-r6088 Conflicts: navit/navit/attr_def.h navit/navit/item_def.h navit/navit/navigation.c navit/po/af.po.in navit/po/ar.po.in navit/po/ast.po.in navit/po/be.po.in navit/po/bg.po.in navit/po/ca.po.in navit/po/cs.po.in navit/po/cy.po.in navit/po/da.po.in navit/po/de.po.in navit/po/el.po.in navit/po/en_AU.po.in navit/po/en_CA.po.in navit/po/en_GB.po.in navit/po/eo.po.in navit/po/es.po.in navit/po/et.po.in navit/po/eu.po.in navit/po/fa.po.in navit/po/fi.po.in navit/po/fil.po.in navit/po/fo.po.in navit/po/fr.po.in navit/po/fr_CH.po.in navit/po/gl.po.in navit/po/he.po.in navit/po/hi.po.in navit/po/hr.po.in navit/po/hu.po.in navit/po/id.po.in navit/po/it.po.in navit/po/jv.po.in navit/po/ku.po.in navit/po/lb.po.in navit/po/lt.po.in navit/po/lv.po.in navit/po/mk.po.in navit/po/ml.po.in navit/po/mn.po.in navit/po/nb.po.in navit/po/nds.po.in navit/po/nl.po.in navit/po/nn.po.in navit/po/pl.po.in navit/po/pt.po.in navit/po/pt_BR.po.in navit/po/ro.po.in navit/po/ru.po.in navit/po/sc.po.in navit/po/si.po.in navit/po/sk.po.in navit/po/sl.po.in navit/po/sr.po.in navit/po/sv.po.in navit/po/sw.po.in navit/po/ta.po.in navit/po/te.po.in navit/po/th.po.in navit/po/tr.po.in navit/po/uk.po.in navit/po/ur.po.in navit/po/vi.po.in navit/po/zh_CN.po.in navit/po/zh_HK.po.in commit 3e2262ccd17ff640e663a1df68f12ce3a1454874 Author: mvglasow <michael -at- vonglasow.com> Date: Fri May 1 01:58:07 2015 +0200 Add:Translations:New string for motorway ramps Signed-off-by: mvglasow <michael -at- vonglasow.com> commit f415783cfb434f5830a376581e419a260efb8c5a Author: mvglasow <michael -at- vonglasow.com> Date: Fri May 1 01:24:21 2015 +0200 Refactor:core:Shorten ramp checks at interchanges Signed-off-by: mvglasow <michael -at- vonglasow.com> commit c086e7d0a207c96653e05b2166fdd864c18f2700 Author: mvglasow <michael -at- vonglasow.com> Date: Fri May 1 00:26:02 2015 +0200 Fix:core:Announce motorway ramps even if they are segmented Signed-off-by: mvglasow <michael -at- vonglasow.com> commit c559ebed907b17b65d294d7b0cbcd8a40a5fc202 Author: mvglasow <michael -at- vonglasow.com> Date: Thu Apr 30 22:13:34 2015 +0200 Fix:core:Announce motorway ramps for all motorway-like roads Signed-off-by: mvglasow <michael -at- vonglasow.com> commit f34116ba5026b7f023e933eac80794eff7406fb4 Author: Robotaxi <robotaxi@arcor.de> Date: Thu Apr 30 12:30:55 2015 +0200 Announcement for entering a motorway ...if there is no additional information of the motorway name. commit a3fa3825716f50586ad6b9d254dbb01afa1c9b48 Author: mvglasow <michael -at- vonglasow.com> Date: Sun Apr 26 23:06:58 2015 +0200 Add:core:Icons for new maneuvers Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 146eadd96f5495c09095152829a68d490e1c593b Author: mvglasow <michael -at- vonglasow.com> Date: Sun Apr 26 22:34:14 2015 +0200 Refactor:core:clean up some comments Signed-off-by: mvglasow <michael -at- vonglasow.com> commit bcfe4f9f7f94c033b796baf98b7b8f7e87bf4eae Author: mvglasow <michael -at- vonglasow.com> Date: Sun Apr 26 22:18:37 2015 +0200 Fix:core:Correctly announce interchanges and exits in attr_name Signed-off-by: mvglasow <michael -at- vonglasow.com> commit cf61c8f9800cd87f398d09c28c538f91bf083eee Author: mvglasow <michael -at- vonglasow.com> Date: Sun Apr 26 18:21:27 2015 +0200 Refactor:core:some comments in navigation.c Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 71280d539e49471800b182f104d14197f9ab6e5e Author: mvglasow <michael -at- vonglasow.com> Date: Sun Apr 26 17:46:41 2015 +0200 Fix:Translations:Missing update in it.po.in Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 3a2fe4a71f4a9f4b17c206ab882bda30cc2a4851 Author: mvglasow <michael -at- vonglasow.com> Date: Sun Apr 26 17:17:28 2015 +0200 Add:Translations:Update translations| Salvage existing translations where strings have changed, add missing translations (best effort) Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 5d6e3295219e16be160f5587939b81877d9875c0 Author: mvglasow <michael -at- vonglasow.com> Date: Fri Apr 24 17:00:48 2015 +0200 Refactor:Translations:Update .po.in files Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 60227761322d989113bf77e50628a89c796580d5 Merge: a77442d 9f67332 Author: mvglasow <michael -at- vonglasow.com> Date: Fri Apr 17 19:57:39 2015 +0200 Merge branch 'highfive' of github.com:mvglasow/navit into highfive commit a77442d298eed1a287d5a1e4b8be1c4a106803ed Author: mvglasow <michael -at- vonglasow.com> Date: Fri Apr 17 18:47:03 2015 +0200 Fix:core:Detect complex T junctions even if name changes at the junction Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 9f67332628fd5a8d85634e1a76273fca1c4c13d1 Author: Robotaxi <robotaxi@arcor.de> Date: Fri Apr 17 14:09:36 2015 +0200 Fine tuning for announcement Split announcement content generally for junctions and added name_systematic info for missing cases. commit cef33de9846eb8073949dcbe26d84e82c788e977 Author: Robotaxi <robotaxi@arcor.de> Date: Fri Apr 17 13:15:51 2015 +0200 Corrected '==' in if statement commit 1f4e10e9da647226805368b641a27aa74421a70f Author: Robotaxi <robotaxi@arcor.de> Date: Wed Apr 15 14:07:47 2015 +0200 Added missing semicolon commit 31ed114f5402954ce1663d7cb700cf32deab8cde Author: Robotaxi <robotaxi@arcor.de> Date: Wed Apr 15 13:33:34 2015 +0200 Added missing semicolon commit efb300b2df825689aec3ef07fed28a7da9c9d726 Merge: a9b3c2a 2018853 Author: mvglasow <michael -at- vonglasow.com> Date: Mon Apr 13 23:00:35 2015 +0200 Merge branch 'highfive' of github.com:mvglasow/navit into highfive commit a9b3c2aa06ee33a4c4d7773873fba9a9a2fbd8b6 Author: mvglasow <michael -at- vonglasow.com> Date: Mon Apr 13 22:59:57 2015 +0200 Refactor:core:updated soem comments Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 201885336ebdc8f474ceaf7d4c6e9146631f0f97 Author: Robotaxi <robotaxi@arcor.de> Date: Mon Apr 13 14:05:25 2015 +0200 Announcement of exit ref and label only for level 2 At interchanges announcement of exit ref and label only makes sense for the first announcement, i.e. level 2. At place, i.e. some meters before turn focus shall be set on announcement of directions. commit 52e9426bc972b2b6bf76f9a0ae76787b95f42ac6 Author: Robotaxi <robotaxi@arcor.de> Date: Mon Apr 13 13:50:29 2015 +0200 Editorial changes commit 2bebe31a471d18173fa3812213f527f9bf3b7402 Author: mvglasow <michael -at- vonglasow.com> Date: Sun Apr 12 23:00:15 2015 +0200 Fix:core:Fix bad reference in navigation_itm_new() Signed-off-by: mvglasow <michael -at- vonglasow.com> commit d3aa0c3144b6add7898c8b0f75cd4a5f7fdb6000 Author: mvglasow <michael -at- vonglasow.com> Date: Sun Apr 12 22:27:01 2015 +0200 Fix:core:Don't copy exit destination onto motorway segments Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 67bedfc9d3ca1653ff022c93987a2f32222db52f Author: mvglasow <michael -at- vonglasow.com> Date: Sun Apr 12 19:48:34 2015 +0200 Fix:core:Avoid mis-guessing motorway interchanges as temporary splits Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 74d73465220f1a662a17ca1f529e714df1ce03fe Author: mvglasow <michael -at- vonglasow.com> Date: Sat Apr 11 02:12:59 2015 +0200 Fix:core:Suppress announcements where lanes split at highway toll booths Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 88525fcfbcac2b217b6ea06dca427c83b4da8a6a Author: mvglasow <michael -at- vonglasow.com> Date: Fri Apr 10 21:42:20 2015 +0200 Fix:core:Don't count start of single-carriageway motorway as interchange Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 8ba2bb6a8cca2a8832f117e0e832466d4ddd4961 Author: mvglasow <michael -at- vonglasow.com> Date: Fri Apr 10 00:42:19 2015 +0200 Fix:core:Properly identify motorway interchanges by name changes Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 7009b22a01ecad14a9486f5e50b1e144a5e016b5 Author: mvglasow <michael -at- vonglasow.com> Date: Fri Apr 10 00:03:54 2015 +0200 Fix:core:Ignore duplicates in navigation_itm_ways_update Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 8f6da5a1fa72493efdea553d3962610ac2b91632 Author: mvglasow <michael -at- vonglasow.com> Date: Fri Apr 3 01:49:47 2015 +0200 Add:core:Suffixes for Lithuanian names Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 8f4acd27fdb775fc81dfea100338c0c72fdf7c03 Author: mvglasow <michael -at- vonglasow.com> Date: Fri Apr 3 01:22:31 2015 +0200 Refactor:core:Use proper gender identifiers in navigation.c Signed-off-by: mvglasow <michael -at- vonglasow.com> commit ff999d55882dfe8d48afe71cc297ac34b3cd7d0f Author: mvglasow <michael -at- vonglasow.com> Date: Fri Apr 3 01:20:45 2015 +0200 Fix:core:Suppress another compiler warning in navigation.c Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 8153fbf1d0770d140bc6fdfbe9dd4ce05ca99616 Author: mvglasow <michael -at- vonglasow.com> Date: Fri Apr 3 00:34:11 2015 +0200 Fix:core:Fix road name announcement for merge maneuvers Signed-off-by: mvglasow <michael -at- vonglasow.com> commit f2d8e84b984b2a54a50f7e876cbd2b10a6d22ed0 Author: mvglasow <michael -at- vonglasow.com> Date: Thu Apr 2 23:51:54 2015 +0200 Fix:core:Fix some announcement bugs introduced in previous commit Signed-off-by: mvglasow <michael -at- vonglasow.com> commit dd95c971d694132f4aa07faeaf41a6a4d048aefa Author: mvglasow <michael -at- vonglasow.com> Date: Thu Apr 2 23:26:52 2015 +0200 Fix:core:Clean up announcement texts| Proper English strings for all announcements. Handle concatenation with "then.." properly. Eliminate most superfluous spaces. Roads have no sex (they don't lay eggs or give birth) but gender. Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 9f73164423b2a530fb25ea164369c56498406866 Author: mvglasow <michael -at- vonglasow.com> Date: Thu Apr 2 21:20:07 2015 +0200 Fix:core:Clean up string creation for straight/keep left/keep right Signed-off-by: mvglasow <michael -at- vonglasow.com> commit f09928ba8ba1b657e70c6bc019a24c903440e1e6 Author: mvglasow <michael -at- vonglasow.com> Date: Thu Apr 2 20:30:08 2015 +0200 Fix:core:Fix compiler warnings and attr_debug in navigation.c Signed-off-by: mvglasow <michael -at- vonglasow.com> commit a3aad0f756d060dd1564f529ff63ddbc71243ff9 Author: mvglasow <michael -at- vonglasow.com> Date: Wed Apr 1 00:24:21 2015 +0200 Add:core:Extra debug output in maneuver_required2() Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 59ad732673ee78f568931c9bb7bd8f06336315f5 Author: mvglasow <michael -at- vonglasow.com> Date: Tue Mar 31 23:21:58 2015 +0200 Refactor:core:TODO comment in maneuver_required2() Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 1f7ff3b68eed26d95baad70507b8a7b5d44f2ae9 Author: mvglasow <michael -at- vonglasow.com> Date: Mon Mar 30 00:14:45 2015 +0200 Fix:core:Improve some new announcements Signed-off-by: mvglasow <michael -at- vonglasow.com> commit c73ccca846fcc00044869f50ef78923fbe54c9fb Author: mvglasow <michael -at- vonglasow.com> Date: Sun Mar 29 22:55:04 2015 +0200 Refactor:core:De-duplicate code for turn announcements Signed-off-by: mvglasow <michael -at- vonglasow.com> commit bd1bf6b30594b8f34730a57633afd1f27164a54d Author: mvglasow <michael -at- vonglasow.com> Date: Sun Mar 29 21:08:38 2015 +0200 Fix:core:Move all merge_or_exit-related code into maneuver_required2() Signed-off-by: mvglasow <michael -at- vonglasow.com> commit b1d18380b215edbb0f4a445fd49daa9eda726362 Author: mvglasow <michael -at- vonglasow.com> Date: Sun Mar 29 00:41:15 2015 +0100 Refactor:core:Remove misleading comment Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 3f1e171ea7ea4aeb21f932e7ed497def1c3cfeab Author: mvglasow <michael -at- vonglasow.com> Date: Sun Mar 29 00:35:40 2015 +0100 Refactor:core:Document arguments for show_next_maneuvers() Signed-off-by: mvglasow <michael -at- vonglasow.com> commit f9097e9bbe1499015291fe0a2d1f87cba65a5277 Merge: dc6a294 40f5206 Author: mvglasow <michael -at- vonglasow.com> Date: Sat Mar 28 23:53:27 2015 +0100 Merge branch 'highfive' of github.com:mvglasow/navit into highfive commit dc6a29468d8884ddc146fe348e4b7e72b57123eb Author: mvglasow <michael -at- vonglasow.com> Date: Sat Mar 28 23:52:50 2015 +0100 Refactor:core:correct some comments in maneuver_required2() Signed-off-by: mvglasow <michael -at- vonglasow.com> commit a9947f1851f873eeb0280a734014cfe024c3f17c Author: mvglasow <michael -at- vonglasow.com> Date: Sat Mar 28 21:58:45 2015 +0100 Fix:core:Set mex_interchange for ramp-to-ramp changes between two motorways Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 40f5206f75691c73bcfff9a6932baed70c773903 Author: Robotaxi <robotaxi@arcor.de> Date: Fri Mar 27 12:37:41 2015 +0100 Removed generic string from internationalization commit 65ba5d659813d514c96bde6115b25aba90f1905d Author: mvglasow <michael -at- vonglasow.com> Date: Tue Mar 24 23:03:49 2015 +0100 Fix:core:Do not announce motorway interchanges as exits Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 298f65f1d865714f3993851b40f236bc8eb8266f Author: mvglasow <michael -at- vonglasow.com> Date: Sun Mar 22 23:26:32 2015 +0100 Fix:core:Improve formatting of speech command for exit maneuvers Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 4da3f123258ffe7c0721852714850dc76c50a06d Author: mvglasow <michael -at- vonglasow.com> Date: Sun Mar 22 17:15:27 2015 +0100 Refactor:core:Document show_maneuver() Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 30d3e5ec1aaa19612f2e1fe35e0ed6df52c8c146 Author: mvglasow <michael -at- vonglasow.com> Date: Sun Mar 22 15:41:25 2015 +0100 Fix:core:Correct speech announcement for exit maneuvers Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 438dc177a6a4a97ac24f38e94b7d1baebd18dc55 Author: mvglasow <michael -at- vonglasow.com> Date: Sun Mar 22 14:14:34 2015 +0100 Refactor:core:Clean up dbg() calls Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 510fc90baa5e10ab541e8025ac01aad6bd6917c4 Author: mvglasow <michael -at- vonglasow.com> Date: Sat Mar 21 21:43:28 2015 +0100 Fix:core:Fix missing maneuver when turning into a way of a higher category| Thanks robotaxi for reporting! Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 4e0680b6e4528fc130ec298273ebfdc8fbce2dee Author: mvglasow <michael -at- vonglasow.com> Date: Sat Mar 21 00:14:50 2015 +0100 Fix:core:Fix missing announcements at multi-carriageway T junctions| Thanks robotaxi for reporting Signed-off-by: mvglasow <michael -at- vonglasow.com> commit ff0d34a30fbe7966c50c396636691a9d4e393cb8 Author: mvglasow <michael -at- vonglasow.com> Date: Sun Mar 15 20:21:56 2015 +0100 Refactor:core:Clean up docs, comments and formatting in navigation.c Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 5c7ed7974b4052510af40921c06ba77d771aaae3 Author: mvglasow <michael -at- vonglasow.com> Date: Sun Mar 15 18:33:35 2015 +0100 Refactor:core:remove obsolete angle_straight Signed-off-by: mvglasow <michael -at- vonglasow.com> commit f1c9c476d36187cd521c592b9c8f4b7e381e429e Author: mvglasow <michael -at- vonglasow.com> Date: Sun Mar 15 18:12:44 2015 +0100 Refactor:core:Use only delta3 for roundabout analysis, remove dead code Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 0ef17818d076a2108a0cb7f793e7bccd966b6a9b Author: mvglasow <michael -at- vonglasow.com> Date: Sat Mar 14 01:19:45 2015 +0100 Fix:core:Fix more errors in roundabout delta3 calculation Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 1431446956c5c7d13cfcf0d27878ae24e6bea93c Author: mvglasow <michael -at- vonglasow.com> Date: Fri Mar 13 23:14:46 2015 +0100 Fix:core:Use only delta3 for roundabout (experimental) Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 5539c37b9b0bec9bfbbb0a4c8baf2f5d08475e15 Author: mvglasow <michael -at- vonglasow.com> Date: Fri Mar 13 22:33:24 2015 +0100 Fix:core:Improve maneuver identification in roundabout analysis Signed-off-by: mvglasow <michael -at- vonglasow.com> commit fceeaa4fe847012b22d9e99fe6dcbe60c68854e0 Author: mvglasow <michael -at- vonglasow.com> Date: Fri Mar 13 17:39:18 2015 +0100 Add:core:Option to ignore oneway restrictions in is_way_allowed() Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 15070b43bf9dfafa50505127ed74224448763a90 Author: mvglasow <michael -at- vonglasow.com> Date: Fri Mar 13 17:11:29 2015 +0100 Refactor:core:Prepare for more thorough roundabout delta analysis Signed-off-by: mvglasow <michael -at- vonglasow.com> commit de29f9e08e2d70a6368263e598c6bc6d2ee1de4b Author: mvglasow <michael -at- vonglasow.com> Date: Thu Mar 5 23:44:12 2015 +0100 Fix:core:Re-add some local variables dropped in last merge Signed-off-by: mvglasow <michael -at- vonglasow.com> commit d4ffaf588f9d6a67951e1ec1e722087b30133211 Merge: cfd4baa c4312dc Author: mvglasow <michael -at- vonglasow.com> Date: Thu Mar 5 23:32:18 2015 +0100 Merge branch 'highfive' of github.com:mvglasow/navit into highfive Conflicts: navit/navit/navigation.c commit c4312dc79795a9d7a3339642d21c144aa1d5785e Author: Robotaxi <robotaxi@arcor.de> Date: Thu Mar 5 13:53:13 2015 +0100 Patch for #1095 Corrects the criterion, when strengthening of the announcement comes to action, and specifies the strengthening of the announcement more specific for the possible numbers of ways to turn into. Code is similar to "simple turn rule pattern" in #1095. commit a1f49929263a1d8e56016725a0cf7ffa760ec8dd Author: jandegr <jandegr@users.noreply.github.com> Date: Sat Feb 28 14:35:09 2015 +0100 (try to) fix CID 25307 (thx kazer & Coverity) commit d83e1b0fe3b3a8896aaa61ff6c3c7c609c8e140c Author: jandegr <jandegr@users.noreply.github.com> Date: Sat Feb 28 14:22:09 2015 +0100 (try to) fix CID 25287 (thx kazer & Coverity) commit 4e5123eccfccd51dfa26c175eb5895afe6d80ffa Author: jandegr <jandegr@users.noreply.github.com> Date: Sat Feb 28 10:58:43 2015 +0100 improve exit left/right command handling commit 6b768b9ce62998ef159c8a1b74e1f5517e192881 Author: jandegr <jandegr@users.noreply.github.com> Date: Sat Feb 28 08:28:26 2015 +0100 (try to) fix CID 34808 -out of bounds writre- (thx kazer & Coverity) commit 7ffd28be0406f9f77ceb7bebbe5e02a4536c899b Author: jandegr <jandegr@users.noreply.github.com> Date: Fri Feb 27 20:40:12 2015 +0100 (try to) fix CID 34807 (thx kazer & Coverity) commit 2d350f80cb30bb2aeaeaf28e52eb16a976323a84 Author: jandegr <jandegr@users.noreply.github.com> Date: Fri Feb 27 20:35:12 2015 +0100 (try to) fix CID 34806 (thx kazer & Coverity) commit efa4fd9e5cdef5631ec75410e5d6f7bdd64c1685 Author: jandegr <jandegr@users.noreply.github.com> Date: Fri Feb 27 20:15:59 2015 +0100 fix uninitialized pointer (thx kazer & Coverity - CID 34810) commit 296dd61dafec14c3861dec2554d659f2db64a893 Author: jandegr <jandegr@users.noreply.github.com> Date: Fri Feb 27 19:23:00 2015 +0100 fix unchecked return value (thx kazer & Coverity) commit cfd4baa5813dfe6bf7bbd40c2c728751807d5da6 Author: mvglasow <michael -at- vonglasow.com> Date: Fri Feb 20 20:54:33 2015 +0100 Fix:core:Use all three estimates for roundabout delta calculation Signed-off-by: mvglasow <michael -at- vonglasow.com> commit fd4e493304a1d0557c8cbeab40108655ec076772 Author: mvglasow <michael -at- vonglasow.com> Date: Tue Feb 10 22:59:57 2015 +0100 Fix:core:Don't use experimental delta3 for roundabout calculations Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 99ce7ccc4be95da0af27aaf7df01f99b37c80e1a Author: mvglasow <michael -at- vonglasow.com> Date: Tue Feb 10 22:30:08 2015 +0100 Fix:core:Fix multiple errors in roundabout delta calculation Signed-off-by: mvglasow <michael -at- vonglasow.com> commit d1d9109e4048ada47a74649c294ca21d5ee33916 Author: mvglasow <michael -at- vonglasow.com> Date: Fri Feb 6 21:45:20 2015 +0100 Add:core:Use delta3 to determine roundabout angle (experimental) Signed-off-by: mvglasow <michael -at- vonglasow.com> commit fce24cb19c80aeef1ed68e501fe6cf15e2bbe24b Author: mvglasow <michael -at- vonglasow.com> Date: Fri Feb 6 21:27:57 2015 +0100 Fix:core:Adjust direction for (still unused) roundabout delta estimate Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 49e56e473b9c791c9b9834abb6c014bd109937bc Author: mvglasow <michael -at- vonglasow.com> Date: Fri Feb 6 21:03:03 2015 +0100 Refactoring:core:Move roundabout analysis into separate function Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 983115c829026910adb8931123298b59cf630b78 Author: mvglasow <michael -at- vonglasow.com> Date: Fri Feb 6 19:11:30 2015 +0100 Fix:core:Tweak error estimates for roundabout delta Signed-off-by: mvglasow <michael -at- vonglasow.com> commit c64437c559ee33372f2451dc5222e333ea7f6978 Author: mvglasow <michael -at- vonglasow.com> Date: Fri Feb 6 17:40:55 2015 +0100 Add:core:adjust_delta as separate function, modified logic Signed-off-by: mvglasow <michael -at- vonglasow.com> commit a66fe6b59cd39d9d67859fa37a9a9e9b4b0c1f3d Author: mvglasow <michael -at- vonglasow.com> Date: Fri Feb 6 16:35:38 2015 +0100 Fix:core:Further roundabout delta improvements Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 84f82a19f368a948034c9b9b6e842d7ec4acd02b Author: mvglasow <michael -at- vonglasow.com> Date: Fri Feb 6 15:48:22 2015 +0100 Fix:core:Fix bug in roundabout delta calculation Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 801d2a39038e5e961841201f26ade0b83b069b03 Author: mvglasow <michael -at- vonglasow.com> Date: Fri Feb 6 01:36:04 2015 +0100 Add:core:Add third algorithm for roundabout delta (not used yet) Signed-off-by: mvglasow <michael -at- vonglasow.com> commit eabce5c87640321edb6e35cd461363b78f86613f Author: mvglasow <michael -at- vonglasow.com> Date: Thu Feb 5 23:55:01 2015 +0100 Fix:core:Fix bug in roundabout angle calculation Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 86e37b3b3e59a87132d1098ceb2a5e1acd51b1a6 Author: mvglasow <michael -at- vonglasow.com> Date: Thu Feb 5 21:40:57 2015 +0100 Fix:core:Add missing space in certain turn instructions Signed-off-by: mvglasow <michael -at- vonglasow.com> commit c59a23cbee2e876f02a51e73c270195cf5222c89 Author: jandegr <jandegr@users.noreply.github.com> Date: Wed Feb 4 19:27:11 2015 +0100 revert zoombutton state commit db111c78f09f3d8daabd360d23fc96c96c41fdbb Author: jandegr <jandegr@users.noreply.github.com> Date: Wed Feb 4 10:12:41 2015 +0100 add rank to struct street_destination commit 6957607d4eaa1906e2cd0692c4fa8d8ed11d91df Author: jandegr <jandegr@users.noreply.github.com> Date: Wed Feb 4 10:06:22 2015 +0100 small speech for roundabout addition commit 732d6db21c1690d8bbc9910b71696aab531136d6 Author: jandegr <jandegr@users.noreply.github.com> Date: Wed Feb 4 10:00:35 2015 +0100 improce consistency of announced destinations commit a35fdcedae6d7c50922e3d9b8a4393214e57eeb3 Author: mvglasow <michael -at- vonglasow.com> Date: Tue Feb 3 23:31:42 2015 +0100 Fix:core:When examining roundabout approaches, stop at intersections Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 6aaf27dee1b9261ed8d1ef26b0f10f4fef2d8f2a Merge: 3b6df47 f5ad1ac Author: mvglasow <michael -at- vonglasow.com> Date: Tue Feb 3 23:25:04 2015 +0100 Merge branch 'highfive' of github.com:mvglasow/navit into highfive commit 3b6df47247a21f1692232e3b9501a63f302ef215 Author: mvglasow <michael -at- vonglasow.com> Date: Tue Feb 3 23:11:06 2015 +0100 Fix:core:Handle zero errors for roundabout delta estimates correctly Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 86c5dac994e2ae1610eb53a4a88a1a33b0b7e819 Author: mvglasow <michael -at- vonglasow.com> Date: Tue Feb 3 22:25:43 2015 +0100 Fix:core:Fix some special cases in navigation_way_get_max_delta| Also introduces a local variable for delta of approach segments Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 9ed40079d41eb7cf5e5368ffd440c2ae448813f7 Author: mvglasow <michael -at- vonglasow.com> Date: Mon Feb 2 22:04:10 2015 +0100 Fix:core:Make navigation_way_get_max_delta work for reversed ways| Also adds functionality to preserve sign of delta Signed-off-by: mvglasow <michael -at- vonglasow.com> commit eab4d5330faeb8c4270b888ab07aef1852b84d2f Author: mvglasow <michael -at- vonglasow.com> Date: Thu Jan 29 21:24:42 2015 +0100 Fix:core:improve error estinates when calculating roundabout delta Signed-off-by: mvglasow <michael -at- vonglasow.com> commit f5ad1ac1bff68901577c7e3acb788f0591b22237 Author: jandegr <jandegr@users.noreply.github.com> Date: Tue Jan 27 14:48:59 2015 +0100 cleanup and exit announcement mod. commit 52a596605f02654a7395e94ede4cdca884d52a13 Author: jandegr <jandegr@users.noreply.github.com> Date: Fri Jan 23 17:51:28 2015 +0100 speech rearrangement commit 45751536fad4aa5eb80b1457775c551485312ce2 Author: jandegr <jandegr@users.noreply.github.com> Date: Fri Jan 23 17:44:31 2015 +0100 temporary fix in command_new commit 20f2118dffe02f6caa7db599ac245826b5e77fb9 Author: jandegr <jandegr@users.noreply.github.com> Date: Mon Jan 19 15:35:15 2015 +0100 speech mod for 'at ....' commit 4636a04b2b6033e6a2b9fe15a2ad02efa13c8972 Author: jandegr <jandegr@users.noreply.github.com> Date: Mon Jan 19 15:06:35 2015 +0100 turnaround left/right icons commit bc7abfc4bac217f53b367c8db23af455a5b6410f Author: jandegr <jandegr@users.noreply.github.com> Date: Mon Jan 19 14:08:48 2015 +0100 improve translatability commit 4d0a33b3259a472f9a37f080cdc0833953420e3e Author: jandegr <jandegr@users.noreply.github.com> Date: Mon Jan 19 13:44:03 2015 +0100 new nav icons and some cleanup commit 10d07462ccdd7ca8ad24116f5aee924c13bbe765 Author: mvglasow <michael -at- vonglasow.com> Date: Sun Jan 18 22:44:02 2015 +0100 Fix:core:Partial revert of 608a95 (HEAD~3)| Restore previous error formula for roundabout delta detection based on bearings before and after Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 463d812f28d38c13d152247f47cc76a985e6e4b6 Author: mvglasow <michael -at- vonglasow.com> Date: Sat Jan 17 01:36:42 2015 +0100 Fix:core:Examine at least one segment before and after roundabout Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 17f27eba7f72df6a88018f78c7b249e30b616b41 Author: mvglasow <michael -at- vonglasow.com> Date: Fri Jan 16 23:26:21 2015 +0100 Fix:core:Stop examining roundabout approaches at intersections or ramp end Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 608a95abf2b6d94363528c257c3ec21db87689ae Author: mvglasow <michael -at- vonglasow.com> Date: Fri Jan 16 22:57:55 2015 +0100 Fix:core:Tweak formula for roundabout angle detection Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 37ac64079bb142f90f6cee9db821d097542a753a Author: mvglasow <michael -at- vonglasow.com> Date: Fri Jan 16 00:35:11 2015 +0100 Fix:core:Fix some bugs in roundabout angle detection Signed-off-by: mvglasow <michael -at- vonglasow.com> commit c353cecbce52a93410778925a65bc1b37f7c9b2d Merge: ee360ec 8b0a1e3 Author: mvglasow <michael -at- vonglasow.com> Date: Thu Jan 15 00:22:39 2015 +0100 Merge branch 'highfive' of github.com:mvglasow/navit into highfive commit ee360ec8a18648adf4de5c34f994f81efe6b1bb7 Author: mvglasow <michael -at- vonglasow.com> Date: Wed Jan 14 22:50:59 2015 +0100 Fix:core:Refine criteria for announcing road splits| Don't announce road splits if the alternative is just a ramp or service road, unless the road also continues on one of these types Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 8b0a1e37540085e8be4947150c9245574e8f0e0f Author: jandegr <jandegr@users.noreply.github.com> Date: Wed Jan 14 19:00:29 2015 +0100 small fix for attr_name commit a76240dbd30333265034d7115a4fbeec8e31c7cf Author: jandegr <jandegr@users.noreply.github.com> Date: Wed Jan 14 11:34:12 2015 +0100 add attr's for destination forward and backward commit b42ed3c7991b0a191a4c3d11a7d6d278d6fefe3a Author: jandegr <jandegr@users.noreply.github.com> Date: Wed Jan 14 11:31:37 2015 +0100 add destination forwad and backward commit eb358043b5dfb79b92ed3c67a7693df6789b6c4c Author: jandegr <jandegr@users.noreply.github.com> Date: Wed Jan 14 11:29:19 2015 +0100 small addition of prev. commit commit 80adbd48f3e81c26af870354cb23daae914f560b Author: jandegr <jandegr@users.noreply.github.com> Date: Wed Jan 14 11:13:25 2015 +0100 new attr (navigation.item[..].name) for OSD usage navigation.item[..].name : attr_name returns exit_ref and exit_label if available preceeded by the word 'exit' if exit_label alone is available, it returns the word 'interchange' followed by exit_label otherwise returns street name and name_systematic if available FIXME should a new attr. be defined for this and if yes, which ? commit 0c9c7f24e2aab0450d847bdee7c062acb6239b1a Author: mvglasow <michael -at- vonglasow.com> Date: Tue Jan 13 23:52:04 2015 +0100 Refactoring:core:Remove redundant condition in maneuver_required2() Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 9246a7eb44d54ae7d6bbbd3cdd054cdadf1e75bb Author: mvglasow <michael -at- vonglasow.com> Date: Tue Jan 13 23:23:37 2015 +0100 Fix:core:Fix some missing announcements at road splits Signed-off-by: mvglasow <michael -at- vonglasow.com> commit f0cb0e05f42b7d6a7c6252b55fc5cadff6770689 Author: jandegr <jandegr@users.noreply.github.com> Date: Mon Jan 12 20:10:45 2015 +0100 first draft of translators comments commit 6ed55e565abecb023503c0bead987609761dac1b Author: jandegr <jandegr@users.noreply.github.com> Date: Mon Jan 12 18:06:24 2015 +0100 fix an issue with exit_to first step in fixing an issue with exit_to in case there can be more than one ramp targetted by exit_to commit 864b520753a2d4367c81180fe504789b36b94f9f Author: mvglasow <michael -at- vonglasow.com> Date: Sun Jan 11 17:35:02 2015 +0100 Fix:core:Handle duplicate ways on the route more gracefully Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 7169ccb6f00f96265e3f5e879309a41b00996a15 Author: mvglasow <michael -at- vonglasow.com> Date: Sun Jan 11 15:49:40 2015 +0100 Fix:core:change handling of certain broken roundabouts Signed-off-by: mvglasow <michael -at- vonglasow.com> commit b3c14561b2f4f76883e2e259e5ccbaeb28fd8695 Merge: 68dd137 2eb7848 Author: mvglasow <michael -at- vonglasow.com> Date: Sun Jan 11 15:46:57 2015 +0100 Merge branch 'highfive' of github.com:mvglasow/navit into highfive commit 68dd13715bbc6456c7ff1889b0e19e93cfabe008 Author: mvglasow <michael -at- vonglasow.com> Date: Sun Jan 11 14:45:43 2015 +0100 Fix:core:Use weighted average for angle calculation of roundabouts Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 7e69d7c7394297bfc79110bc9e15651f8e1d5cfc Author: mvglasow <michael -at- vonglasow.com> Date: Sun Jan 11 14:22:43 2015 +0100 Refactoring:core:Document transform_get_angle_delta Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 4d2c98e0e533a420b0ae87c4b34780415cd8902e Author: mvglasow <michael -at- vonglasow.com> Date: Fri Jan 9 22:16:13 2015 +0100 Fix:core:Improve angle calculation of roundabouts| Uses a hybrid of pre-r2017 and r2017, so far without considering confidence Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 2eb7848c1e92f3a92cdd0a73ea1afbba9130765a Author: Robotaxi <robotaxi@arcor.de> Date: Fri Jan 9 17:06:49 2015 +0100 suffix addition for german commit 6518f33e1bc25f3d5fe554a40d5ee04d3309be39 Author: jandegr <jandegr@users.noreply.github.com> Date: Fri Jan 9 15:27:12 2015 +0100 speech rework add destination to roundabout exits start to fix indents some small fixes commit 521b0448dcbd4b8a8500d18f18230920311a625f Author: jandegr <jandegr@users.noreply.github.com> Date: Thu Jan 8 14:35:36 2015 +0100 speech : addition for interchange commit 46c1105fbadb5e84283e70673c3653a4ee58af70 Author: jandegr <jandegr@users.noreply.github.com> Date: Thu Jan 8 14:32:45 2015 +0100 document known issues commit d6db9d048956b29c7fb016f0a1f61e34372f54dc Author: jandegr <jandegr@users.noreply.github.com> Date: Wed Jan 7 14:20:10 2015 +0100 small fix for type_nav_right_1 in speech commit f109a8f21ace066f9f5a0eb0963899d70cdc629f Author: jandegr <jandegr@users.noreply.github.com> Date: Wed Jan 7 12:40:19 2015 +0100 speech rework commit 99443cdcf054633464ed9d140f98dcaacd9c8e0f Author: jandegr <jandegr@users.noreply.github.com> Date: Wed Jan 7 08:23:49 2015 +0100 remove french suffixes commit a49b0057a31d6c0634342ee748e47c35c1660e5a Author: jandegr <jandegr@users.noreply.github.com> Date: Wed Jan 7 08:21:04 2015 +0100 comment for is_way_allowed() commit 6155beb5ecaf9e5937a06f8ebdbd147d665a9687 Merge: b9cde98 37bd0df Author: mvglasow <michael -at- vonglasow.com> Date: Sun Jan 4 00:51:04 2015 +0100 Merge branch 'highfive' of github.com:mvglasow/navit into highfive commit b9cde983547fd22ce3859be06ede5bff9863c1be Author: mvglasow <michael -at- vonglasow.com> Date: Sun Jan 4 00:50:57 2015 +0100 Fix:core:Fix some incorrect announcements at roundabouts Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 37bd0dff08b73f41aa76af462476b704b0366c3e Author: Robotaxi <robotaxi@arcor.de> Date: Fri Jan 2 14:24:23 2015 +0100 added destination references of motorway links commit bdae78bd2421ab1aca48087034bad28b042d3b86 Author: Robotaxi <robotaxi@arcor.de> Date: Fri Jan 2 13:03:03 2015 +0100 Fixed announcement of 'street name systematic' Especially for destinations on motorway links. Contains getting the right attributes. commit 7765799e07ebbe49d55b1b5ab08a92cfe5036c43 Author: mvglasow <michael -at- vonglasow.com> Date: Thu Jan 1 20:00:04 2015 +0100 Fix:core:Tweak criteria for keep right/keep left maneuvers Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 6866f6166c751cda788ec754a9a31a98decb2913 Author: mvglasow <michael -at- vonglasow.com> Date: Tue Dec 30 15:04:26 2014 +0100 Fix:core:Suppress exit maneuver at end of motorway Signed-off-by: mvglasow <michael -at- vonglasow.com> commit a3c54f16f9ce7c99bcaf334ceb4740a6174dd568 Author: Robotaxi <robotaxi@arcor.de> Date: Mon Dec 29 15:24:54 2014 +0100 Added translations of new phrases. First version to be in sync with navigation.c commit c852db721e5238da25b080f100aad2412aecaf81 Author: Robotaxi <robotaxi@arcor.de> Date: Mon Dec 29 15:03:47 2014 +0100 Took up new phrases into translation files commit 54ae3113a54ee41fd7173f57c94512687259c554 Author: Robotaxi <robotaxi@arcor.de> Date: Tue Dec 23 08:32:11 2014 +0100 Rename nav_exit_right_wh .svg to nav_exit_right_wh.svg commit e6524ff3538d3737a7a0d88c7bfbb6ac46b896db Author: Robotaxi <robotaxi@arcor.de> Date: Tue Dec 23 08:31:07 2014 +0100 Rename nav_exit_left_wh .svg to nav_exit_left_wh.svg commit 377e99858a6fe0e6be7167aba28f154721d015ea Author: jandegr <jandegr@users.noreply.github.com> Date: Sat Dec 20 15:09:54 2014 +0100 note on a bug in navigation_itm_new (exit_to info) commit f437b6fabfa5900cd4da7094643ded397b2eb53c Author: jandegr <jandegr@users.noreply.github.com> Date: Thu Dec 18 20:51:02 2014 +0100 comments commit 2318b4816f86c99a130fdb6384da0e07c155ad97 Author: jandegr <jandegr@users.noreply.github.com> Date: Wed Dec 17 17:30:02 2014 +0100 follow-up on#1250 and some small fixes commit 227b92a6a84c8ec2dc6b2777aef40be43fe45231 Author: jandegr <jandegr@users.noreply.github.com> Date: Wed Dec 17 13:31:23 2014 +0100 a few small fixes commit 43f361b60bc8abf8ec3262182a33d1a52028cd53 Author: jandegr <jandegr@users.noreply.github.com> Date: Wed Dec 17 13:12:00 2014 +0100 navigation_tim_new cleanup commit 7064cc5da5306a2da77fda1283aa0a9ee9e289d1 Author: jandegr <jandegr@users.noreply.github.com> Date: Sun Dec 14 17:36:48 2014 +0100 convert exit info convert exit_ref and exit_label into separate properties of way. They are not(yet) available as attr's for the OSD commit dc8513011e83a03c0ad283eb6cf848948d9433b0 Author: mvglasow <michael -at- vonglasow.com> Date: Sat Dec 13 22:01:50 2014 +0100 Refactoring:core:remove no longer needed debug levels from mavigation.c Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 1612d2ffbfc8911d5b584fb217404810c5bdb895 Merge: 99ea106 24ecb57 Author: mvglasow <michael -at- vonglasow.com> Date: Sat Dec 13 21:54:56 2014 +0100 Merge branch 'highfive' of github.com:mvglasow/navit into highfive commit 99ea106461927c990cf169fdd2ee3cf9e51b25de Author: mvglasow <michael -at- vonglasow.com> Date: Sat Dec 13 21:53:06 2014 +0100 Fix:core:Don't crash on broken roundabouts Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 24ecb572b2482e290b15e5f003bfc178e617abee Author: jandegr <jandegr@users.noreply.github.com> Date: Sat Dec 13 19:37:58 2014 +0100 speech improvement for exit and interchange commit 10e0c783c85662cf92411496507c106929297518 Author: jandegr <jandegr@users.noreply.github.com> Date: Sat Dec 13 19:34:54 2014 +0100 speech improvement commit a19a7f3c1c571758fa32a474fa907ee118d2135b Author: mvglasow <michael -at- vonglasow.com> Date: Sat Dec 13 19:33:04 2014 +0100 Fix:core:Prevent misinterpreting roundabouts as regular turns Signed-off-by: mvglasow <michael -at- vonglasow.com> commit a4d259ed9714f2b1c5d71acf81b6189ac8192c0b Author: mvglasow <michael -at- vonglasow.com> Date: Sat Dec 13 18:25:09 2014 +0100 Refactoring:core:Set maneuver type in command_new(), constants for turns Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 374da752483bde530d04ff9d6c5d866567997361 Merge: 58c7435 3f78e6d Author: mvglasow <michael -at- vonglasow.com> Date: Sat Dec 13 15:20:42 2014 +0100 Merge branch 'highfive' of github.com:mvglasow/navit into highfive commit 58c74358664f7573c216bfc1e56f2c5c6d8c08af Author: mvglasow <michael -at- vonglasow.com> Date: Sat Dec 13 15:00:37 2014 +0100 Fix:core:Use oneway flags to detect complex T junctions| Removes workaround for a now-fixed bug regarding way flags Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 3f78e6d0d7391b6d6b93d0f9bd683a93a1925058 Author: jandegr <jandegr@users.noreply.github.com> Date: Sat Dec 13 13:44:56 2014 +0100 speech improvement for 'continue straight' Merge a variation of Kazer's 'Continue straight' patch, more cases left to solve later commit e5521ca2bbf0ce66ae8ea542d35d1b61aabd15d6 Author: jandegr <jandegr@users.noreply.github.com> Date: Sat Dec 13 12:17:54 2014 +0100 comment on 'ref' update commit 19aff3ab93b298381c00618b5e08ea9281fcb11f Author: mvglasow <michael -at- vonglasow.com> Date: Fri Dec 12 23:42:51 2014 +0100 Refactoring:core:Move delta into navigation_maneuver Signed-off-by: mvglasow <michael -at- vonglasow.com> commit f3134c0f78267645d4bd4e8cd01022d6a8c11485 Merge: 1b8bad7 57ec97f Author: mvglasow <michael -at- vonglasow.com> Date: Fri Dec 12 22:22:33 2014 +0100 Merge branch 'highfive' of github.com:mvglasow/navit into highfive commit 1b8bad7e444a71d34ad686dc2d626084606c39c4 Merge: 1e803e7 8eb4cd5 Author: mvglasow <michael -at- vonglasow.com> Date: Fri Dec 12 22:22:22 2014 +0100 Merge branch 'master' into highfive Conflicts: navit/navit/attr_def.h navit/navit/binding/dbus/binding_dbus.c navit/navit/navigation.c Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 57ec97fea9b4f5477cd80d03099bce1402119abc Author: jandegr <jandegr@users.noreply.github.com> Date: Fri Dec 12 15:13:09 2014 +0100 one more speech test (keep left/right, ..interchange) commit 5cebd8d838a2cfa867ab32cd097a424a113da705 Author: jandegr <jandegr@users.noreply.github.com> Date: Fri Dec 12 09:07:53 2014 +0100 fix for exit speech commit 1e803e7a69023ca5f7bc34f6d9848973b7c4758a Author: jandegr <jandegr@users.noreply.github.com> Date: Thu Dec 11 20:59:46 2014 +0100 remove commented-out string commit 78b0f9102c49b953615777adfb7321387820243f Author: jandegr <jandegr@users.noreply.github.com> Date: Thu Dec 11 20:29:59 2014 +0100 small change for speech of turn.... destination commit 07865edd4366d2fa1bb0029f50dadb0cd8df62af Author: jandegr <jandegr@users.noreply.github.com> Date: Thu Dec 11 18:49:32 2014 +0100 some speech for announcing an exit commit 1f4c3396c0a7dc83c1e8ebb0f8d30eb552da463f Author: jandegr <jandegr@users.noreply.github.com> Date: Wed Dec 10 17:21:15 2014 +0100 comments cleanup commit 6d5bf3163335371a342359352661dcf8f40f1445 Author: jandegr <jandegr@users.noreply.github.com> Date: Wed Dec 10 17:03:53 2014 +0100 small change for speech of 'merge' commit 41f24735657f8f3e3dd591cc0dbe37c950353576 Author: jandegr <jandegr@users.noreply.github.com> Date: Wed Dec 10 16:54:22 2014 +0100 first rudimentary speech of destination commit 18164b1829d2933dcf9c7d92b09c52aedf3b04d7 Author: jandegr <jandegr@users.noreply.github.com> Date: Tue Dec 9 21:09:29 2014 +0100 comment for speech direction commit 35fcd83a87a9459fd25fe5af4b88b1df55d57e92 Author: jandegr <jandegr@users.noreply.github.com> Date: Tue Dec 9 20:10:57 2014 +0100 some comment on strength_needed commit 50b5b400ad934b16953a526192af7939935e4836 Author: jandegr <jandegr@users.noreply.github.com> Date: Mon Dec 8 08:36:53 2014 +0100 missing pieces for destination commit c9db9f9fd17bc070a2897d10edbfc0ec29bf9db9 Merge: 34a1467 fc4fead Author: mvglasow <michael -at- vonglasow.com> Date: Sun Dec 7 22:56:20 2014 +0100 Merge branch 'highfive' of github.com:mvglasow/navit into highfive commit 34a146732dd0cb71e88b2cec1700baa0f242efdb Author: mvglasow <michael -at- vonglasow.com> Date: Sun Dec 7 22:42:52 2014 +0100 Refactoring:core:drop unused check_roundabout Signed-off-by: mvglasow <michael -at- vonglasow.com> commit b3dfe35a5260eaab3d55a8bc7a247f0653cf9cae Author: mvglasow <michael -at- vonglasow.com> Date: Sun Dec 7 22:29:54 2014 +0100 Refactoring:core:set flags directly in navigation_item_new() Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 284a826f7c8ef7c875cd83b86310ebbcec949e0f Author: mvglasow <michael -at- vonglasow.com> Date: Sun Dec 7 21:33:22 2014 +0100 Refactoring:core:navigation_way_init Signed-off-by: mvglasow <michael -at- vonglasow.com> commit fc4fead0fc32bb3e5b29e578e26bc407e262a85f Author: jandegr <jandegr@users.noreply.github.com> Date: Sun Dec 7 20:51:10 2014 +0100 transform exit_to info into destination info commit e0e864b411c757f415983c65884922803103ecf6 Author: jandegr <jandegr@users.noreply.github.com> Date: Sun Dec 7 20:43:21 2014 +0100 upd. navigation_itm_new for destination commit 086142f97839096bf7f73374213fcb8b6a6d2445 Author: jandegr <jandegr@users.noreply.github.com> Date: Sun Dec 7 20:37:14 2014 +0100 map_item_attr_get mod. for destination commit 4208d9adb44cbc4702e03413db5bb016c3fb0c88 Author: jandegr <jandegr@users.noreply.github.com> Date: Sun Dec 7 20:32:40 2014 +0100 merge select_announced_destinations from #1082 merge select_announced_destinations from #1082 by Robotaxi, with slight renaming of variables commit 6ab6c4044532cdf692e1ace5706bfe398704ba5d Author: jandegr <jandegr@users.noreply.github.com> Date: Sun Dec 7 20:28:45 2014 +0100 merge free_list and split_string_to_list for destination commit b9fea0019c36e1750d8387e55607aa67e7285f41 Author: mvglasow <michael -at- vonglasow.com> Date: Sun Dec 7 17:52:28 2014 +0100 Fix:core:set flags for ways on the route Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 84867cfbaf2ccfcd19bfeb0cad6c9b3727929adb Author: mvglasow <michael -at- vonglasow.com> Date: Sun Dec 7 16:06:34 2014 +0100 Add:core:Don't count service roads towards num_other_ways Signed-off-by: mvglasow <michael -at- vonglasow.com> commit db80f784a618ffc9b4dae37f41b8ce4270207a3a Author: mvglasow <michael -at- vonglasow.com> Date: Sun Dec 7 15:56:46 2014 +0100 Fix:core:fix typo in is_motorway_like() Signed-off-by: mvglasow <michael -at- vonglasow.com> commit d1aaaa56f23d156fe1041d2a4c00e3028d3481c7 Author: mvglasow <michael -at- vonglasow.com> Date: Sun Dec 7 15:45:02 2014 +0100 Fix:core:count motorway direction change maneuvers as exit Signed-off-by: mvglasow <michael -at- vonglasow.com> commit f3117db8e3dbdab58eebf97ca7dcf3043357d5e1 Author: mvglasow <michael -at- vonglasow.com> Date: Sun Dec 7 14:59:10 2014 +0100 Add:core:Update definition of motorway-like| Parameter to decide how to treat ramps Service roads are equivalent to ramps Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 8153d8599be01d85dcc85fd3acdb1cc0eaec0f66 Author: mvglasow <michael -at- vonglasow.com> Date: Sun Dec 7 00:30:38 2014 +0100 Refactoring:core:Pass navigation_maneuver for destination Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 3b7d57df62ff8f453d8d361e2a9355fa404697f5 Author: mvglasow <michael -at- vonglasow.com> Date: Sat Dec 6 22:08:38 2014 +0100 Add:core:Add support for keep right/left and new maneuver type logic Signed-off-by: mvglasow <michael -at- vonglasow.com> commit ead8e44142124695666ef9183c59c6cf2f5bc6e0 Author: mvglasow <michael -at- vonglasow.com> Date: Sat Dec 6 16:22:10 2014 +0100 Add:core:change semantic meaning of left and right in navigation_maneuver| Now refers to left and right neighbors of the route, not "straightest" ways Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 9c39d8d5a2968eaf619555fe8c98bfb1b986bebe Author: mvglasow <michael -at- vonglasow.com> Date: Sat Dec 6 15:52:44 2014 +0100 Add:core:Add maneuvers for keep left, keep right Signed-off-by: mvglasow <michael -at- vonglasow.com> commit ed241767849e0bd6338ed821fd4e32cb50421ade Author: mvglasow <michael -at- vonglasow.com> Date: Fri Dec 5 20:58:53 2014 +0100 Add:core:Complete handling of merge_or_exit Signed-off-by: mvglasow <michael -at- vonglasow.com> commit ccac6572556caf5e447d695daa14482f9568252b Author: mvglasow <michael -at- vonglasow.com> Date: Fri Dec 5 18:37:06 2014 +0100 Refactoring:core:make sense of local variables in maneuver_required2() Signed-off-by: mvglasow <michael -at- vonglasow.com> commit a1a9ca7e130ada55207882aa820d57e7a4828b15 Author: mvglasow <michael -at- vonglasow.com> Date: Fri Dec 5 18:17:35 2014 +0100 Add:core:Detect motorway interchanges Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 30341edc13269cc8e8a1f256a6a3b942178cebaf Author: jandegr <jandegr@users.noreply.github.com> Date: Wed Dec 3 15:11:49 2014 +0100 more cleanup of navigation_itm_new() commit 908e97af08f7733475d28e2ce4b7925ee21f4e8f Author: jandegr <jandegr@users.noreply.github.com> Date: Tue Dec 2 17:03:57 2014 +0100 remove outdated comments commit 5bb31c8974abc4c57c671f0fff8b7a9b504eb32b Author: jandegr <jandegr@users.noreply.github.com> Date: Tue Dec 2 16:47:36 2014 +0100 improve the collection of coordinates in navigation_itm_new commit 6a6ee3908495e13e37fa532018383e31abb21cae Author: jandegr <jandegr@users.noreply.github.com> Date: Mon Dec 1 10:03:27 2014 +0100 reduce noise and use the new log levels commit 5a5c6f4c3d59df21539b053780c71835b8d53553 Author: jandegr <jandegr@users.noreply.github.com> Date: Mon Dec 1 09:55:02 2014 +0100 Comments : update and cleanup commit b9d6106183579c6a0d183121be204dd9bb9379d8 Author: jandegr <jandegr@users.noreply.github.com> Date: Mon Dec 1 09:44:33 2014 +0100 remove leftovers from string-type lanes, even if lanes comes back some day it will never be as a string again, so removal of those remains is appropriate. commit 8f9973b48351e2ea2432ba076fe429eeec576ce2 Author: jandegr <jandegr@users.noreply.github.com> Date: Mon Dec 1 08:09:20 2014 +0100 navigation.c remove noisy dbg line commit 6e605ccb4b814e5a326f91a4fc0fd0c69c848cb7 Author: jandegr <jandegr@users.noreply.github.com> Date: Mon Dec 1 08:00:06 2014 +0100 navigation.c remove noisy dbg line and free way.destination commit 3c0ccd8910be5fe0a99548db52606b3b82d13ffa Author: jandegr <jandegr@users.noreply.github.com> Date: Mon Dec 1 07:57:07 2014 +0100 remove some outdated comments in navigation.c commit d2d2d8922ee9e996d5efd1724a20fec113ca6ac9 Author: jandegr <jandegr@users.noreply.github.com> Date: Mon Dec 1 07:53:02 2014 +0100 fix one occurence of attr_destination it is attr_street_destination, but in one place early on an attr_destination was left behind in a piece of code. commit 25da044ecb7dbd332d0db1ab53e7b4074f82b68e Author: mvglasow <michael -at- vonglasow.com> Date: Sat Nov 29 22:41:20 2014 +0100 Fix:core:Eliminate some compiler warnings Signed-off-by: mvglasow <michael -at- vonglasow.com> commit aec0cd15587abc1493bf86b472f02a241cdf0948 Author: mvglasow <michael -at- vonglasow.com> Date: Sat Nov 29 22:25:41 2014 +0100 Refactoring:core:Remove unused navigation_way.lanes Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 960dc90f2839f5249c58b5638353135c363b6cec Author: mvglasow <michael -at- vonglasow.com> Date: Sat Nov 29 22:19:01 2014 +0100 Fix:core:Ensure proper freeing of navigation_way.destination Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 70d9c7f1366a32fcab2aa71ed2c7c65bd112f799 Author: mvglasow <michael -at- vonglasow.com> Date: Sat Nov 29 22:15:03 2014 +0100 Fix:core:Free name_systematic member of navigation_way properly Signed-off-by: mvglasow <michael -at- vonglasow.com> commit d6b0a643c54a0984efbcca0db06fec2a466fefcb Author: mvglasow <michael -at- vonglasow.com> Date: Sat Nov 29 21:50:43 2014 +0100 Fix:core:Fix typo in calculate_entry_angle() Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 16b13853ab3f4c2416ccc1e2ca3e663523e0ac28 Author: mvglasow <michael -at- vonglasow.com> Date: Sat Nov 29 21:49:41 2014 +0100 Fix:core:Free navigation_maneuver along with its navigation_cmd Signed-off-by: mvglasow <michael -at- vonglasow.com> commit a48d84498d3a9af558bf74ff0839be3d159b0ebe Author: mvglasow <michael -at- vonglasow.com> Date: Sat Nov 29 18:20:22 2014 +0100 Add:core:introduce mex_interchange and use is_motorway_like() consistently Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 525b4785006bcc90296cd45dd75566f4bb854cc8 Author: mvglasow <michael -at- vonglasow.com> Date: Sat Nov 29 16:21:34 2014 +0100 Refactoring:core:Update documentation for navigation_maneuver Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 661d50743e0190abfa87cd55cbcbb2082c18ed3a Author: mvglasow <michael -at- vonglasow.com> Date: Sat Nov 29 16:18:58 2014 +0100 Fix:core:Improve detection of motorway interchanges Signed-off-by: mvglasow <michael -at- vonglasow.com> git-svn-id: svn://svn.code.sf.net/p/navit/code/trunk@5935 ffa7fe5e-494d-0410-b361-a75ebd5db220 Conflicts: navit/navit/navigation.c commit 50f19c27d465d3adf9fc0b3704ec60bebfeba1a9 Author: mvglasow <michael -at- vonglasow.com> Date: Sat Nov 29 16:14:38 2014 +0100 Fix:core:Eliminate more superfluous maneuvers at ramps|Should fix #660 Signed-off-by: mvglasow <michael -at- vonglasow.com> git-svn-id: svn://svn.code.sf.net/p/navit/code/trunk@5934 ffa7fe5e-494d-0410-b361-a75ebd5db220 Conflicts: navit/navit/navigation.c commit 1741aa54b6eaab09b2eef1d188a2d1b9bba63c17 Author: mvglasow <michael -at- vonglasow.com> Date: Sat Nov 29 16:07:46 2014 +0100 Fix:core:Announce turns when going straight is not allowed | One step closer to fixing #660, thanks jandegr and tryagain Signed-off-by: mvglasow <michael -at- vonglasow.com> git-svn-id: svn://svn.code.sf.net/p/navit/code/trunk@5933 ffa7fe5e-494d-0410-b361-a75ebd5db220 Conflicts: navit/navit/navigation.c commit 2636d0f37d12d8bea5652c1bd55dc0f79618a732 Author: mvglasow <mvglasow@ffa7fe5e-494d-0410-b361-a75ebd5db220> Date: Sun Nov 9 01:38:42 2014 +0000 Fix:core:use curve_limit throughout maneuver_required2 Signed-off-by: mvglasow <michael -at- vonglasow.com> git-svn-id: svn://svn.code.sf.net/p/navit/code/trunk@5932 ffa7fe5e-494d-0410-b361-a75ebd5db220 commit bda0e51ddf76c06f7161de387dd7fa0a0072b6a5 Author: mvglasow <michael -at- vonglasow.com> Date: Sat Nov 29 15:54:20 2014 +0100 Fix:core:Refine criteria for announcing maneuvers|Partial fix for #660 Signed-off-by: mvglasow <michael -at- vonglasow.com> git-svn-id: svn://svn.code.sf.net/p/navit/code/trunk@5929 ffa7fe5e-494d-0410-b361-a75ebd5db220 Conflicts: navit/navit/navigation.c commit d94cf5a39504372ed63d53aa4a624993cc528f55 Author: mvglasow <mvglasow@ffa7fe5e-494d-0410-b361-a75ebd5db220> Date: Sun Nov 9 21:28:51 2014 +0000 Add:dbus:Include maneuver type in GPS export Signed-off-by: mvglasow <michael -at- vonglasow.com> git-svn-id: svn://svn.code.sf.net/p/navit/code/trunk@5938 ffa7fe5e-494d-0410-b361-a75ebd5db220 commit 98b9703e5c539b7664ed323ce09a3b4e0ae3ceaa Author: mvglasow <michael -at- vonglasow.com> Date: Sat Nov 29 02:16:33 2014 +0100 Fix:core:Comment out references to removed attr_street_lanes Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 542d581200077b9b01fac115cc67a10282b6f093 Author: mvglasow <michael -at- vonglasow.com> Date: Sat Nov 29 02:16:20 2014 +0100 Fix:maptool:Comment out references to removed attr_street_lanes Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 6e6bc2d31973c32918f0dfdd8cd74b17eeb3a5c9 Merge: 2a31691 c19dbff Author: mvglasow <michael -at- vonglasow.com> Date: Sat Nov 29 01:52:16 2014 +0100 Merge branch 'highfive' of github.com:mvglasow/navit into highfive commit 2a316914d25ab8f41791738723e1e104acb4feba Author: mvglasow <michael -at- vonglasow.com> Date: Sat Nov 29 00:31:29 2014 +0100 Add:core:Struct to store results of maneuver_required2 Signed-off-by: mvglasow <michael -at- vonglasow.com> commit c19dbff1e79eb4c08ef6f0a0967520d3c81497a4 Author: jandegr <jandegr@users.noreply.github.com> Date: Fri Nov 28 21:28:58 2014 +0100 Update osm.c remove attr_string_street_lanes commit 0d722010beedf40b78379d0768b9384ebd9ab182 Author: jandegr <jandegr@users.noreply.github.com> Date: Fri Nov 28 21:24:14 2014 +0100 Update osm.c reduce lanes to an empty holder as in Navit SF trunk commit 00307d9c885d98b49221cf7318adb5282e91feac Author: jandegr <jandegr@users.noreply.github.com> Date: Fri Nov 28 20:39:29 2014 +0100 Update osm.c add street_name_systematic_int commit f8912c108967ccd0452405ade892ba5ce3180e63 Author: jandegr <jandegr@users.noreply.github.com> Date: Fri Nov 28 20:10:31 2014 +0100 Update item_def.h remove ITEM(nav_exit) since it leads to the same icon as the one for ITEM(nav_exit_right) commit 0075af0130bc97f66a33c70082758eedf7a67449 Author: jandegr <jandegr@users.noreply.github.com> Date: Fri Nov 28 19:34:05 2014 +0100 Update navigation.c remove lanes commit 7af1f951a3de371885f592cb5c3e4eb993c9b3ac Author: jandegr <jandegr@users.noreply.github.com> Date: Fri Nov 28 19:30:06 2014 +0100 Update attr_def.h remove lanes attr. commit a7cad98e87ea92f3000cfb35a740ea07d343a99a Author: mvglasow <michael -at- vonglasow.com> Date: Mon Nov 24 22:03:10 2014 +0100 Add:core:Add preliminary icons for new maneuver types|By jandegr Signed-off-by: mvglasow <michael -at- vonglasow.com> commit b80da97e6c0cdca177f9cf2059fbb2b982b568d2 Author: mvglasow <michael -at- vonglasow.com> Date: Mon Nov 24 22:02:43 2014 +0100 Add:core:Add items for new maneuver types|By jandegr Signed-off-by: mvglasow <michael -at- vonglasow.com> commit ba9817221a5d4694e2a3d97caadb58f084384fa6 Author: mvglasow <michael -at- vonglasow.com> Date: Mon Nov 24 22:02:19 2014 +0100 Add:tools:Add support for new street attributes in maptool|By jandegr Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 0e58c92ac6485a7c43716fc0570dd45d932783ca Author: mvglasow <michael -at- vonglasow.com> Date: Mon Nov 24 22:00:59 2014 +0100 Add:core:Add extra attributes for ways|By jandegr Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 34b9168622f350e529c657afa7bd108ade67750a Author: mvglasow <michael -at- vonglasow.com> Date: Sun Nov 23 21:44:45 2014 +0100 Refactoring:core:allow navigation.c to use new (r5960+) logging syntax Signed-off-by: mvglasow <michael -at- vonglasow.com> commit 70bccee933a18b70e449224fb3ff5cf498d46b38 Author: mvglasow <michael -at- vonglasow.com> Date: Sat Nov 22 20:26:53 2014 +0100 Add:core:Commit jandegr's updated navigation.c Signed-off-by: mvglasow <michael -at- vonglasow.com> git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6090 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'po/gl.po.in')
-rw-r--r--po/gl.po.in241
1 files changed, 184 insertions, 57 deletions
diff --git a/po/gl.po.in b/po/gl.po.in
index 1d36677d..376d1d0a 100644
--- a/po/gl.po.in
+++ b/po/gl.po.in
@@ -6,19 +6,19 @@
# Miguel Anxo Bouzada https://launchpad.net/~mbouzada
# Xosé https://launchpad.net/~ubuntu-galizaweb
# andreout https://launchpad.net/~andre-outeiro
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:42+0000\n"
"Last-Translator: andreout <andre@outeiro.com>\n"
"Language-Team: Galician <gl@li.org>\n"
+"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Language: gl\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -136,30 +136,53 @@ msgid_plural "in %d kilometers"
msgstr[0] "nun quilómetro"
msgstr[1] "en %d quilómetros"
-msgid "exit"
-msgstr "saída"
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name
+#, c-format
+msgid "%1$sonto the %2$s%3$s%4$s"
+msgstr ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
+#, c-format
+msgid "%1$sonto %2$s|masculine form"
+msgstr ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
+#, c-format
+msgid "%1$sonto %2$s|feminine form"
+msgstr ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
+#, c-format
+msgid "%1$sonto %2$s|neuter form"
+msgstr ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "na rampa"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr "%s na rúa %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%s no %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%s na %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%s no %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -167,57 +190,134 @@ msgstr "%s no %s%s%s"
msgid "%sinto the %s"
msgstr "%s na %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "á dereita"
+msgid "When possible, please turn around"
+msgstr "Cando sexa posible, dea a volta"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "á esquerda"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "suavemente "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Siga a estrada durante os próximos %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "bruscamente "
+msgid "Enter the roundabout soon"
+msgstr "Métase pronto na rotonda"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
+#, c-format
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr "logo saia da rotonda pola %1$s %2$s"
+
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
+#, c-format
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr "Saia da rotonda pola %1$s %2$s"
+
+msgid "soon"
+msgstr "cedo"
+
+msgid "now"
+msgstr "agora"
+
+msgid "then"
+msgstr "logo"
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
+#, c-format
+msgid "then merge%1$s|right"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "Cando sexa posible, dea a volta"
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
+#, c-format
+msgid "Merge %1$s%2$s|right"
+msgstr ""
-msgid "Enter the roundabout soon"
-msgstr "Métase pronto na rotonda"
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
+#, c-format
+msgid "then merge%1$s|left"
+msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
+
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
msgstr ""
+#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance
#, c-format
-msgid "then leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr "Tome a saida %1$s %2$s %3$s"
+
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
+#, c-format
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr "Tome a saida %1$s %2$s%3$s"
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then continue straight%1$s"
msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Siga a estrada durante os próximos %s"
+msgid "Continue straight %1$s%2$s%3$s"
+msgstr ""
-msgid "soon"
-msgstr "cedo"
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
+#, c-format
+msgid "Keep right %1$s%2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
+#, c-format
+msgid "Keep left %1$s%2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "á dereita"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "á esquerda"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "suavemente "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "bruscamente "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Tome a estrada %1$s cara o %2$s"
@@ -226,32 +326,59 @@ msgstr "Tome a estrada %1$s cara o %2$s"
msgid "after %i roads"
msgstr "despois de %i estradas"
-msgid "now"
-msgstr "agora"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Xire %1$s%2$s %3$s%4$s"
-msgid "error"
-msgstr ""
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "logo dea a volta"
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|left"
+msgstr "Dea a volta %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "logo dea a volta"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
+msgstr "Dea a volta %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "despois xa chega ao seu destino"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Chegou ao seu destino %s"
-msgid "then you have reached your destination."
-msgstr "despois xa chega ao seu destino"
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Saída"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1806,10 +1933,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"