You can subscribe to this list here.
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(4) |
Aug
(59) |
Sep
(43) |
Oct
(95) |
Nov
(135) |
Dec
(108) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
(229) |
Feb
(141) |
Mar
(59) |
Apr
(70) |
May
(64) |
Jun
(87) |
Jul
(57) |
Aug
(108) |
Sep
(74) |
Oct
(203) |
Nov
(141) |
Dec
(108) |
2009 |
Jan
(114) |
Feb
(91) |
Mar
(101) |
Apr
(69) |
May
(54) |
Jun
(82) |
Jul
(49) |
Aug
(109) |
Sep
(81) |
Oct
(93) |
Nov
(100) |
Dec
(79) |
2010 |
Jan
(46) |
Feb
(36) |
Mar
(135) |
Apr
(103) |
May
(116) |
Jun
(130) |
Jul
(52) |
Aug
(31) |
Sep
(46) |
Oct
(48) |
Nov
(98) |
Dec
(110) |
2011 |
Jan
(234) |
Feb
(184) |
Mar
(150) |
Apr
(43) |
May
(53) |
Jun
(52) |
Jul
(112) |
Aug
(72) |
Sep
(79) |
Oct
(23) |
Nov
(6) |
Dec
(30) |
2012 |
Jan
(39) |
Feb
(37) |
Mar
(49) |
Apr
(60) |
May
(63) |
Jun
(38) |
Jul
(33) |
Aug
(24) |
Sep
(20) |
Oct
(14) |
Nov
(23) |
Dec
(50) |
2013 |
Jan
(30) |
Feb
(32) |
Mar
(27) |
Apr
(41) |
May
(59) |
Jun
(21) |
Jul
(10) |
Aug
(73) |
Sep
(23) |
Oct
(60) |
Nov
(14) |
Dec
(15) |
2014 |
Jan
(4) |
Feb
(8) |
Mar
(11) |
Apr
(6) |
May
(27) |
Jun
(4) |
Jul
(29) |
Aug
(62) |
Sep
(11) |
Oct
(17) |
Nov
(58) |
Dec
(9) |
2015 |
Jan
(23) |
Feb
(3) |
Mar
(26) |
Apr
(47) |
May
(8) |
Jun
(28) |
Jul
(10) |
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
From: <mar...@us...> - 2013-05-05 12:08:48
|
Revision: 5480 http://navit.svn.sourceforge.net/navit/?rev=5480&view=rev Author: martin-s Date: 2013-05-05 12:08:41 +0000 (Sun, 05 May 2013) Log Message: ----------- Fix:Core:Better interpolation of housnumbers along streets Modified Paths: -------------- trunk/navit/navit/search.c Modified: trunk/navit/navit/search.c =================================================================== --- trunk/navit/navit/search.c 2013-05-05 10:05:12 UTC (rev 5479) +++ trunk/navit/navit/search.c 2013-05-05 12:08:41 UTC (rev 5480) @@ -755,6 +755,7 @@ } else { int count,max=1024; int hn_pos,hn_length; + int step=inter->mode?2:1; struct coord *c=g_alloca(sizeof(struct coord)*max); item_coord_rewind(item); count=item_coord_get(item, c, max); @@ -779,7 +780,11 @@ dbg(1,"distance[%d]=%d\n",i,distances[i]); } dbg(1,"sum=%d\n",distance_sum); +#if 0 hn_distance=distance_sum*hn_pos/hn_length; +#else + hn_distance=(distance_sum*hn_pos+distance_sum*step/2)/(hn_length+step); +#endif dbg(1,"hn_distance=%d\n",hn_distance); i=0; while (i < count-1 && hn_distance > distances[i]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2013-05-05 10:05:19
|
Revision: 5479 http://navit.svn.sourceforge.net/navit/?rev=5479&view=rev Author: martin-s Date: 2013-05-05 10:05:12 +0000 (Sun, 05 May 2013) Log Message: ----------- Fix:map_binfile:Made index searches for house numbers work again Modified Paths: -------------- trunk/navit/navit/map/binfile/binfile.c Modified: trunk/navit/navit/map/binfile/binfile.c =================================================================== --- trunk/navit/navit/map/binfile/binfile.c 2013-05-05 09:37:41 UTC (rev 5478) +++ trunk/navit/navit/map/binfile/binfile.c 2013-05-05 10:05:12 UTC (rev 5479) @@ -2311,9 +2311,11 @@ break; case attr_house_number: has_house_number=binfile_attr_get(it->priv_data, attr_house_number, &at); - if (has_house_number || (it->type == type_house_number) - || (it->type == type_house_number_interpolation_even) || (it->type == type_house_number_interpolation_odd) - || (it->type == type_house_number_interpolation_all) ) + if (has_house_number || it->type == type_house_number + || it->type == type_house_number_interpolation_even || it->type == type_house_number_interpolation_odd + || it->type == type_house_number_interpolation_all + || (map_search->mode == 0 && item_is_street(*it)) + ) { if (has_house_number) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2013-05-05 09:37:49
|
Revision: 5478 http://navit.svn.sourceforge.net/navit/?rev=5478&view=rev Author: martin-s Date: 2013-05-05 09:37:41 +0000 (Sun, 05 May 2013) Log Message: ----------- Corrected c standard Modified Paths: -------------- trunk/navit/navit/binding/win32/binding_win32.c Modified: trunk/navit/navit/binding/win32/binding_win32.c =================================================================== --- trunk/navit/navit/binding/win32/binding_win32.c 2013-05-05 08:19:05 UTC (rev 5477) +++ trunk/navit/navit/binding/win32/binding_win32.c 2013-05-05 09:37:41 UTC (rev 5478) @@ -135,9 +135,9 @@ void plugin_init(void) { - dbg(0,"enter\n"); struct attr callback; struct win32_binding_private *this=g_new0(struct win32_binding_private,1); + dbg(0,"enter\n"); callback.type=attr_callback; callback.u.callback=callback_new_attr_1(callback_cast(win32_main_navit),attr_navit,this); config_add_attr(config, &callback); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <md...@us...> - 2013-05-05 08:19:13
|
Revision: 5477 http://navit.svn.sourceforge.net/navit/?rev=5477&view=rev Author: mdankov Date: 2013-05-05 08:19:05 +0000 (Sun, 05 May 2013) Log Message: ----------- Fix:gui_internal:Do not jump to the top of multipage route description list on each GPS update.|Thank you alxchr for pointing this out! Modified Paths: -------------- trunk/navit/navit/gui/internal/gui_internal.c trunk/navit/navit/gui/internal/gui_internal_widget.c trunk/navit/navit/gui/internal/gui_internal_widget.h Modified: trunk/navit/navit/gui/internal/gui_internal.c =================================================================== --- trunk/navit/navit/gui/internal/gui_internal.c 2013-05-04 20:06:41 UTC (rev 5476) +++ trunk/navit/navit/gui/internal/gui_internal.c 2013-05-05 08:19:05 UTC (rev 5477) @@ -3104,6 +3104,11 @@ if(map) mr = map_rect_new(map,NULL); if(mr) { + GList *toprow; + struct item topitem={0}; + toprow=gui_internal_widget_table_top_row(this, this->route_data.route_table); + if(toprow && toprow->data) + topitem=((struct widget*)toprow->data)->item; gui_internal_widget_table_clear(this,this->route_data.route_table); while((item = map_rect_get_item(mr))) { if(item_attr_get(item,attr_navigation_long,&attr)) { @@ -3117,6 +3122,7 @@ gui_internal_widget_append(row,label); label->item=*item; + row->item=*item; item_coord_get(item, &c, 1); label->c.x=c.x; label->c.y=c.y; @@ -3124,6 +3130,8 @@ label->func=gui_internal_cmd_position; label->state|=STATE_SENSITIVE; label->data=(void*)2; + if(toprow && item->id_hi==topitem.id_hi && item->id_lo==topitem.id_lo) + gui_internal_widget_table_set_top_row(this, this->route_data.route_table, row); } } Modified: trunk/navit/navit/gui/internal/gui_internal_widget.c =================================================================== --- trunk/navit/navit/gui/internal/gui_internal_widget.c 2013-05-04 20:06:41 UTC (rev 5476) +++ trunk/navit/navit/gui/internal/gui_internal_widget.c 2013-05-05 08:19:05 UTC (rev 5477) @@ -886,7 +886,7 @@ /** * @brief Get GList pointer to the table row drawn on the top of the screen. - * @returns GList pointer to the first row in the children list, or NULL. + * @returns GList pointer to the top row in the children list, or NULL. */ GList * gui_internal_widget_table_top_row(struct gui_priv *this, struct widget * table) @@ -898,6 +898,24 @@ return NULL; } +/** + * @brief Set internal top row pointer of the table to point to a given row widget. + * @returns GList pointer to the top row in the children list of the table. + */ +GList * +gui_internal_widget_table_set_top_row(struct gui_priv *this, struct widget * table, struct widget *row) +{ + if(table && table->type==widget_table) { + struct table_data *d=table->data; + d->top_row=table->children; + while(d->top_row && d->top_row->data!=row) + d->top_row=g_list_next(d->top_row); + if(!d->top_row) + d->top_row=gui_internal_widget_table_first_row(table->children); + return d->top_row; + } + return NULL; +} /** Modified: trunk/navit/navit/gui/internal/gui_internal_widget.h =================================================================== --- trunk/navit/navit/gui/internal/gui_internal_widget.h 2013-05-04 20:06:41 UTC (rev 5476) +++ trunk/navit/navit/gui/internal/gui_internal_widget.h 2013-05-05 08:19:05 UTC (rev 5477) @@ -180,6 +180,7 @@ GList *gui_internal_widget_table_prev_row(GList *row); GList *gui_internal_widget_table_first_row(GList *row); GList *gui_internal_widget_table_top_row(struct gui_priv *this, struct widget *table); +GList *gui_internal_widget_table_set_top_row(struct gui_priv *this, struct widget * table, struct widget *row); struct widget *gui_internal_widget_table_row_new(struct gui_priv *this, enum flags flags); void gui_internal_table_pack(struct gui_priv *this, struct widget *w); void gui_internal_table_hide_rows(struct table_data *table_data); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2013-05-04 20:06:48
|
Revision: 5476 http://navit.svn.sourceforge.net/navit/?rev=5476&view=rev Author: martin-s Date: 2013-05-04 20:06:41 +0000 (Sat, 04 May 2013) Log Message: ----------- Fix:Build:Correctly check for xgettext Modified Paths: -------------- trunk/navit/cmake/FindXGettextGlade.cmake Modified: trunk/navit/cmake/FindXGettextGlade.cmake =================================================================== --- trunk/navit/cmake/FindXGettextGlade.cmake 2013-05-04 19:53:55 UTC (rev 5475) +++ trunk/navit/cmake/FindXGettextGlade.cmake 2013-05-04 20:06:41 UTC (rev 5476) @@ -1,10 +1,10 @@ find_package(Gettext) FIND_PROGRAM(XGETTEXT xgettext) -if (XGETTEXT_FOUND) +if (XGETTEXT) execute_process(COMMAND echo "<test/>" COMMAND xgettext -L glade - RESULT_VARIABLE GETTEXT_RET) if ("${GETTEXT_RET}" STREQUAL "0") set(XGETTEXT_GLADE TRUE) else() set(XGETTEXT_GLADE FALSE) endif() -endif(XGETTEXT_FOUND) +endif(XGETTEXT) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2013-05-04 19:54:02
|
Revision: 5475 http://navit.svn.sourceforge.net/navit/?rev=5475&view=rev Author: martin-s Date: 2013-05-04 19:53:55 +0000 (Sat, 04 May 2013) Log Message: ----------- Add:Build:Improved gettext handling Modified Paths: -------------- trunk/navit/CMakeLists.txt trunk/navit/cmake/navit_xml_parser_glade.cmake Added Paths: ----------- trunk/navit/cmake/FindXGettextGlade.cmake Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2013-05-04 15:29:09 UTC (rev 5474) +++ trunk/navit/CMakeLists.txt 2013-05-04 19:53:55 UTC (rev 5475) @@ -112,7 +112,7 @@ find_package(OpenGL) find_package(GLUT) find_package(GTK2 2.6 COMPONENTS gtk) -find_package(Gettext) +find_package(XGettextGlade) find_package(PNG) find_package(DBusGLib) find_package(OpenSSL) @@ -342,15 +342,6 @@ set_with_reason(speech/cmdline "CreateProcess() call is available" TRUE) endif(HAVE_CREATEPROCESS) -if (GETTEXT_FOUND) - execute_process(COMMAND echo "<test/>" COMMAND xgettext -L glade - RESULT_VARIABLE GETTEXT_RET) - if ("${GETTEXT_RET}" STREQUAL "0") - set(XGETTEXT_GLADE TRUE) - else() - set(XGETTEXT_GLADE FALSE) - endif() -endif(GETTEXT_FOUND) - if (LIBLOCATION_FOUND) set_with_reason(vehicle/maemo "Maemo location library found" TRUE ${LIBLOCATION_LIBRARIES}) endif(LIBLOCATION_FOUND) Added: trunk/navit/cmake/FindXGettextGlade.cmake =================================================================== --- trunk/navit/cmake/FindXGettextGlade.cmake (rev 0) +++ trunk/navit/cmake/FindXGettextGlade.cmake 2013-05-04 19:53:55 UTC (rev 5475) @@ -0,0 +1,10 @@ +find_package(Gettext) +FIND_PROGRAM(XGETTEXT xgettext) +if (XGETTEXT_FOUND) + execute_process(COMMAND echo "<test/>" COMMAND xgettext -L glade - RESULT_VARIABLE GETTEXT_RET) + if ("${GETTEXT_RET}" STREQUAL "0") + set(XGETTEXT_GLADE TRUE) + else() + set(XGETTEXT_GLADE FALSE) + endif() +endif(XGETTEXT_FOUND) Modified: trunk/navit/cmake/navit_xml_parser_glade.cmake =================================================================== --- trunk/navit/cmake/navit_xml_parser_glade.cmake 2013-05-04 15:29:09 UTC (rev 5474) +++ trunk/navit/cmake/navit_xml_parser_glade.cmake 2013-05-04 19:53:55 UTC (rev 5475) @@ -1,6 +1,12 @@ file(READ "${SRC}" OUTPUT_LINES) +if (PREFIX) + set(OUTPUT_LINES "<html>" "${OUTPUT_LINES}") +endif() string(REGEX REPLACE "vehicleprofile" "atkaction" OUTPUT_LINES "${OUTPUT_LINES}") string(REGEX REPLACE "name=" "description=" OUTPUT_LINES "${OUTPUT_LINES}") string(REGEX REPLACE "...CDATA" " " OUTPUT_LINES "${OUTPUT_LINES}") string(REGEX REPLACE "\\]\\]" "" OUTPUT_LINES "${OUTPUT_LINES}") +if (SUFFIX) + set(OUTPUT_LINES "${OUTPUT_LINES}" "</html>") +endif() file(WRITE ${DST} ${OUTPUT_LINES}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <md...@us...> - 2013-05-04 15:29:20
|
Revision: 5474 http://navit.svn.sourceforge.net/navit/?rev=5474&view=rev Author: mdankov Date: 2013-05-04 15:29:09 +0000 (Sat, 04 May 2013) Log Message: ----------- Fix:map_binfile:Do not return housenumber search result in unindexed search if street name is not specified for a given item. Modified Paths: -------------- trunk/navit/navit/map/binfile/binfile.c Modified: trunk/navit/navit/map/binfile/binfile.c =================================================================== --- trunk/navit/navit/map/binfile/binfile.c 2013-05-04 15:25:25 UTC (rev 5473) +++ trunk/navit/navit/map/binfile/binfile.c 2013-05-04 15:29:09 UTC (rev 5474) @@ -2317,7 +2317,8 @@ { if (has_house_number) { - if (!linguistics_compare(at.u.str, map_search->search.u.str, mode)) + struct attr at2; + if ( (map_search->mode!=2 || binfile_attr_get(it->priv_data, attr_street_name, &at2)) && !linguistics_compare(at.u.str, map_search->search.u.str, mode)) { if (!duplicate(map_search, it, attr_house_number)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2013-05-04 15:25:34
|
Revision: 5473 http://navit.svn.sourceforge.net/navit/?rev=5473&view=rev Author: martin-s Date: 2013-05-04 15:25:25 +0000 (Sat, 04 May 2013) Log Message: ----------- Add:gui_internal:Ignore p tag in html Modified Paths: -------------- trunk/navit/navit/gui/internal/gui_internal_html.c Modified: trunk/navit/navit/gui/internal/gui_internal_html.c =================================================================== --- trunk/navit/navit/gui/internal/gui_internal_html.c 2013-05-04 14:57:37 UTC (rev 5472) +++ trunk/navit/navit/gui/internal/gui_internal_html.c 2013-05-04 15:25:25 UTC (rev 5473) @@ -217,7 +217,7 @@ struct html *html=&this->html[this->html_depth]; const char *cond, *type, *font_size; - if (!g_ascii_strcasecmp(tag_name,"text")) + if (!g_ascii_strcasecmp(tag_name,"text") || !g_ascii_strcasecmp(tag_name,"p")) return; html->skip=0; html->command=NULL; @@ -316,7 +316,7 @@ struct html *html; struct html *parent=NULL; - if (!g_ascii_strcasecmp(tag_name,"text")) + if (!g_ascii_strcasecmp(tag_name,"text") || !g_ascii_strcasecmp(tag_name,"p")) return; this->html_depth--; html=&this->html[this->html_depth]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2013-05-04 14:57:43
|
Revision: 5472 http://navit.svn.sourceforge.net/navit/?rev=5472&view=rev Author: martin-s Date: 2013-05-04 14:57:37 +0000 (Sat, 04 May 2013) Log Message: ----------- Add:Core:Possibility to use ezxml together with glib for easier debugging Modified Paths: -------------- trunk/navit/navit/xmlconfig.c Modified: trunk/navit/navit/xmlconfig.c =================================================================== --- trunk/navit/navit/xmlconfig.c 2013-05-03 21:36:00 UTC (rev 5471) +++ trunk/navit/navit/xmlconfig.c 2013-05-04 14:57:37 UTC (rev 5472) @@ -58,18 +58,31 @@ #define unsetenv(a) putenv(a "=") #endif +#ifndef USE_EZXML #ifdef HAVE_GLIB +#define USE_EZXML 0 +#else +#define USE_EZXML 1 +#endif +#endif + +#if !USE_EZXML #define ATTR_DISTANCE 1 const int xml_attr_distance=1; +typedef GMarkupParseContext xml_context; #else #include "ezxml.h" const int xml_attr_distance=2; #define ATTR_DISTANCE 2 +#undef G_MARKUP_ERROR +#undef G_MARKUP_ERROR_INVALID_CONTENT +#undef G_MARKUP_ERROR_PARSE +#undef G_MARKUP_ERROR_UNKNOWN_ELEMENT #define G_MARKUP_ERROR 0 #define G_MARKUP_ERROR_INVALID_CONTENT 0 #define G_MARKUP_ERROR_PARSE 0 #define G_MARKUP_ERROR_UNKNOWN_ELEMENT 0 -typedef void * GMarkupParseContext; +typedef void * xml_context; #endif struct xistate { @@ -570,7 +583,7 @@ * */ static void -start_element(GMarkupParseContext *context, +start_element(xml_context *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, @@ -688,7 +701,7 @@ /* Called for close tags </foo> */ static void -end_element (GMarkupParseContext *context, +end_element (xml_context *context, const gchar *element_name, gpointer user_data, xmlerror **error) @@ -710,7 +723,7 @@ static gboolean parse_file(struct xmldocument *document, xmlerror **error); static void -xinclude(GMarkupParseContext *context, const gchar **attribute_names, const gchar **attribute_values, struct xmldocument *doc_old, xmlerror **error) +xinclude(xml_context *context, const gchar **attribute_names, const gchar **attribute_values, struct xmldocument *doc_old, xmlerror **error) { struct xmldocument doc_new; struct file_wordexp *we; @@ -931,7 +944,7 @@ } static void -xi_start_element(GMarkupParseContext *context, +xi_start_element(xml_context *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, @@ -980,7 +993,7 @@ * */ static void -xi_end_element (GMarkupParseContext *context, +xi_end_element (xml_context *context, const gchar *element_name, gpointer user_data, xmlerror **error) @@ -1013,7 +1026,7 @@ /* Called for character data */ /* text is not nul-terminated */ static void -xi_text (GMarkupParseContext *context, +xi_text (xml_context *context, const gchar *text, gsize text_len, gpointer user_data, @@ -1043,7 +1056,7 @@ } } -#ifndef HAVE_GLIB +#if USE_EZXML static void parse_node_text(ezxml_t node, void *data, void (*start)(void *, const char *, const char **, const char **, void *, void *), void (*end)(void *, const char *, void *, void *), @@ -1068,9 +1081,9 @@ void (*end)(void *, const char *, void *, void *), void (*text)(void *, const char *, int, void *, void *)) { -#ifdef HAVE_GLIB +#if !USE_EZXML GMarkupParser parser = { start, end, text, NULL, NULL}; - GMarkupParseContext *context; + xml_context *context; gboolean result; context = g_markup_parse_context_new (&parser, 0, data, NULL); @@ -1096,7 +1109,7 @@ } -#ifdef HAVE_GLIB +#if !USE_EZXML static const GMarkupParser parser = { xi_start_element, @@ -1116,7 +1129,7 @@ static gboolean parse_file(struct xmldocument *document, xmlerror **error) { - GMarkupParseContext *context; + xml_context *context; gchar *contents, *message; gsize len; gint line, chr; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <md...@us...> - 2013-05-03 21:36:07
|
Revision: 5471 http://navit.svn.sourceforge.net/navit/?rev=5471&view=rev Author: mdankov Date: 2013-05-03 21:36:00 +0000 (Fri, 03 May 2013) Log Message: ----------- Add:map_binfile:Switch to use new linguistics_compare function. Modified Paths: -------------- trunk/navit/navit/map/binfile/binfile.c Modified: trunk/navit/navit/map/binfile/binfile.c =================================================================== --- trunk/navit/navit/map/binfile/binfile.c 2013-05-03 21:21:49 UTC (rev 5470) +++ trunk/navit/navit/map/binfile/binfile.c 2013-05-03 21:36:00 UTC (rev 5471) @@ -1719,13 +1719,13 @@ if(search->type==attr_town_name || search->type==attr_district_name || search->type==attr_town_or_district_name) { struct attr af, al; if(binfile_attr_get(mr->item.priv_data, attr_first_key, &af)) { - if(case_cmp(af.u.str,search->u.str,1)>0) { + if(linguistics_compare(af.u.str,search->u.str,linguistics_cmp_partial)>0) { dbg(1,"Skipping index item with first_key='%s'\n", af.u.str); return; } } if(binfile_attr_get(mr->item.priv_data, attr_last_key, &al)) { - if(case_cmp(al.u.str,search->u.str,1)<0) { + if(linguistics_compare(al.u.str,search->u.str,linguistics_cmp_partial)<0) { dbg(1,"Skipping index item with first_key='%s', last_key='%s'\n", af.u.str, al.u.str); return; } @@ -2114,26 +2114,7 @@ return NULL; } -/** - * @brief Compare two strings ignoring their case. - * @param name Item name string to compare - * @param match User query string. Should be linguistics_casefold()ed by by the caller - * @return result of comparison, zero if strings are equal - */ -static int -case_cmp(char *name, char *match, int partial) -{ - int matchlen=strlen(match); - int ret; - char *folded=linguistics_casefold(name); - if (partial && strlen(folded)>matchlen) - folded[matchlen]=0; - ret=strcmp(folded, match); - g_free(folded); - return ret; -} - struct duplicate { struct coord c; @@ -2262,6 +2243,7 @@ { struct item* it; struct attr at; + enum linguistics_cmp_mode mode=(map_search->partial?linguistics_cmp_partial:0); for (;;) { while ((it = map_rect_get_item_binfile(map_search->mr))) { @@ -2272,13 +2254,13 @@ case attr_town_or_district_name: if (map_search->mr->tile_depth > 1 && item_is_town(*it) && map_search->search.type != attr_district_name) { if (binfile_attr_get(it->priv_data, attr_town_name_match, &at) || binfile_attr_get(it->priv_data, attr_town_name, &at)) { - if (!case_cmp(at.u.str, map_search->search.u.str, map_search->partial) && !duplicate(map_search, it, attr_town_name)) + if (!linguistics_compare(at.u.str, map_search->search.u.str, mode) && !duplicate(map_search, it, attr_town_name)) return it; } } if (map_search->mr->tile_depth > 1 && item_is_district(*it) && map_search->search.type != attr_town_name) { if (binfile_attr_get(it->priv_data, attr_district_name_match, &at) || binfile_attr_get(it->priv_data, attr_district_name, &at)) { - if (!case_cmp(at.u.str, map_search->search.u.str, map_search->partial) && !duplicate(map_search, it, attr_town_name)) + if (!linguistics_compare(at.u.str, map_search->search.u.str, mode) && !duplicate(map_search, it, attr_town_name)) return it; } } @@ -2286,7 +2268,7 @@ case attr_street_name: if (map_search->mode == 1) { if (binfile_attr_get(it->priv_data, attr_street_name_match, &at) || binfile_attr_get(it->priv_data, attr_street_name, &at)) { - if (!case_cmp(at.u.str, map_search->search.u.str, map_search->partial) && !duplicate(map_search, it, attr_street_name)) { + if (!linguistics_compare(at.u.str, map_search->search.u.str, mode) && !duplicate(map_search, it, attr_street_name)) { return it; } } @@ -2298,9 +2280,6 @@ break; if(binfile_attr_get(it->priv_data, attr_label, &at)) { - int i,match=0; - char *str; - char *word; struct coord c[128]; struct duplicate *d; @@ -2310,27 +2289,10 @@ d=duplicate_test(map_search, it, attr_label); if(!d) break; - - str=g_strdup(at.u.str); - word=str; - do { - for (i = 0 ; i < 3 ; i++) { - char *name=linguistics_expand_special(word,i); - if (name && !case_cmp(name, map_search->search.u.str, map_search->partial)) - match=1; - g_free(name); - if (match) - break; - } - if (match) - break; - word=linguistics_next_word(word); - } while (word); - g_free(str); - - if(!match) { + + if(linguistics_compare(at.u.str, map_search->search.u.str, mode|linguistics_cmp_expand|linguistics_cmp_words)) { /* Remember this non-matching street name in duplicate hash to skip name - * comparison for its following segments */ + * comparison for its following segments */ duplicate_insert(map_search, d); break; } @@ -2355,7 +2317,7 @@ { if (has_house_number) { - if (!case_cmp(at.u.str, map_search->search.u.str, map_search->partial)) + if (!linguistics_compare(at.u.str, map_search->search.u.str, mode)) { if (!duplicate(map_search, it, attr_house_number)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <md...@us...> - 2013-05-03 21:21:55
|
Revision: 5470 http://navit.svn.sourceforge.net/navit/?rev=5470&view=rev Author: mdankov Date: 2013-05-03 21:21:49 +0000 (Fri, 03 May 2013) Log Message: ----------- Fix:core:Make country search accent insensitive. Fixes #1092. Modified Paths: -------------- trunk/navit/navit/country.c Modified: trunk/navit/navit/country.c =================================================================== --- trunk/navit/navit/country.c 2013-05-03 21:05:37 UTC (rev 5469) +++ trunk/navit/navit/country.c 2013-05-03 21:21:49 UTC (rev 5470) @@ -25,6 +25,7 @@ #include "item.h" #include "country.h" #include "search.h" +#include "linguistics.h" #include "navit_nls.h" struct country { @@ -359,8 +360,9 @@ { struct country_search *ret=g_new(struct country_search, 1); ret->search=*search; + ret->search.u.str=linguistics_casefold(ret->search.u.str); if (search->type != attr_country_id) - ret->len=strlen(search->u.str); + ret->len=strlen(ret->search.u.str); else ret->len=0; ret->partial=partial; @@ -383,10 +385,7 @@ return 0; if (this_->search.type != type && this_->search.type != attr_country_all) return 0; - if (this_->partial) - ret=(g_strncasecmp(this_->search.u.str, name, this_->len) == 0); - else - ret=(g_strcasecmp(this_->search.u.str, name) == 0); + ret=linguistics_compare(name, this_->search.u.str, linguistics_cmp_expand | (this_->partial?linguistics_cmp_partial:0) | linguistics_cmp_words)==0; return ret; } @@ -431,5 +430,6 @@ void country_search_destroy(struct country_search *this_) { + g_free(this_->search.u.str); g_free(this_); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <md...@us...> - 2013-05-03 21:05:44
|
Revision: 5469 http://navit.svn.sourceforge.net/navit/?rev=5469&view=rev Author: mdankov Date: 2013-05-03 21:05:37 +0000 (Fri, 03 May 2013) Log Message: ----------- Add:core:New function for case- and accent- insensitive string comparison. Modified Paths: -------------- trunk/navit/navit/linguistics.c trunk/navit/navit/linguistics.h Modified: trunk/navit/navit/linguistics.c =================================================================== --- trunk/navit/navit/linguistics.c 2013-05-03 19:58:09 UTC (rev 5468) +++ trunk/navit/navit/linguistics.c 2013-05-03 21:05:37 UTC (rev 5469) @@ -4,6 +4,8 @@ #include "debug.h" #include "linguistics.h" +/* To have linguistics_casefold(linguistics_expand_special(s,i)) equal to linguistics_expand_special(linguistics_casefold(s),i), + * please always specify here lower case expansions for special letters not having case variants (like german ß).*/ static const char *special[][3]={ /* Capital Diacritics */ /* ¨ Diaresis */ @@ -284,10 +286,10 @@ * @return String prepared for case insensitive search. Result shoud be g_free()d after use. */ char* -linguistics_casefold(char *in) +linguistics_casefold(const char *in) { int len=strlen(in); - char *src=in; + const char *src=in; char *ret=g_new(char,len+1); char *dest=ret; char buf[10]; @@ -320,7 +322,7 @@ } static char** -linguistics_get_special(char *str, char *end) +linguistics_get_special(const char *str, const char *end) { char *buf; int len; @@ -332,6 +334,48 @@ return g_hash_table_lookup(special_hash,buf); } +/** + * @brief Compare two strings, trying to replace special characters (e.g. umlauts) in first string with plain letters. + * + * @param s1 First string to process, for example, an item name from the map. Will be linguistics_casefold()ed before comparison. + * @param s2 Second string to process, usually user supplied search string. Should be linguistics_casefold()ed before calling this function. + * @param mode set to composition of linguistics_cmp_mode flags to have s1 linguistics_expand_special()ed, allow matches shorter than whole s1, or + * @param let matches start from any word boundary within s1 + * @returns 0 when strings are equal + */ +int linguistics_compare(const char *s1, const char *s2, enum linguistics_cmp_mode mode) +{ + int ret=0; + int i; + int s2len=strlen(s2); + char *s1f; + /* Calling linguistics_casefold() before linguistics_expand_special() requires that result is independent of calling order. This seems + to be true at the time of writing this comment. */ + s1f=linguistics_casefold(s1); + for(i=0; i<3; i++) { + char *s, *word; + if(i>0) + s=linguistics_expand_special(s1f,i); + else + s=s1f; + word=s; + while(word) { + if(mode & linguistics_cmp_partial) + ret=strncmp(word,s2,s2len); + else + ret=strcmp(word,s2); + if(!ret || !(mode & linguistics_cmp_words)) + break; + word=linguistics_next_word(word); + } + if(i>0) + g_free(s); + if(!ret || !(mode & linguistics_cmp_expand)) + break; + } + g_free(s1f); + return ret; +} /** * @brief Replace special characters in string (e.g. umlauts) with plain letters. @@ -344,9 +388,9 @@ * @returns copy of string, with characters replaced */ char * -linguistics_expand_special(char *str, int mode) +linguistics_expand_special(const char *str, int mode) { - char *in=str; + const char *in=str; char *out,*ret; int found=0; int ret_len=strlen(str); @@ -356,7 +400,7 @@ return ret; while (*in) { char *next=g_utf8_find_next_char(in, NULL); - int i,len; + int len; int match=0; if(next) @@ -412,7 +456,7 @@ } int -linguistics_search(char *str) +linguistics_search(const char *str) { if (!g_strcasecmp(str,"str")) return 0; Modified: trunk/navit/navit/linguistics.h =================================================================== --- trunk/navit/navit/linguistics.h 2013-05-03 19:58:09 UTC (rev 5468) +++ trunk/navit/navit/linguistics.h 2013-05-03 21:05:37 UTC (rev 5469) @@ -1,15 +1,20 @@ #ifdef __cplusplus extern "C" { #endif -char *linguistics_expand_special(char *str, int mode); +char *linguistics_expand_special(const char *str, int mode); char *linguistics_next_word(char *str); void linguistics_init(void); void linguistics_free(void); -char *linguistics_casefold(char *in); +char *linguistics_casefold(const char *in); +int linguistics_search(const char *str); +enum linguistics_cmp_mode { + linguistics_cmp_expand=1, + linguistics_cmp_partial=2, + linguistics_cmp_words=4 +}; +int linguistics_compare(const char *s1, const char *s2, enum linguistics_cmp_mode mode); #ifdef __cplusplus } #endif -/* Prototypes */ -int linguistics_search(char *str); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2013-05-03 19:58:16
|
Revision: 5468 http://navit.svn.sourceforge.net/navit/?rev=5468&view=rev Author: martin-s Date: 2013-05-03 19:58:09 +0000 (Fri, 03 May 2013) Log Message: ----------- Fix:android:Avoid packaging of foreign autoload libraries into the apk Modified Paths: -------------- trunk/navit/navit/android/CMakeLists.txt Modified: trunk/navit/navit/android/CMakeLists.txt =================================================================== --- trunk/navit/navit/android/CMakeLists.txt 2013-05-01 22:19:41 UTC (rev 5467) +++ trunk/navit/navit/android/CMakeLists.txt 2013-05-03 19:58:09 UTC (rev 5468) @@ -42,7 +42,7 @@ -D LOWER=1 -P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake COMMAND ${CMAKE_COMMAND} - -D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/*/*/.libs/*.so" + -D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/*/*/.libs/lib[b-z]*.so" -D DST=${CMAKE_CURRENT_BINARY_DIR}/libs/${ANDROID_ARCH} -P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake COMMAND ${CMAKE_COMMAND} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sl...@us...> - 2013-05-01 22:19:52
|
Revision: 5467 http://navit.svn.sourceforge.net/navit/?rev=5467&view=rev Author: sleske Date: 2013-05-01 22:19:41 +0000 (Wed, 01 May 2013) Log Message: ----------- Add:i18n:Translate default name for vehicle. Modified Paths: -------------- trunk/navit/navit/vehicle.c trunk/navit/po/CMakeLists.txt trunk/navit/po/af.po.in trunk/navit/po/ar.po.in trunk/navit/po/ast.po.in trunk/navit/po/bg.po.in trunk/navit/po/ca.po.in trunk/navit/po/cs.po.in trunk/navit/po/da.po.in trunk/navit/po/de.po.in trunk/navit/po/de_CH.po.in trunk/navit/po/el.po.in trunk/navit/po/en_AU.po.in trunk/navit/po/en_GB.po.in trunk/navit/po/eo.po.in trunk/navit/po/es.po.in trunk/navit/po/et.po.in trunk/navit/po/eu.po.in trunk/navit/po/fi.po.in trunk/navit/po/fo.po.in trunk/navit/po/fr.po.in trunk/navit/po/fr_CH.po.in trunk/navit/po/gl.po.in trunk/navit/po/he.po.in trunk/navit/po/hr.po.in trunk/navit/po/hu.po.in trunk/navit/po/id.po.in trunk/navit/po/it.po.in trunk/navit/po/ja.po.in trunk/navit/po/jv.po.in trunk/navit/po/kk.po.in trunk/navit/po/lt.po.in trunk/navit/po/lv.po.in trunk/navit/po/mk.po.in trunk/navit/po/nb.po.in trunk/navit/po/nds.po.in trunk/navit/po/nl.po.in trunk/navit/po/nn.po.in trunk/navit/po/pl.po.in trunk/navit/po/pt.po.in trunk/navit/po/pt_BR.po.in trunk/navit/po/ro.po.in trunk/navit/po/ru.po.in trunk/navit/po/sk.po.in trunk/navit/po/sl.po.in trunk/navit/po/sr.po.in trunk/navit/po/sv.po.in trunk/navit/po/ta.po.in trunk/navit/po/te.po.in trunk/navit/po/th.po.in trunk/navit/po/tr.po.in trunk/navit/po/uk.po.in trunk/navit/po/ur.po.in trunk/navit/po/vi.po.in trunk/navit/po/zh_CN.po.in trunk/navit/po/zh_HK.po.in Modified: trunk/navit/navit/vehicle.c =================================================================== --- trunk/navit/navit/vehicle.c 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/navit/vehicle.c 2013-05-01 22:19:41 UTC (rev 5467) @@ -40,6 +40,7 @@ #include "color.h" #include "layout.h" #include "vehicle.h" +#include "navit_nls.h" struct vehicle { NAVIT_OBJECT @@ -399,7 +400,7 @@ struct attr default_name; if (!attr_search(this_->attrs, NULL, attr_name)) { default_name.type=attr_name; - default_name.u.str="Unnamed vehicle"; + default_name.u.str=_("Unnamed vehicle"); this_->attrs=attr_generic_set_attr(this_->attrs, &default_name); dbg(0, "Incomplete vehicle definition: missing attribute 'name'. Default name set.\n"); } Modified: trunk/navit/po/CMakeLists.txt =================================================================== --- trunk/navit/po/CMakeLists.txt 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/CMakeLists.txt 2013-05-01 22:19:41 UTC (rev 5467) @@ -8,6 +8,7 @@ ${PROJECT_SOURCE_DIR}/navit/country.c ${PROJECT_SOURCE_DIR}/navit/start_real.c ${PROJECT_SOURCE_DIR}/navit/route.c + ${PROJECT_SOURCE_DIR}/navit/vehicle.c ${PROJECT_SOURCE_DIR}/navit/bookmarks.c ${PROJECT_SOURCE_DIR}/navit/gui/gtk/destination.c ${PROJECT_SOURCE_DIR}/navit/gui/gtk/gui_gtk_action.c Modified: trunk/navit/po/af.po.in =================================================================== --- trunk/navit/po/af.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/af.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2009-12-20 20:36+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Afrikaans <af...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/ar.po.in =================================================================== --- trunk/navit/po/ar.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/ar.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-02-01 17:37+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Arabic <ar...@li...>\n" @@ -1353,6 +1353,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/ast.po.in =================================================================== --- trunk/navit/po/ast.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/ast.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-05-21 17:35+0000\n" "Last-Translator: Xuacu Saturio <xua...@gm...>\n" "Language-Team: Asturian <as...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/bg.po.in =================================================================== --- trunk/navit/po/bg.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/bg.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2009-12-20 20:36+0000\n" "Last-Translator: Alex Stanev <al...@st...>\n" "Language-Team: Bulgarian <bg...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/ca.po.in =================================================================== --- trunk/navit/po/ca.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/ca.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-05-18 09:31+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Catalan <ca...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/cs.po.in =================================================================== --- trunk/navit/po/cs.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/cs.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-06-18 19:02+0000\n" "Last-Translator: Vladimír Burian <vla...@em...>\n" "Language-Team: Čeština\n" @@ -1340,6 +1340,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/da.po.in =================================================================== --- trunk/navit/po/da.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/da.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-05-18 09:31+0000\n" "Last-Translator: Lasse Luttermann <lut...@si...>\n" "Language-Team: Glenn Sommer <gl...@gm...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/de.po.in =================================================================== --- trunk/navit/po/de.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/de.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-06-01 22:09+0000\n" "Last-Translator: Achim Behrens <Unknown>\n" "Language-Team: Martin Schaller <mar...@so...>\n" @@ -1349,6 +1349,9 @@ msgid "unknown street" msgstr "unbekannte Straße" +msgid "Unnamed vehicle" +msgstr "Namenloses Fahrzeug" + msgid "Failed to write bookmarks file" msgstr "Lesezeichen-Datei konnte nicht geschrieben werden" Modified: trunk/navit/po/de_CH.po.in =================================================================== --- trunk/navit/po/de_CH.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/de_CH.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-05-18 08:49+0000\n" "Last-Translator: \n" "Language-Team: German (Switzerland) <de...@li...>\n" @@ -1335,6 +1335,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/el.po.in =================================================================== --- trunk/navit/po/el.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/el.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-05-24 14:51+0000\n" "Last-Translator: aitolos <Unknown>\n" "Language-Team: Greek <el...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/en_AU.po.in =================================================================== --- trunk/navit/po/en_AU.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/en_AU.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-09-12 05:53+0000\n" "Last-Translator: Athol Mullen <Unknown>\n" "Language-Team: English (Australia) <en...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/en_GB.po.in =================================================================== --- trunk/navit/po/en_GB.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/en_GB.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-05-29 13:38+0000\n" "Last-Translator: Matthew Gall <mat...@gm...>\n" "Language-Team: English (United Kingdom) <en...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/eo.po.in =================================================================== --- trunk/navit/po/eo.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/eo.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2009-12-20 20:37+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Esperanto <eo...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/es.po.in =================================================================== --- trunk/navit/po/es.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/es.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2013-04-20 00:00+0000\n" "Last-Translator: Mariano Muñoz <tur...@ya...>\n" "Language-Team: Chris Eubank <cte...@gm...>\n" @@ -1335,6 +1335,9 @@ msgid "unknown street" msgstr "calle desconocida" +msgid "Unnamed vehicle" +msgstr "Vehículo sin nombre" + msgid "Failed to write bookmarks file" msgstr "Error al escribir el fichero de marcadores" Modified: trunk/navit/po/et.po.in =================================================================== --- trunk/navit/po/et.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/et.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-05-18 12:23+0000\n" "Last-Translator: Andres Kaaber <and...@gm...>\n" "Language-Team: Estonian <et...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/eu.po.in =================================================================== --- trunk/navit/po/eu.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/eu.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-08-27 18:11+0000\n" "Last-Translator: Inaki Saez <Ina...@gm...>\n" "Language-Team: Basque <eu...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/fi.po.in =================================================================== --- trunk/navit/po/fi.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/fi.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-06-08 07:37+0000\n" "Last-Translator: Timo Jyrinki <tim...@gm...>\n" "Language-Team: Ossi Berg <o....@ma...>\n" @@ -1337,6 +1337,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/fo.po.in =================================================================== --- trunk/navit/po/fo.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/fo.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-05-18 12:19+0000\n" "Last-Translator: Cyberish <ka...@gm...>\n" "Language-Team: Faroese <fo...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/fr.po.in =================================================================== --- trunk/navit/po/fr.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/fr.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-06-18 19:16+0000\n" "Last-Translator: yannick56 <Unknown>\n" "Language-Team: KaZeR <ka...@al...>\n" @@ -1342,6 +1342,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "Véhicule sans nom" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/fr_CH.po.in =================================================================== --- trunk/navit/po/fr_CH.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/fr_CH.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-02-06 10:37+0000\n" "Last-Translator: KaZeR <ka...@al...>\n" "Language-Team: KaZeR <ka...@al...>\n" @@ -1342,6 +1342,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/gl.po.in =================================================================== --- trunk/navit/po/gl.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/gl.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-05-18 09:32+0000\n" "Last-Translator: andreout <an...@ou...>\n" "Language-Team: Galician <gl...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/he.po.in =================================================================== --- trunk/navit/po/he.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/he.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2009-12-20 20:37+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Hebrew <he...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/hr.po.in =================================================================== --- trunk/navit/po/hr.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/hr.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-03-21 04:05+0000\n" "Last-Translator: klajo <Unknown>\n" "Language-Team: Croatian <hr...@li...>\n" @@ -1341,6 +1341,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/hu.po.in =================================================================== --- trunk/navit/po/hu.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/hu.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-05-18 12:25+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Hungarian <hu...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/id.po.in =================================================================== --- trunk/navit/po/id.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/id.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-05-27 15:01+0000\n" "Last-Translator: M Bambang I <Unknown>\n" "Language-Team: Indonesian <id...@li...>\n" @@ -1333,6 +1333,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/it.po.in =================================================================== --- trunk/navit/po/it.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/it.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-05-18 09:27+0000\n" "Last-Translator: Marco Ciampa <ci...@li...>\n" "Language-Team: Italiano\n" @@ -1337,6 +1337,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/ja.po.in =================================================================== --- trunk/navit/po/ja.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/ja.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2009-07-02 22:46+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Japanese <ja...@li...>\n" @@ -1334,6 +1334,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/jv.po.in =================================================================== --- trunk/navit/po/jv.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/jv.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-08-10 04:53+0000\n" "Last-Translator: Leonardus Priyo Handono <Unknown>\n" "Language-Team: Javanese <jv...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/kk.po.in =================================================================== --- trunk/navit/po/kk.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/kk.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-02-24 19:32+0000\n" "Last-Translator: \n" "Language-Team: Kazakh <kk...@li...>\n" @@ -1333,6 +1333,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/lt.po.in =================================================================== --- trunk/navit/po/lt.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/lt.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2009-12-20 20:38+0000\n" "Last-Translator: laimonas <lai...@gm...>\n" "Language-Team: Lithuanian <lt...@li...>\n" @@ -1341,6 +1341,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/lv.po.in =================================================================== --- trunk/navit/po/lv.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/lv.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2009-12-20 21:37+0000\n" "Last-Translator: Janis <Unknown>\n" "Language-Team: Latvian <lv...@li...>\n" @@ -1340,6 +1340,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/mk.po.in =================================================================== --- trunk/navit/po/mk.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/mk.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-04-25 02:12+0000\n" "Last-Translator: Robert Mileski <r_m...@ho...>\n" "Language-Team: Macedonian <mk...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/nb.po.in =================================================================== --- trunk/navit/po/nb.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/nb.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-06-19 07:59+0000\n" "Last-Translator: Kurt Nielsen <Unknown>\n" "Language-Team: Bendik Brenne <be...@xp...>\n" @@ -1337,6 +1337,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/nds.po.in =================================================================== --- trunk/navit/po/nds.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/nds.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-05-18 09:29+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: German, Low <nd...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/nl.po.in =================================================================== --- trunk/navit/po/nl.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/nl.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-06-17 08:22+0000\n" "Last-Translator: Christ van Willegen <cvw...@gm...>\n" "Language-Team: afaber\n" @@ -1338,6 +1338,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/nn.po.in =================================================================== --- trunk/navit/po/nn.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/nn.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2009-12-20 21:37+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Norwegian Nynorsk <nn...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/pl.po.in =================================================================== --- trunk/navit/po/pl.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/pl.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-06-09 18:10+0000\n" "Last-Translator: Lukasz Semler <luk...@o2...>\n" "Language-Team: Translators\n" @@ -1343,6 +1343,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/pt.po.in =================================================================== --- trunk/navit/po/pt.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/pt.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-05-18 12:25+0000\n" "Last-Translator: CaioNavas <web...@ca...>\n" "Language-Team: Portuguese <pt...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/pt_BR.po.in =================================================================== --- trunk/navit/po/pt_BR.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/pt_BR.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-06-13 14:14+0000\n" "Last-Translator: Leonardo Hamada <leo...@ho...>\n" "Language-Team: Brazilian Portuguese <pt...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/ro.po.in =================================================================== --- trunk/navit/po/ro.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/ro.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-06-12 09:37+0000\n" "Last-Translator: igorashu <Unknown>\n" "Language-Team: Romanian <ro...@li...>\n" @@ -1341,6 +1341,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/ru.po.in =================================================================== --- trunk/navit/po/ru.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/ru.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-06-30 18:26+0000\n" "Last-Translator: Denis Chapligin <aka...@gm...>\n" "Language-Team: Rustam T. Usmanov\n" @@ -1342,6 +1342,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/sk.po.in =================================================================== --- trunk/navit/po/sk.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/sk.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-06-11 09:50+0000\n" "Last-Translator: kayle.sk <web...@ka...>\n" "Language-Team: Slovenčina\n" @@ -1340,6 +1340,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/sl.po.in =================================================================== --- trunk/navit/po/sl.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/sl.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2009-07-02 21:39+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Slovenian <sl...@li...>\n" @@ -1345,6 +1345,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/sr.po.in =================================================================== --- trunk/navit/po/sr.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/sr.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-06-08 21:56+0000\n" "Last-Translator: momcilo <Unknown>\n" "Language-Team: Serbian <sr...@li...>\n" @@ -1341,6 +1341,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/sv.po.in =================================================================== --- trunk/navit/po/sv.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/sv.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-05-18 12:27+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Swedish <sv...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/ta.po.in =================================================================== --- trunk/navit/po/ta.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/ta.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-07-07 20:13+0000\n" "Last-Translator: Dinesh Ramalingam <Unknown>\n" "Language-Team: Tamil <ta...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/te.po.in =================================================================== --- trunk/navit/po/te.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/te.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2009-07-02 20:53+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Telugu <te...@li...>\n" @@ -1336,6 +1336,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/th.po.in =================================================================== --- trunk/navit/po/th.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/th.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2009-07-02 21:52+0000\n" "Last-Translator: mansv68 <ma...@ya...>\n" "Language-Team: Thai <th...@li...>\n" @@ -1332,6 +1332,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/tr.po.in =================================================================== --- trunk/navit/po/tr.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/tr.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-05-10 15:05+0000\n" "Last-Translator: seqizz (gurkanGur) <se...@gm...>\n" "Language-Team: Turkish <tr...@li...>\n" @@ -1332,6 +1332,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/uk.po.in =================================================================== --- trunk/navit/po/uk.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/uk.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-05-28 14:54+0000\n" "Last-Translator: andygol <Unknown>\n" "Language-Team: Ukrainian <uk...@li...>\n" @@ -1341,6 +1341,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/ur.po.in =================================================================== --- trunk/navit/po/ur.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/ur.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2010-11-14 14:11+0000\n" "Last-Translator: asghar <Unknown>\n" "Language-Team: Urdu <ur...@li...>\n" @@ -1337,6 +1337,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/vi.po.in =================================================================== --- trunk/navit/po/vi.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/vi.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2009-12-20 21:38+0000\n" "Last-Translator: Nguyễn Hào Khôi <ngu...@ya...>\n" "Language-Team: Vietnamese <vi...@li...>\n" @@ -1332,6 +1332,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/zh_CN.po.in =================================================================== --- trunk/navit/po/zh_CN.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/zh_CN.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2009-12-20 20:38+0000\n" "Last-Translator: Kyle WANG <wa...@16...>\n" "Language-Team: Simplified Chinese <zh...@li...>\n" @@ -1332,6 +1332,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" Modified: trunk/navit/po/zh_HK.po.in =================================================================== --- trunk/navit/po/zh_HK.po.in 2013-05-01 22:18:14 UTC (rev 5466) +++ trunk/navit/po/zh_HK.po.in 2013-05-01 22:19:41 UTC (rev 5467) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-22 18:30+0200\n" +"POT-Creation-Date: 2013-04-30 19:57+0200\n" "PO-Revision-Date: 2009-07-02 19:47+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Chinese (Hong Kong) <zh...@li...>\n" @@ -1334,6 +1334,9 @@ msgid "unknown street" msgstr "" +msgid "Unnamed vehicle" +msgstr "" + msgid "Failed to write bookmarks file" msgstr "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sl...@us...> - 2013-05-01 22:18:21
|
Revision: 5466 http://navit.svn.sourceforge.net/navit/?rev=5466&view=rev Author: sleske Date: 2013-05-01 22:18:14 +0000 (Wed, 01 May 2013) Log Message: ----------- Fix:core:Set default name for vehicle if no name is specified in navit.xml. Modified Paths: -------------- trunk/navit/navit/vehicle.c Modified: trunk/navit/navit/vehicle.c =================================================================== --- trunk/navit/navit/vehicle.c 2013-05-01 22:17:54 UTC (rev 5465) +++ trunk/navit/navit/vehicle.c 2013-05-01 22:18:14 UTC (rev 5466) @@ -66,6 +66,7 @@ struct object_func vehicle_func; +static void vehicle_set_default_name(struct vehicle *this); static void vehicle_draw_do(struct vehicle *this_, int lazy); static void vehicle_log_nmea(struct vehicle *this_, struct log *log); static void vehicle_log_gpx(struct vehicle *this_, struct log *log); @@ -129,6 +130,7 @@ center.x=0; center.y=0; transform_setup(this_->trans, ¢er, 16, 0); + vehicle_set_default_name(this_); dbg(1, "leave\n"); this_->log_to_cb=g_hash_table_new(NULL,NULL); @@ -392,7 +394,18 @@ return 1; } +static void vehicle_set_default_name(struct vehicle *this_) +{ + struct attr default_name; + if (!attr_search(this_->attrs, NULL, attr_name)) { + default_name.type=attr_name; + default_name.u.str="Unnamed vehicle"; + this_->attrs=attr_generic_set_attr(this_->attrs, &default_name); + dbg(0, "Incomplete vehicle definition: missing attribute 'name'. Default name set.\n"); + } +} + static void vehicle_draw_do(struct vehicle *this_, int lazy) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sl...@us...> - 2013-05-01 22:18:01
|
Revision: 5465 http://navit.svn.sourceforge.net/navit/?rev=5465&view=rev Author: sleske Date: 2013-05-01 22:17:54 +0000 (Wed, 01 May 2013) Log Message: ----------- Fix:vehicle_demo:Do not log spurious warning for attribute 'name'. Modified Paths: -------------- trunk/navit/navit/vehicle/demo/vehicle_demo.c Modified: trunk/navit/navit/vehicle/demo/vehicle_demo.c =================================================================== --- trunk/navit/navit/vehicle/demo/vehicle_demo.c 2013-05-01 22:17:27 UTC (rev 5464) +++ trunk/navit/navit/vehicle/demo/vehicle_demo.c 2013-05-01 22:17:54 UTC (rev 5465) @@ -159,7 +159,8 @@ break; case attr_profilename: case attr_source: - // Ignore; is always present, but not read by this vehicle. + case attr_name: + // Ignore; used by Navit's infrastructure, but not relevant for this vehicle. break; default: dbg(0,"unsupported attribute %s\n",attr_to_name(attr->type)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sl...@us...> - 2013-05-01 22:17:39
|
Revision: 5464 http://navit.svn.sourceforge.net/navit/?rev=5464&view=rev Author: sleske Date: 2013-05-01 22:17:27 +0000 (Wed, 01 May 2013) Log Message: ----------- Fix:i18n:Update .po.in files Modified Paths: -------------- trunk/navit/po/af.po.in trunk/navit/po/ar.po.in trunk/navit/po/ast.po.in trunk/navit/po/bg.po.in trunk/navit/po/ca.po.in trunk/navit/po/cs.po.in trunk/navit/po/da.po.in trunk/navit/po/de.po.in trunk/navit/po/de_CH.po.in trunk/navit/po/el.po.in trunk/navit/po/en_AU.po.in trunk/navit/po/en_GB.po.in trunk/navit/po/eo.po.in trunk/navit/po/es.po.in trunk/navit/po/et.po.in trunk/navit/po/eu.po.in trunk/navit/po/fi.po.in trunk/navit/po/fo.po.in trunk/navit/po/fr.po.in trunk/navit/po/fr_CH.po.in trunk/navit/po/gl.po.in trunk/navit/po/he.po.in trunk/navit/po/hr.po.in trunk/navit/po/hu.po.in trunk/navit/po/id.po.in trunk/navit/po/it.po.in trunk/navit/po/ja.po.in trunk/navit/po/jv.po.in trunk/navit/po/kk.po.in trunk/navit/po/lt.po.in trunk/navit/po/lv.po.in trunk/navit/po/mk.po.in trunk/navit/po/nb.po.in trunk/navit/po/nds.po.in trunk/navit/po/nl.po.in trunk/navit/po/nn.po.in trunk/navit/po/pl.po.in trunk/navit/po/pt.po.in trunk/navit/po/pt_BR.po.in trunk/navit/po/ro.po.in trunk/navit/po/ru.po.in trunk/navit/po/sk.po.in trunk/navit/po/sl.po.in trunk/navit/po/sr.po.in trunk/navit/po/sv.po.in trunk/navit/po/ta.po.in trunk/navit/po/te.po.in trunk/navit/po/th.po.in trunk/navit/po/tr.po.in trunk/navit/po/uk.po.in trunk/navit/po/ur.po.in trunk/navit/po/vi.po.in trunk/navit/po/zh_CN.po.in trunk/navit/po/zh_HK.po.in Modified: trunk/navit/po/af.po.in =================================================================== --- trunk/navit/po/af.po.in 2013-04-28 20:52:44 UTC (rev 5463) +++ trunk/navit/po/af.po.in 2013-05-01 22:17:27 UTC (rev 5464) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-23 20:16+0200\n" +"POT-Creation-Date: 2013-04-22 18:30+0200\n" "PO-Revision-Date: 2009-12-20 20:36+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Afrikaans <af...@li...>\n" @@ -279,6 +279,13 @@ msgid "Roadbook" msgstr "Padkaart" +#, c-format +msgid "Waypoint %d" +msgstr "" + +msgid "Visit before..." +msgstr "" + msgid "Set as position" msgstr "Stel as posisie" @@ -416,6 +423,10 @@ msgid "Bolivia" msgstr "Bolivië" +#. 535 +msgid "Bonaire, Sint Eustatius and Saba" +msgstr "" + #. 076 msgid "Brazil" msgstr "Brasilië" @@ -504,6 +515,10 @@ msgid "Cape Verde" msgstr "Kaap Verdie" +#. 531 +msgid "Curacao" +msgstr "" + #. 162 msgid "Christmas Island" msgstr "Kerseiland" @@ -1120,6 +1135,10 @@ msgid "Suriname" msgstr "Suriname" +#. 728 +msgid "South Sudan" +msgstr "" + #. 678 msgid "Sao Tome and Principe" msgstr "Sao Tomé en Principe" @@ -1128,6 +1147,10 @@ msgid "El Salvador" msgstr "Salvador" +#. 534 +msgid "Sint Maarten (Dutch part)" +msgstr "" + #. 760 msgid "Syrian Arab Republic" msgstr "Sirië" @@ -1288,7 +1311,8 @@ "navit usage:\n" "navit [options] [configfile]\n" "\t-c <file>: use <file> as config file\n" -"\t-d <n>: set the global debug output level to <n> (0-3).\n" +"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting " +"from config file.\n" "\t-h: print this usage info and exit.\n" "\t-v: Print the version and exit.\n" msgstr "" @@ -1305,7 +1329,8 @@ msgid "Using config file '%s'\n" msgstr "" -msgid "Internal initialization failed, exiting\n" +msgid "" +"Internal initialization failed, exiting. Check previous error messages.\n" msgstr "" msgid "unknown street" @@ -1503,31 +1528,16 @@ msgid "Route 0000km 0+00:00 ETA" msgstr "Roete 0000km 0+00:00 aankomstyd" -msgid "Back to map" -msgstr "Terug kaart toe" - -msgid "Main Menu" -msgstr "Hoofkieslys" - msgid "Help" msgstr "Hulp" -msgid "Back" -msgstr "Terug" - -msgid "Add Bookmark" +#, c-format +msgid "Waypoint %s" msgstr "" -#. Adds the Bookmark folders -msgid "Add Bookmark folder" +msgid "Select waypoint to insert the new one before" msgstr "" -msgid "Rename" -msgstr "" - -msgid "POIs" -msgstr "Belangpunte" - msgid "View in Browser" msgstr "Besigtig in blaaier" @@ -1546,6 +1556,9 @@ msgid "Set as position (and deactivate vehicle)" msgstr "" +msgid "POIs" +msgstr "Belangpunte" + msgid "View on map" msgstr "Beloer op kaart" @@ -1570,6 +1583,9 @@ msgid "Delete Bookmark" msgstr "" +msgid "Delete waypoint" +msgstr "" + msgid "Bookmarks" msgstr "Boekmerke" @@ -1579,12 +1595,16 @@ msgid "Save waypoints" msgstr "" -msgid "Replace Waypoints" +msgid "Replace with waypoints" msgstr "" msgid "Delete Folder" msgstr "" +#. Adds the Bookmark folders +msgid "Add Bookmark folder" +msgstr "" + #. Pastes the Bookmark msgid "Paste bookmark" msgstr "" @@ -1593,18 +1613,6 @@ msgid "Bookmark %s" msgstr "Boekmerk %s" -msgid "Former Destinations" -msgstr "Voorige bestemmings" - -msgid "- No former destinations available -" -msgstr "" - -msgid "House number" -msgstr "Huis Nommer" - -msgid "Layout" -msgstr "Uitleg" - #, c-format msgid "Download %s" msgstr "" @@ -1621,9 +1629,6 @@ msgid "Download completely" msgstr "" -msgid "Maps" -msgstr "Kaarte" - msgid "Show Satellite Status" msgstr "Wys Satelliet Inligting" @@ -1662,6 +1667,44 @@ msgid "Show NMEA data" msgstr "Wys NMEA data" +msgid "Add Bookmark" +msgstr "" + +msgid "Rename" +msgstr "" + +msgid "About Navit" +msgstr "" + +#. Authors +msgid "By" +msgstr "" + +#. Contributors +msgid "And all the Navit Team" +msgstr "" + +msgid "members and contributors." +msgstr "" + +msgid "Waypoints" +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 "Longitude Latitude" +msgstr "" + +msgid "Enter coordinates, for example:" +msgstr "" + msgid "Vehicle" msgstr "Voertuig" @@ -1680,36 +1723,46 @@ msgid "Plan with Waypoints" msgstr "" -msgid "Message" -msgstr "Boodskap" +msgid "Maps" +msgstr "Kaarte" -msgid "Next" -msgstr "" +msgid "Layout" +msgstr "Uitleg" -msgid "Prev" -msgstr "" +msgid "Height Profile" +msgstr "Hoë profiel" msgid "Route Description" msgstr "" -msgid "Height Profile" -msgstr "Hoë profiel" - msgid "Show Locale" msgstr "" -msgid "About Navit" -msgstr "" +msgid "Former Destinations" +msgstr "Voorige bestemmings" -#. Authors -msgid "By" +msgid "- No former destinations available -" msgstr "" -#. Contributors -msgid "And all the Navit Team" +msgid "Message" +msgstr "Boodskap" + +msgid "Back" +msgstr "Terug" + +msgid "Back to map" +msgstr "Terug kaart toe" + +msgid "Main Menu" +msgstr "Hoofkieslys" + +msgid "House number" +msgstr "Huis Nommer" + +msgid "Next" msgstr "" -msgid "members and contributors." +msgid "Prev" msgstr "" msgid "Return to route!" @@ -1788,12 +1841,21 @@ "Waypoint" msgstr "" +msgid "Satellite Status" +msgstr "" + +msgid "NMEA Data" +msgstr "" + msgid "car_shortest" msgstr "" msgid "car_avoid_tolls" msgstr "" +msgid "car_pedantic" +msgstr "" + msgid "horse" msgstr "" Modified: trunk/navit/po/ar.po.in =================================================================== --- trunk/navit/po/ar.po.in 2013-04-28 20:52:44 UTC (rev 5463) +++ trunk/navit/po/ar.po.in 2013-05-01 22:17:27 UTC (rev 5464) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-23 20:16+0200\n" +"POT-Creation-Date: 2013-04-22 18:30+0200\n" "PO-Revision-Date: 2010-02-01 17:37+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Arabic <ar...@li...>\n" @@ -296,6 +296,13 @@ msgid "Roadbook" msgstr "سجل خريطة الطريق" +#, c-format +msgid "Waypoint %d" +msgstr "" + +msgid "Visit before..." +msgstr "" + msgid "Set as position" msgstr "عين كموقع حالي" @@ -433,6 +440,10 @@ msgid "Bolivia" msgstr "بوليفيا" +#. 535 +msgid "Bonaire, Sint Eustatius and Saba" +msgstr "" + #. 076 msgid "Brazil" msgstr "البرازيل" @@ -521,6 +532,10 @@ msgid "Cape Verde" msgstr "الرأس الاخضر كاب فيردي" +#. 531 +msgid "Curacao" +msgstr "" + #. 162 msgid "Christmas Island" msgstr "جزر الكريسماس" @@ -1137,6 +1152,10 @@ msgid "Suriname" msgstr "سورينام" +#. 728 +msgid "South Sudan" +msgstr "" + #. 678 msgid "Sao Tome and Principe" msgstr "ساو تومي وبرينسيبي" @@ -1145,6 +1164,10 @@ msgid "El Salvador" msgstr "السلفادور" +#. 534 +msgid "Sint Maarten (Dutch part)" +msgstr "" + #. 760 msgid "Syrian Arab Republic" msgstr "الجمهوريّة العربيّة السّوريّة" @@ -1305,7 +1328,8 @@ "navit usage:\n" "navit [options] [configfile]\n" "\t-c <file>: use <file> as config file\n" -"\t-d <n>: set the global debug output level to <n> (0-3).\n" +"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting " +"from config file.\n" "\t-h: print this usage info and exit.\n" "\t-v: Print the version and exit.\n" msgstr "" @@ -1322,7 +1346,8 @@ msgid "Using config file '%s'\n" msgstr "" -msgid "Internal initialization failed, exiting\n" +msgid "" +"Internal initialization failed, exiting. Check previous error messages.\n" msgstr "" msgid "unknown street" @@ -1520,31 +1545,16 @@ msgid "Route 0000km 0+00:00 ETA" msgstr "الطريك 0000كلم 0+00:00 ETA" -msgid "Back to map" -msgstr "إرجع إلى الخريطة" - -msgid "Main Menu" -msgstr "اللائحة الرئيسية" - msgid "Help" msgstr "المساعدة" -msgid "Back" -msgstr "السابق" - -msgid "Add Bookmark" -msgstr "أضف إشارة مرجعية" - -#. Adds the Bookmark folders -msgid "Add Bookmark folder" +#, c-format +msgid "Waypoint %s" msgstr "" -msgid "Rename" +msgid "Select waypoint to insert the new one before" msgstr "" -msgid "POIs" -msgstr "مواقع ذات أهمية" - msgid "View in Browser" msgstr "أعرض في المتصفح" @@ -1563,6 +1573,9 @@ msgid "Set as position (and deactivate vehicle)" msgstr "" +msgid "POIs" +msgstr "مواقع ذات أهمية" + msgid "View on map" msgstr "أعرض على الخريطة" @@ -1587,6 +1600,9 @@ msgid "Delete Bookmark" msgstr "" +msgid "Delete waypoint" +msgstr "" + msgid "Bookmarks" msgstr "إشارات مرجعية" @@ -1596,12 +1612,16 @@ msgid "Save waypoints" msgstr "" -msgid "Replace Waypoints" +msgid "Replace with waypoints" msgstr "" msgid "Delete Folder" msgstr "" +#. Adds the Bookmark folders +msgid "Add Bookmark folder" +msgstr "" + #. Pastes the Bookmark msgid "Paste bookmark" msgstr "" @@ -1610,18 +1630,6 @@ msgid "Bookmark %s" msgstr "علّم %s كإشارة مرجعية" -msgid "Former Destinations" -msgstr "الأهداف السابقة" - -msgid "- No former destinations available -" -msgstr "" - -msgid "House number" -msgstr "رقم المنزل" - -msgid "Layout" -msgstr "التصميم" - #, c-format msgid "Download %s" msgstr "" @@ -1638,9 +1646,6 @@ msgid "Download completely" msgstr "" -msgid "Maps" -msgstr "الخرائط" - msgid "Show Satellite Status" msgstr "أعرض حالة القمر الإسطناعي" @@ -1679,6 +1684,44 @@ msgid "Show NMEA data" msgstr "أعرض المعطيات NMEA" +msgid "Add Bookmark" +msgstr "أضف إشارة مرجعية" + +msgid "Rename" +msgstr "" + +msgid "About Navit" +msgstr "" + +#. Authors +msgid "By" +msgstr "" + +#. Contributors +msgid "And all the Navit Team" +msgstr "" + +msgid "members and contributors." +msgstr "" + +msgid "Waypoints" +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 "Longitude Latitude" +msgstr "" + +msgid "Enter coordinates, for example:" +msgstr "" + msgid "Vehicle" msgstr "وسيلة التنقل" @@ -1697,36 +1740,46 @@ msgid "Plan with Waypoints" msgstr "" -msgid "Message" -msgstr "الرسالة" +msgid "Maps" +msgstr "الخرائط" -msgid "Next" -msgstr "" +msgid "Layout" +msgstr "التصميم" -msgid "Prev" -msgstr "" +msgid "Height Profile" +msgstr "لمحة عن الإرتفاع" msgid "Route Description" msgstr "وصف الطريق" -msgid "Height Profile" -msgstr "لمحة عن الإرتفاع" - msgid "Show Locale" msgstr "أعرض المحليات" -msgid "About Navit" -msgstr "" +msgid "Former Destinations" +msgstr "الأهداف السابقة" -#. Authors -msgid "By" +msgid "- No former destinations available -" msgstr "" -#. Contributors -msgid "And all the Navit Team" +msgid "Message" +msgstr "الرسالة" + +msgid "Back" +msgstr "السابق" + +msgid "Back to map" +msgstr "إرجع إلى الخريطة" + +msgid "Main Menu" +msgstr "اللائحة الرئيسية" + +msgid "House number" +msgstr "رقم المنزل" + +msgid "Next" msgstr "" -msgid "members and contributors." +msgid "Prev" msgstr "" msgid "Return to route!" @@ -1803,12 +1856,21 @@ "Waypoint" msgstr "" +msgid "Satellite Status" +msgstr "" + +msgid "NMEA Data" +msgstr "" + msgid "car_shortest" msgstr "" msgid "car_avoid_tolls" msgstr "" +msgid "car_pedantic" +msgstr "" + msgid "horse" msgstr "خيل/فرس" Modified: trunk/navit/po/ast.po.in =================================================================== --- trunk/navit/po/ast.po.in 2013-04-28 20:52:44 UTC (rev 5463) +++ trunk/navit/po/ast.po.in 2013-05-01 22:17:27 UTC (rev 5464) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-23 20:16+0200\n" +"POT-Creation-Date: 2013-04-22 18:30+0200\n" "PO-Revision-Date: 2010-05-21 17:35+0000\n" "Last-Translator: Xuacu Saturio <xua...@gm...>\n" "Language-Team: Asturian <as...@li...>\n" @@ -279,6 +279,13 @@ msgid "Roadbook" msgstr "Llibru de ruta" +#, c-format +msgid "Waypoint %d" +msgstr "" + +msgid "Visit before..." +msgstr "" + msgid "Set as position" msgstr "Conseñar como posición" @@ -416,6 +423,10 @@ msgid "Bolivia" msgstr "Bolivia" +#. 535 +msgid "Bonaire, Sint Eustatius and Saba" +msgstr "" + #. 076 msgid "Brazil" msgstr "Brasil" @@ -504,6 +515,10 @@ msgid "Cape Verde" msgstr "Cabo Verde" +#. 531 +msgid "Curacao" +msgstr "" + #. 162 msgid "Christmas Island" msgstr "Islla Christmas" @@ -1120,6 +1135,10 @@ msgid "Suriname" msgstr "Surinam" +#. 728 +msgid "South Sudan" +msgstr "" + #. 678 msgid "Sao Tome and Principe" msgstr "Santo Tomé y Príncipe" @@ -1128,6 +1147,10 @@ msgid "El Salvador" msgstr "El Salvador" +#. 534 +msgid "Sint Maarten (Dutch part)" +msgstr "" + #. 760 msgid "Syrian Arab Republic" msgstr "República Árabe de Siria" @@ -1288,7 +1311,8 @@ "navit usage:\n" "navit [options] [configfile]\n" "\t-c <file>: use <file> as config file\n" -"\t-d <n>: set the global debug output level to <n> (0-3).\n" +"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting " +"from config file.\n" "\t-h: print this usage info and exit.\n" "\t-v: Print the version and exit.\n" msgstr "" @@ -1305,7 +1329,8 @@ msgid "Using config file '%s'\n" msgstr "" -msgid "Internal initialization failed, exiting\n" +msgid "" +"Internal initialization failed, exiting. Check previous error messages.\n" msgstr "" msgid "unknown street" @@ -1503,31 +1528,16 @@ msgid "Route 0000km 0+00:00 ETA" msgstr "Ruta 0000km 0+00:00 TED" -msgid "Back to map" -msgstr "Tornar al mapa" - -msgid "Main Menu" -msgstr "Menú principal" - msgid "Help" msgstr "Aida" -msgid "Back" -msgstr "Atrás" +#, c-format +msgid "Waypoint %s" +msgstr "" -msgid "Add Bookmark" -msgstr "Amestar marcador" +msgid "Select waypoint to insert the new one before" +msgstr "" -#. Adds the Bookmark folders -msgid "Add Bookmark folder" -msgstr "Amestar carpeta de marcadores" - -msgid "Rename" -msgstr "Renomar" - -msgid "POIs" -msgstr "PDIs" - msgid "View in Browser" msgstr "Ver nel navegador" @@ -1546,6 +1556,9 @@ msgid "Set as position (and deactivate vehicle)" msgstr "" +msgid "POIs" +msgstr "PDIs" + msgid "View on map" msgstr "Ver nel mapa" @@ -1570,6 +1583,9 @@ msgid "Delete Bookmark" msgstr "Desaniciar marcador" +msgid "Delete waypoint" +msgstr "" + msgid "Bookmarks" msgstr "Marcadores" @@ -1579,12 +1595,16 @@ msgid "Save waypoints" msgstr "" -msgid "Replace Waypoints" +msgid "Replace with waypoints" msgstr "" msgid "Delete Folder" msgstr "" +#. Adds the Bookmark folders +msgid "Add Bookmark folder" +msgstr "Amestar carpeta de marcadores" + #. Pastes the Bookmark msgid "Paste bookmark" msgstr "Apegar marcador" @@ -1593,18 +1613,6 @@ msgid "Bookmark %s" msgstr "Marcador %s" -msgid "Former Destinations" -msgstr "Destinos anteriores" - -msgid "- No former destinations available -" -msgstr "" - -msgid "House number" -msgstr "Númberu de portal" - -msgid "Layout" -msgstr "Disposición" - #, c-format msgid "Download %s" msgstr "" @@ -1621,9 +1629,6 @@ msgid "Download completely" msgstr "" -msgid "Maps" -msgstr "Mapes" - msgid "Show Satellite Status" msgstr "Amosar estáu de satélite" @@ -1662,6 +1667,44 @@ msgid "Show NMEA data" msgstr "Amosar datos NMEA" +msgid "Add Bookmark" +msgstr "Amestar marcador" + +msgid "Rename" +msgstr "Renomar" + +msgid "About Navit" +msgstr "Tocante a Navit" + +#. Authors +msgid "By" +msgstr "Por" + +#. Contributors +msgid "And all the Navit Team" +msgstr "Y tou l'equipu de Navit" + +msgid "members and contributors." +msgstr "miembros y collaboradores." + +msgid "Waypoints" +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 "Longitude Latitude" +msgstr "" + +msgid "Enter coordinates, for example:" +msgstr "" + msgid "Vehicle" msgstr "Vehiculu" @@ -1680,38 +1723,48 @@ msgid "Plan with Waypoints" msgstr "" -msgid "Message" -msgstr "Mensax" +msgid "Maps" +msgstr "Mapes" -msgid "Next" -msgstr "" +msgid "Layout" +msgstr "Disposición" -msgid "Prev" -msgstr "" +msgid "Height Profile" +msgstr "Perfil d'altures" msgid "Route Description" msgstr "Descripción de ruta" -msgid "Height Profile" -msgstr "Perfil d'altures" - msgid "Show Locale" msgstr "Amosar local" -msgid "About Navit" -msgstr "Tocante a Navit" +msgid "Former Destinations" +msgstr "Destinos anteriores" -#. Authors -msgid "By" -msgstr "Por" +msgid "- No former destinations available -" +msgstr "" -#. Contributors -msgid "And all the Navit Team" -msgstr "Y tou l'equipu de Navit" +msgid "Message" +msgstr "Mensax" -msgid "members and contributors." -msgstr "miembros y collaboradores." +msgid "Back" +msgstr "Atrás" +msgid "Back to map" +msgstr "Tornar al mapa" + +msgid "Main Menu" +msgstr "Menú principal" + +msgid "House number" +msgstr "Númberu de portal" + +msgid "Next" +msgstr "" + +msgid "Prev" +msgstr "" + msgid "Return to route!" msgstr "" @@ -1788,12 +1841,21 @@ "Waypoint" msgstr "" +msgid "Satellite Status" +msgstr "" + +msgid "NMEA Data" +msgstr "" + msgid "car_shortest" msgstr "" msgid "car_avoid_tolls" msgstr "" +msgid "car_pedantic" +msgstr "" + msgid "horse" msgstr "caballu" Modified: trunk/navit/po/bg.po.in =================================================================== --- trunk/navit/po/bg.po.in 2013-04-28 20:52:44 UTC (rev 5463) +++ trunk/navit/po/bg.po.in 2013-05-01 22:17:27 UTC (rev 5464) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-23 20:16+0200\n" +"POT-Creation-Date: 2013-04-22 18:30+0200\n" "PO-Revision-Date: 2009-12-20 20:36+0000\n" "Last-Translator: Alex Stanev <al...@st...>\n" "Language-Team: Bulgarian <bg...@li...>\n" @@ -279,6 +279,13 @@ msgid "Roadbook" msgstr "Пътна книга" +#, c-format +msgid "Waypoint %d" +msgstr "" + +msgid "Visit before..." +msgstr "" + msgid "Set as position" msgstr "Установете като позиция" @@ -416,6 +423,10 @@ msgid "Bolivia" msgstr "Боливия" +#. 535 +msgid "Bonaire, Sint Eustatius and Saba" +msgstr "" + #. 076 msgid "Brazil" msgstr "Бразилия" @@ -504,6 +515,10 @@ msgid "Cape Verde" msgstr "Кейп Верде" +#. 531 +msgid "Curacao" +msgstr "" + #. 162 msgid "Christmas Island" msgstr "Коледни острови" @@ -1120,6 +1135,10 @@ msgid "Suriname" msgstr "Суринам" +#. 728 +msgid "South Sudan" +msgstr "" + #. 678 msgid "Sao Tome and Principe" msgstr "Сао Томе и Принсипи" @@ -1128,6 +1147,10 @@ msgid "El Salvador" msgstr "Ел Салвадор" +#. 534 +msgid "Sint Maarten (Dutch part)" +msgstr "" + #. 760 msgid "Syrian Arab Republic" msgstr "Сирийска Арабска Република" @@ -1288,7 +1311,8 @@ "navit usage:\n" "navit [options] [configfile]\n" "\t-c <file>: use <file> as config file\n" -"\t-d <n>: set the global debug output level to <n> (0-3).\n" +"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting " +"from config file.\n" "\t-h: print this usage info and exit.\n" "\t-v: Print the version and exit.\n" msgstr "" @@ -1305,7 +1329,8 @@ msgid "Using config file '%s'\n" msgstr "" -msgid "Internal initialization failed, exiting\n" +msgid "" +"Internal initialization failed, exiting. Check previous error messages.\n" msgstr "" msgid "unknown street" @@ -1503,31 +1528,16 @@ msgid "Route 0000km 0+00:00 ETA" msgstr "" -msgid "Back to map" -msgstr "Обратно към картата" - -msgid "Main Menu" -msgstr "Основно меню" - msgid "Help" msgstr "Помощ" -msgid "Back" -msgstr "Назад" - -msgid "Add Bookmark" +#, c-format +msgid "Waypoint %s" msgstr "" -#. Adds the Bookmark folders -msgid "Add Bookmark folder" +msgid "Select waypoint to insert the new one before" msgstr "" -msgid "Rename" -msgstr "" - -msgid "POIs" -msgstr "" - msgid "View in Browser" msgstr "Виж в Браузър" @@ -1546,6 +1556,9 @@ msgid "Set as position (and deactivate vehicle)" msgstr "" +msgid "POIs" +msgstr "" + msgid "View on map" msgstr "Виж на картата" @@ -1570,6 +1583,9 @@ msgid "Delete Bookmark" msgstr "" +msgid "Delete waypoint" +msgstr "" + msgid "Bookmarks" msgstr "Отметки" @@ -1579,12 +1595,16 @@ msgid "Save waypoints" msgstr "" -msgid "Replace Waypoints" +msgid "Replace with waypoints" msgstr "" msgid "Delete Folder" msgstr "" +#. Adds the Bookmark folders +msgid "Add Bookmark folder" +msgstr "" + #. Pastes the Bookmark msgid "Paste bookmark" msgstr "" @@ -1593,18 +1613,6 @@ msgid "Bookmark %s" msgstr "Отметка %s" -msgid "Former Destinations" -msgstr "Предишни Местоназначения" - -msgid "- No former destinations available -" -msgstr "" - -msgid "House number" -msgstr "" - -msgid "Layout" -msgstr "Изглед" - #, c-format msgid "Download %s" msgstr "" @@ -1621,9 +1629,6 @@ msgid "Download completely" msgstr "" -msgid "Maps" -msgstr "Карти" - msgid "Show Satellite Status" msgstr "Покажи Състояние на Сателити" @@ -1662,6 +1667,44 @@ msgid "Show NMEA data" msgstr "Покажи NMEA Данни" +msgid "Add Bookmark" +msgstr "" + +msgid "Rename" +msgstr "" + +msgid "About Navit" +msgstr "" + +#. Authors +msgid "By" +msgstr "" + +#. Contributors +msgid "And all the Navit Team" +msgstr "" + +msgid "members and contributors." +msgstr "" + +msgid "Waypoints" +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 "Longitude Latitude" +msgstr "" + +msgid "Enter coordinates, for example:" +msgstr "" + msgid "Vehicle" msgstr "Превозно средство" @@ -1680,36 +1723,46 @@ msgid "Plan with Waypoints" msgstr "" -msgid "Message" -msgstr "" +msgid "Maps" +msgstr "Карти" -msgid "Next" -msgstr "" +msgid "Layout" +msgstr "Изглед" -msgid "Prev" +msgid "Height Profile" msgstr "" msgid "Route Description" msgstr "" -msgid "Height Profile" +msgid "Show Locale" msgstr "" -msgid "Show Locale" +msgid "Former Destinations" +msgstr "Предишни Местоназначения" + +msgid "- No former destinations available -" msgstr "" -msgid "About Navit" +msgid "Message" msgstr "" -#. Authors -msgid "By" +msgid "Back" +msgstr "Назад" + +msgid "Back to map" +msgstr "Обратно към картата" + +msgid "Main Menu" +msgstr "Основно меню" + +msgid "House number" msgstr "" -#. Contributors -msgid "And all the Navit Team" +msgid "Next" msgstr "" -msgid "members and contributors." +msgid "Prev" msgstr "" msgid "Return to route!" @@ -1788,12 +1841,21 @@ "Waypoint" msgstr "" +msgid "Satellite Status" +msgstr "" + +msgid "NMEA Data" +msgstr "" + msgid "car_shortest" msgstr "" msgid "car_avoid_tolls" msgstr "" +msgid "car_pedantic" +msgstr "" + msgid "horse" msgstr "" Modified: trunk/navit/po/ca.po.in =================================================================== --- trunk/navit/po/ca.po.in 2013-04-28 20:52:44 UTC (rev 5463) +++ trunk/navit/po/ca.po.in 2013-05-01 22:17:27 UTC (rev 5464) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-23 20:16+0200\n" +"POT-Creation-Date: 2013-04-22 18:30+0200\n" "PO-Revision-Date: 2010-05-18 09:31+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Catalan <ca...@li...>\n" @@ -279,6 +279,13 @@ msgid "Roadbook" msgstr "" +#, c-format +msgid "Waypoint %d" +msgstr "" + +msgid "Visit before..." +msgstr "" + msgid "Set as position" msgstr "" @@ -416,6 +423,10 @@ msgid "Bolivia" msgstr "Bolívia" +#. 535 +msgid "Bonaire, Sint Eustatius and Saba" +msgstr "" + #. 076 msgid "Brazil" msgstr "Brasil" @@ -504,6 +515,10 @@ msgid "Cape Verde" msgstr "Cap Verd" +#. 531 +msgid "Curacao" +msgstr "" + #. 162 msgid "Christmas Island" msgstr "" @@ -1120,6 +1135,10 @@ msgid "Suriname" msgstr "" +#. 728 +msgid "South Sudan" +msgstr "" + #. 678 msgid "Sao Tome and Principe" msgstr "" @@ -1128,6 +1147,10 @@ msgid "El Salvador" msgstr "El Salvador" +#. 534 +msgid "Sint Maarten (Dutch part)" +msgstr "" + #. 760 msgid "Syrian Arab Republic" msgstr "Síria" @@ -1288,7 +1311,8 @@ "navit usage:\n" "navit [options] [configfile]\n" "\t-c <file>: use <file> as config file\n" -"\t-d <n>: set the global debug output level to <n> (0-3).\n" +"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting " +"from config file.\n" "\t-h: print this usage info and exit.\n" "\t-v: Print the version and exit.\n" msgstr "" @@ -1305,7 +1329,8 @@ msgid "Using config file '%s'\n" msgstr "" -msgid "Internal initialization failed, exiting\n" +msgid "" +"Internal initialization failed, exiting. Check previous error messages.\n" msgstr "" msgid "unknown street" @@ -1503,31 +1528,16 @@ msgid "Route 0000km 0+00:00 ETA" msgstr "" -msgid "Back to map" -msgstr "Torna al mapa" - -msgid "Main Menu" -msgstr "Menú principal" - msgid "Help" msgstr "Ajuda" -msgid "Back" -msgstr "Enrere" - -msgid "Add Bookmark" +#, c-format +msgid "Waypoint %s" msgstr "" -#. Adds the Bookmark folders -msgid "Add Bookmark folder" +msgid "Select waypoint to insert the new one before" msgstr "" -msgid "Rename" -msgstr "" - -msgid "POIs" -msgstr "Punts d'interès" - msgid "View in Browser" msgstr "Visualitza al navegador" @@ -1546,6 +1556,9 @@ msgid "Set as position (and deactivate vehicle)" msgstr "" +msgid "POIs" +msgstr "Punts d'interès" + msgid "View on map" msgstr "Visualitza al mapa" @@ -1570,6 +1583,9 @@ msgid "Delete Bookmark" msgstr "" +msgid "Delete waypoint" +msgstr "" + msgid "Bookmarks" msgstr "" @@ -1579,12 +1595,16 @@ msgid "Save waypoints" msgstr "" -msgid "Replace Waypoints" +msgid "Replace with waypoints" msgstr "" msgid "Delete Folder" msgstr "" +#. Adds the Bookmark folders +msgid "Add Bookmark folder" +msgstr "" + #. Pastes the Bookmark msgid "Paste bookmark" msgstr "" @@ -1593,18 +1613,6 @@ msgid "Bookmark %s" msgstr "Afegeix %s a les adreces d'interès" -msgid "Former Destinations" -msgstr "Destinacions anteriors" - -msgid "- No former destinations available -" -msgstr "" - -msgid "House number" -msgstr "Número de casa/portal" - -msgid "Layout" -msgstr "Disposició" - #, c-format msgid "Download %s" msgstr "" @@ -1621,9 +1629,6 @@ msgid "Download completely" msgstr "" -msgid "Maps" -msgstr "Mapes" - msgid "Show Satellite Status" msgstr "Mostra l'estat del satèl·lit" @@ -1662,6 +1667,44 @@ msgid "Show NMEA data" msgstr "Mostra les dades NMEA" +msgid "Add Bookmark" +msgstr "" + +msgid "Rename" +msgstr "" + +msgid "About Navit" +msgstr "" + +#. Authors +msgid "By" +msgstr "" + +#. Contributors +msgid "And all the Navit Team" +msgstr "" + +msgid "members and contributors." +msgstr "" + +msgid "Waypoints" +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 "Longitude Latitude" +msgstr "" + +msgid "Enter coordinates, for example:" +msgstr "" + msgid "Vehicle" msgstr "Vehicle" @@ -1680,36 +1723,46 @@ msgid "Plan with Waypoints" msgstr "" -msgid "Message" -msgstr "Missatge" +msgid "Maps" +msgstr "Mapes" -msgid "Next" -msgstr "" +msgid "Layout" +msgstr "Disposició" -msgid "Prev" +msgid "Height Profile" msgstr "" msgid "Route Description" msgstr "Descripció de la ruta" -msgid "Height Profile" -msgstr "" - msgid "Show Locale" msgstr "" -msgid "About Navit" -msgstr "" +msgid "Former Destinations" +msgstr "Destinacions anteriors" -#. Authors -msgid "By" +msgid "- No former destinations available -" msgstr "" -#. Contributors -msgid "And all the Navit Team" +msgid "Message" +msgstr "Missatge" + +msgid "Back" +msgstr "Enrere" + +msgid "Back to map" +msgstr "Torna al mapa" + +msgid "Main Menu" +msgstr "Menú principal" + +msgid "House number" +msgstr "Número de casa/portal" + +msgid "Next" msgstr "" -msgid "members and contributors." +msgid "Prev" msgstr "" msgid "Return to route!" @@ -1788,12 +1841,21 @@ "Waypoint" msgstr "" +msgid "Satellite Status" +msgstr "" + +msgid "NMEA Data" +msgstr "" + msgid "car_shortest" msgstr "" msgid "car_avoid_tolls" msgstr "" +msgid "car_pedantic" +msgstr "" + msgid "horse" msgstr "cavall" Modified: trunk/navit/po/cs.po.in =================================================================== --- trunk/navit/po/cs.po.in 2013-04-28 20:52:44 UTC (rev 5463) +++ trunk/navit/po/cs.po.in 2013-05-01 22:17:27 UTC (rev 5464) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-23 20:16+0200\n" +"POT-Creation-Date: 2013-04-22 18:30+0200\n" "PO-Revision-Date: 2010-06-18 19:02+0000\n" "Last-Translator: Vladimír Burian <vla...@em...>\n" "Language-Team: Čeština\n" @@ -283,6 +283,13 @@ msgid "Roadbook" msgstr "Itinerář" +#, c-format +msgid "Waypoint %d" +msgstr "" + +msgid "Visit before..." +msgstr "" + msgid "Set as position" msgstr "Použít jako pozici" @@ -420,6 +427,10 @@ msgid "Bolivia" msgstr "Bolívie" +#. 535 +msgid "Bonaire, Sint Eustatius and Saba" +msgstr "" + #. 076 msgid "Brazil" msgstr "Brazílie" @@ -508,6 +519,10 @@ msgid "Cape Verde" msgstr "Kapverdy" +#. 531 +msgid "Curacao" +msgstr "" + #. 162 msgid "Christmas Island" msgstr "Vánoční ostrov" @@ -1124,6 +1139,10 @@ msgid "Suriname" msgstr "Surinam" +#. 728 +msgid "South Sudan" +msgstr "" + #. 678 msgid "Sao Tome and Principe" msgstr "Svatý Tomáš a Princův ostrov" @@ -1132,6 +1151,10 @@ msgid "El Salvador" msgstr "Salvádor" +#. 534 +msgid "Sint Maarten (Dutch part)" +msgstr "" + #. 760 msgid "Syrian Arab Republic" msgstr "Syrská arabská republika" @@ -1292,7 +1315,8 @@ "navit usage:\n" "navit [options] [configfile]\n" "\t-c <file>: use <file> as config file\n" -"\t-d <n>: set the global debug output level to <n> (0-3).\n" +"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting " +"from config file.\n" "\t-h: print this usage info and exit.\n" "\t-v: Print the version and exit.\n" msgstr "" @@ -1309,7 +1333,8 @@ msgid "Using config file '%s'\n" msgstr "" -msgid "Internal initialization failed, exiting\n" +msgid "" +"Internal initialization failed, exiting. Check previous error messages.\n" msgstr "" msgid "unknown street" @@ -1507,31 +1532,16 @@ msgid "Route 0000km 0+00:00 ETA" msgstr "Trasa 0000km 0+00:00 ETA" -msgid "Back to map" -msgstr "Zpět na mapu" - -msgid "Main Menu" -msgstr "Hlavní menu" - msgid "Help" msgstr "Nápověda" -msgid "Back" -msgstr "Zpět" +#, c-format +msgid "Waypoint %s" +msgstr "" -msgid "Add Bookmark" -msgstr "Přidat značku" +msgid "Select waypoint to insert the new one before" +msgstr "" -#. Adds the Bookmark folders -msgid "Add Bookmark folder" -msgstr "Přidat složku záložek" - -msgid "Rename" -msgstr "Přejmenovat" - -msgid "POIs" -msgstr "Body zájmu" - msgid "View in Browser" msgstr "Zobrazit v prohlížeči" @@ -1550,6 +1560,9 @@ msgid "Set as position (and deactivate vehicle)" msgstr "" +msgid "POIs" +msgstr "Body zájmu" + msgid "View on map" msgstr "Zobrazit na mapě" @@ -1574,6 +1587,9 @@ msgid "Delete Bookmark" msgstr "Smazat záložku" +msgid "Delete waypoint" +msgstr "" + msgid "Bookmarks" msgstr "Záložky" @@ -1583,12 +1599,16 @@ msgid "Save waypoints" msgstr "" -msgid "Replace Waypoints" +msgid "Replace with waypoints" msgstr "" msgid "Delete Folder" msgstr "" +#. Adds the Bookmark folders +msgid "Add Bookmark folder" +msgstr "Přidat složku záložek" + #. Pastes the Bookmark msgid "Paste bookmark" msgstr "Vložit záložku" @@ -1597,18 +1617,6 @@ msgid "Bookmark %s" msgstr "Záložka %s" -msgid "Former Destinations" -msgstr "Minulé cíle" - -msgid "- No former destinations available -" -msgstr "" - -msgid "House number" -msgstr "Číslo domu" - -msgid "Layout" -msgstr "Rozvržení" - #, c-format msgid "Download %s" msgstr "" @@ -1625,9 +1633,6 @@ msgid "Download completely" msgstr "" -msgid "Maps" -msgstr "Mapy" - msgid "Show Satellite Status" msgstr "Ukázat stav satelitu" @@ -1666,6 +1671,44 @@ msgid "Show NMEA data" msgstr "Ukázat NMEA data" +msgid "Add Bookmark" +msgstr "Přidat značku" + +msgid "Rename" +msgstr "Přejmenovat" + +msgid "About Navit" +msgstr "O Navitu" + +#. Authors +msgid "By" +msgstr "Od" + +#. Contributors +msgid "And all the Navit Team" +msgstr "A další z Navit týmu" + +msgid "members and contributors." +msgstr "členové a přispívající" + +msgid "Waypoints" +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 "Longitude Latitude" +msgstr "" + +msgid "Enter coordinates, for example:" +msgstr "" + msgid "Vehicle" msgstr "Vozidlo" @@ -1684,38 +1727,48 @@ msgid "Plan with Waypoints" msgstr "" -msgid "Message" -msgstr "Zpráva" +msgid "Maps" +msgstr "Mapy" -msgid "Next" -msgstr "" +msgid "Layout" +msgstr "Rozvržení" -msgid "Prev" -msgstr "" +msgid "Height Profile" +msgstr "Výška profilu" msgid "Route Description" msgstr "Popis trasy" -msgid "Height Profile" -msgstr "Výška profilu" - msgid "Show Locale" msgstr "Zobrazit jazyk" -msgid "About Navit" -msgstr "O Navitu" +msgid "Former Destinations" +msgstr "Minulé cíle" -#. Authors -msgid "By" -msgstr "Od" +msgid "- No former destinations available -" +msgstr "" -#. Contributors -msgid "And all the Navit Team" -msgstr "A další z Navit týmu" +msgid "Message" +msgstr "Zpráva" -msgid "members and contributors." -msgstr "členové a přispívající" +msgid "Back" +msgstr "Zpět" +msgid "Back to map" +msgstr "Zpět na mapu" + +msgid "Main Menu" +msgstr "Hlavní menu" + +msgid "House number" +msgstr "Číslo domu" + +msgid "Next" +msgstr "" + +msgid "Prev" +msgstr "" + msgid "Return to route!" msgstr "" @@ -1792,12 +1845,21 @@ "Waypoint" msgstr "" +msgid "Satellite Status" +msgstr "" + +msgid "NMEA Data" +msgstr "" + msgid "car_shortest" msgstr "" msgid "car_avoid_tolls" msgstr "" +msgid "car_pedantic" +msgstr "" + msgid "horse" msgstr "kůň" Modified: trunk/navit/po/da.po.in =================================================================== --- trunk/navit/po/da.po.in 2013-04-28 20:52:44 UTC (rev 5463) +++ trunk/navit/po/da.po.in 2013-05-01 22:17:27 UTC (rev 5464) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-23 20:16+0200\n" +"POT-Creation-Date: 2013-04-22 18:30+0200\n" "PO-Revision-Date: 2010-05-18 09:31+0000\n" "Last-Translator: Lasse Luttermann <lut...@si...>\n" "Language-Team: Glenn Sommer <gl...@gm...>\n" @@ -279,6 +279,13 @@ msgid "Roadbook" msgstr "Vejbog" +#, c-format +msgid "Waypoint %d" +msgstr "" + +msgid "Visit before..." +msgstr "" + msgid "Set as position" msgstr "Sæt som position" @@ -416,6 +423,10 @@ msgid "Bolivia" msgstr "Bolivia" +#. 535 +msgid "Bonaire, Sint Eustatius and Saba" +msgstr "" + #. 076 msgid "Brazil" msgstr "Brasilien" @@ -504,6 +515,10 @@ msgid "Cape Verde" msgstr "Kap Verde" +#. 531 +msgid "Curacao" +msgstr "" + #. 162 msgid "Christmas Island" msgstr "Christmas Island (Indiske Ocean)" @@ -1120,6 +1135,10 @@ msgid "Suriname" msgstr "Surinam" +#. 728 +msgid "South Sudan" +msgstr "" + #. 678 msgid "Sao Tome and Principe" msgstr "São Tomé og Príncipe" @@ -1128,6 +1147,10 @@ msgid "El Salvador" msgstr "El Salvador" +#. 534 +msgid "Sint Maarten (Dutch part)" +msgstr "" + #. 760 msgid "Syrian Arab Republic" msgstr "Den arabiske republik Syrien" @@ -1288,7 +1311,8 @@ "navit usage:\n" "navit [options] [configfile]\n" "\t-c <file>: use <file> as config file\n" -"\t-d <n>: set the global debug output level to <n> (0-3).\n" +"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting " +"from config file.\n" "\t-h: print this usage info and exit.\n" "\t-v: Print the version and exit.\n" msgstr "" @@ -1305,7 +1329,8 @@ msgid "Using config file '%s'\n" msgstr "" -msgid "Internal initialization failed, exiting\n" +msgid "" +"Internal initialization failed, exiting. Check previous error messages.\n" msgstr "" msgid "unknown street" @@ -1503,31 +1528,16 @@ msgid "Route 0000km 0+00:00 ETA" msgstr "Rute 0000km 0+00:00 ETA" -msgid "Back to map" -msgstr "Tilbage til kort" - -msgid "Main Menu" -msgstr "Hovedmenu" - msgid "Help" msgstr "Hjælp" -msgid "Back" -msgstr "Tilbage" - -msgid "Add Bookmark" -msgstr "Tilføj Bogmærke" - -#. Adds the Bookmark folders -msgid "Add Bookmark folder" +#, c-format +msgid "Waypoint %s" msgstr "" -msgid "Rename" +msgid "Select waypoint to insert the new one before" msgstr "" -msgid "POIs" -msgstr "POI" - msgid "View in Browser" msgstr "Vis i Browser" @@ -1546,6 +1556,9 @@ msgid "Set as position (and deactivate vehicle)" msgstr "" +msgid "POIs" +msgstr "POI" + msgid "View on map" msgstr "Vis på kort" @@ -1570,6 +1583,9 @@ msgid "Delete Bookmark" msgstr "" +msgid "Delete waypoint" +msgstr "" + msgid "Bookmarks" msgstr "Bogmærker" @@ -1579,12 +1595,16 @@ msgid "Save waypoints" msgstr "" -msgid "Replace Waypoints" +msgid "Replace with waypoints" msgstr "" msgid "Delete Folder" msgstr "" +#. Adds the Bookmark folders +msgid "Add Bookmark folder" +msgstr "" + #. Pastes the Bookmark msgid "Paste bookmark" msgstr "" @@ -1593,18 +1613,6 @@ msgid "Bookmark %s" msgstr "Bogmærke %s" -msgid "Former Destinations" -msgstr "Tidligere destinationer" - -msgid "- No former destinations available -" -msgstr "" - -msgid "House number" -msgstr "Husnummer" - -msgid "Layout" -msgstr "Layout" - #, c-format msgid "Download %s" msgstr "" @@ -1621,9 +1629,6 @@ msgid "Download completely" msgstr "" -msgid "Maps" -msgstr "Kort" - msgid "Show Satellite Status" msgstr "Vis satellit status" @@ -1662,6 +1667,44 @@ msgid "Show NMEA data" msgstr "Vis NMEA data" +msgid "Add Bookmark" +msgstr "Tilføj Bogmærke" + +msgid "Rename" +msgstr "" + +msgid "About Navit" +msgstr "" + +#. Authors +msgid "By" +msgstr "" + +#. Contributors +msgid "And all the Navit Team" +msgstr "" + +msgid "members and contributors." +msgstr "" + +msgid "Waypoints" +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 "Longitude Latitude" +msgstr "" + +msgid "Enter coordinates, for example:" +msgstr "" + msgid "Vehicle" msgstr "Køretøj" @@ -1680,36 +1723,46 @@ msgid "Plan with Waypoints" msgstr "" -msgid "Message" -msgstr "Meddelelse" +msgid "Maps" +msgstr "Kort" -msgid "Next" -msgstr "" +msgid "Layout" +msgstr "Layout" -msgid "Prev" -msgstr "" +msgid "Height Profile" +msgstr "Lodret profil" msgid "Route Description" msgstr "Route Beskrivelse" -msgid "Height Profile" -msgstr "Lodret profil" - msgid "Show Locale" msgstr "Vis Lokale" -msgid "About Navit" -msgstr "" +msgid "Former Destinations" +msgstr "Tidligere destinationer" -#. Authors -msgid "By" +msgid "- No former destinations available -" msgstr "" -#. Contributors -msgid "And all the Navit Team" +msgid "Message" +msgstr "Meddelelse" + +msgid "Back" +msgstr "Tilbage" + +msgid "Back to map" +msgstr "Tilbage til kort" + +msgid "Main Menu" +msgstr "Hovedmenu" + +msgid "House number" +msgstr "Husnummer" + +msgid "Next" msgstr "" -msgid "members and contributors." +msgid "Prev" msgstr "" msgid "Return to route!" @@ -1788,12 +1841,21 @@ "Waypoint" msgstr "" +msgid "Satellite Status" +msgstr "" + +msgid "NMEA Data" +msgstr "" + msgid "car_shortest" msgstr "" msgid "car_avoid_tolls" msgstr "" +msgid "car_pedantic" +msgstr "" + msgid "horse" msgstr "hest" Modified: trunk/navit/po/de.po.in =================================================================== --- trunk/navit/po/de.po.in 2013-04-28 20:52:44 UTC (rev 5463) +++ trunk/navit/po/de.po.in 2013-05-01 22:17:27 UTC (rev 5464) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-25 23:17+0100\n" +"POT-Creation-Date: 2013-04-22 18:30+0200\n" "PO-Revision-Date: 2010-06-01 22:09+0000\n" "Last-Translator: Achim Behrens <Unknown>\n" "Language-Team: Martin Schaller <mar...@so...>\n" @@ -281,6 +281,13 @@ msgid "Roadbook" msgstr "Wegbeschreibung" +#, c-format +msgid "Waypoint %d" +msgstr "Wegpunkt %d" + +msgid "Visit before..." +msgstr "Als Wegpunkt setzen vor..." + msgid "Set as position" msgstr "Als Position setzen" @@ -1316,8 +1323,8 @@ "navit Benutzung:\n" "navit [Optionen] [Konfigdatei]\n" "\t-c <file>: <file> als Konfigdatei benutzen\n" -"\t-d <n>: Den globalen Debug-Level auf <n> (0-3) setzen. Überschreibt die Einstellung " -"aus der Konfigurationsdatei.\n" +"\t-d <n>: Den globalen Debug-Level auf <n> (0-3) setzen. Überschreibt die " +"Einstellung aus der Konfigurationsdatei.\n" "\t-h: Diesen Text ausgeben und das Programm beenden.\n" "\t-v: Die Version ausgeben und das Programm beenden.\n" @@ -1336,7 +1343,8 @@ msgid "" "Internal initialization failed, exiting. Check previous error messages.\n" msgstr "" -"Interne Initialisierung fehlgeschlagen, Programm wird beendet. Frühere Fehler beachten.\n" +"Interne Initialisierung fehlgeschlagen, Programm wird beendet. Frühere " +"Fehler beachten.\n" msgid "unknown street" msgstr "unbekannte Straße" @@ -1344,7 +1352,8 @@ msgid "Failed to write bookmarks file" msgstr "Lesezeichen-Datei konnte nicht geschrieben werden" -msgid "Map point" +#. Strings from navit_shipped.xml +msgid "Map Point" msgstr "Kartenpunkt" msgid "Car" @@ -1559,9 +1568,6 @@ msgid "View Attributes" msgstr "Attribute anzeigen" -msgid "Visit before..." -msgstr "Als Wegpunkt setzen vor..." - msgid "Set as position (and deactivate vehicle)" msgstr "Als Position setzen (und Fahrzeug deaktivieren)" @@ -1785,10 +1791,6 @@ msgid "Please decrease your speed" msgstr "Bitte Geschwindigkeit verringern" -#. Strings from navit_shipped.xml -msgid "Map Point" -msgstr "Kartenpunkt" - msgid "Vehicle Position" msgstr "Fahrzeugposition" @@ -1902,9 +1904,3 @@ #. msgid "Truck" msgstr "LKW" - -#~ msgid "Internal initialization failed, exiting\n" -#~ msgstr "Interne Initialisierung fehlgeschlagen, Programm wird beendet\n" - -#~ msgid "Replace Waypoints" -#~ msgstr "Wegpunkte ersetzen" Modified: trunk/navit/po/de_CH.po.in =================================================================== --- trunk/navit/po/de_CH.po.in 2013-04-28 20:52:44 UTC (rev 5463) +++ trunk/navit/po/de_CH.po.in 2013-05-01 22:17:27 UTC (rev 5464) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-23 20:16+0200\n" +"POT-Creation-Date: 2013-04-22 18:30+0200\n" "PO-Revision-Date: 2010-05-18 08:49+0000\n" "Last-Translator: \n" "Language-Team: German (Switzerland) <de...@li...>\n" @@ -278,6 +278,13 @@ msgid "Roadbook" msgstr "" +#, c-format +msgid "Waypoint %d" +msgstr "" + +msgid "Visit before..." +msgstr "" + msgid "Set as position" msgstr "" @@ -415,6 +422,10 @@ msgid "Bolivia" msgstr "" +#. 535 +msgid "Bonaire, Sint Eustatius and Saba" +msgstr "" + #. 076 msgid "Brazil" msgstr "" @@ -503,6 +514,10 @@ msgid "Cape Verde" msgstr "" +#. 531 +msgid "Curacao" +msgstr "" + #. 162 msgid "Christmas Island" msgstr "" @@ -1119,6 +1134,10 @@ msgid "Suriname" msgstr "" +#. 728 +msgid "South Sudan" +msgstr "" + #. 678 msgid "Sao Tome and Principe" msgstr "" @@ -1127,6 +1146,10 @@ msgid "El Salvador" msgstr "" +#. 534 +msgid "Sint Maarten (Dutch part)" +msgstr "" + #. 760 msgid "Syrian Arab Republic" msgstr "" @@ -1287,7 +1310,8 @@ "navit usage:\n" "navit [options] [configfile]\n" "\t-c <file>: use <file> as config file\n" -"\t-d <n>: set the global debug output level to <n> (0-3).\n" +"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting " +"from config file.\n" "\t-h: print this usage info and exit.\n" "\t-v: Print the version and exit.\n" msgstr "" @@ -1304,7 +1328,8 @@ msgid "Using config file '%s'\n" msgstr "" -msgid "Internal initialization failed, exiting\n" +msgid "" +"Internal initialization failed, exiting. Check previous error messages.\n" msgstr "" msgid "unknown street" @@ -1502,31 +1527,16 @@ msgid "Route 0000km 0+00:00 ETA" msgstr "" -msgid "Back to map" -msgstr "" - -msgid "Main Menu" -msgstr "" - msgid "Help" msgstr "" -msgid "Back" +#, c-format +msgid "Waypoint %s" msgstr "" -msgid "Add Bookmark" +msgid "Select waypoint to insert the new one before" msgstr "" -#. Adds the Bookmark folders -msgid "Add Bookmark folder" -msgstr "" - -msgid "Rename" -msgstr "" - -msgid "POIs" -msgstr "" - msgid "View in Browser" msgstr "" @@ -1545,6 +1555,9 @@ msgid "Set as position (and deactivate vehicle)" msgstr "" +msgid "POIs" +msgstr "" + msgid "View on map" msgstr "" @@ -1569,6 +1582,9 @@ msgid "Delete Bookmark" msgstr "" +msgid "Delete waypoint" +msgstr "" + msgid "Bookmarks" msgstr "" @@ -1578,12 +1594,16 @@ msgid "Save waypoints" msgstr "" -msgid "Replace Waypoints" +msgid "Replace with waypoints" msgstr "" msgid "Delete Folder" msgstr "" +#. Adds the Bookmark folders +msgid "Add Bookmark folder" +msgstr "" + #. Pastes the Bookmark msgid "Paste bookmark" msgstr "" @@ -1592,18 +1612,6 @@ msgid "Bookmark %s" msgstr "" -msgid "Former Destinations" -msgstr "" - -msgid "- No former destinations available -" -msgstr "" - -msgid "House number" -msgstr "" - -msgid "Layout" -msgstr "" - #, c-format msgid "Download %s" msgstr "" @@ -1620,9 +1628,6 @@ msgid "Download completely" msgstr "" -msgid "Maps" -msgstr "" - msgid "Show Satellite Status" msgstr "" @@ -1661,6 +1666,44 @@ msgid "Show NMEA data" msgstr "" +msgid "Add Bookmark" +msgstr "" + +msgid "Rename" +msgstr "" + +msgid "About Navit" +msgstr "" + +#. Authors +msgid "By" +msgstr "" + +#. Contributors +msgid "And all the Navit Team" +msgstr "" + +msgid "members and contributors." +msgstr "" + +msgid "Waypoints" +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 "Longitude Latitude" +msgstr "" + +msgid "Enter coordinates, for example:" +msgstr "" + msgid "Vehicle" msgstr "" @@ -1679,38 +1722,48 @@ msgid "Plan with Waypoints" msgstr "" -msgid "Message" +msgid "Maps" msgstr "" -msgid "Next" +msgid "Layout" msgstr "" -msgid "Prev" +msgid "Height Profile" msgstr "" msgid "Route Description" msgstr "" -msgid "Height Profile" +msgid "Show Locale" msgstr "" -msgid "Show Locale" +msgid "Former Destinations" msgstr "" -msgid "About Navit" +msgid "- No former destinations available -" msgstr "" -#. Authors -msgid "By" +msgid "Message" msgstr "" -#. Contributors -msgid "And all the Navit Team" +msgid "Back" msgstr "" -msgid "members and contributors." +msgid "Back to map" msgstr "" +msgid "Main Menu" +msgstr "" + +msgid "House number" +msgstr "" + +msgid "Next" +msgstr "" + +msgid "Prev" +msgstr "" + msgid "Return to route!" msgstr "" @@ -1783,12 +1836,21 @@ "Waypoint" msgstr "" +msgid "Satellite Status" +msgstr "" + +msgid "NMEA Data" +msgstr "" + msgid "car_shortest" msgstr "" msgid "car_avoid_tolls" msgstr "" +msgid "car_pedantic" +msgstr "" + msgid "horse" msgstr "" Modified: trunk/navit/po/el.po.in =================================================================== --- trunk/navit/po/el.po.in 2013-04-28 20:52:44 UTC (rev 5463) +++ trunk/navit/po/el.po.in 2013-05-01 22:17:27 UTC (rev 5464) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-23 20:16+0200\n" +"POT-Creation-Date: 2013-04-22 18:30+0200\n" "PO-Revision-Date: 2010-05-24 14:51+0000\n" "Last-Translator: aitolos <Unknown>\n" "Language-Team: Greek <el...@li...>\n" @@ -279,6 +279,13 @@ msgid "Roadbook" msgstr "Οδηγίες Διαδρομής" +#, c-format +msgid "Waypoint %d" +msgstr "" + +msgid "Visit before..." +msgstr "" + msgid "Set as position" msgstr "Ορισμός ως αφετηρία" @@ -416,6 +423,10 @@ msgid "Bolivia" msgstr "Βολιβία" +#. 535 +msgid "Bonaire, Sint Eustatius and Saba" +msgstr "" + #. 076 msgid "Brazil" msgstr "Βραζιλία" @@ -504,6 +515,10 @@ msgid "Cape Verde" msgstr "Πράσινο Ακρωτήριο" +#. 531 +msgid "Curacao" +msgstr "" + #. 162 msgid "Christmas Island" msgstr "Νήσοι Χριστουγέννων" @@ -1120,6 +1135,10 @@ msgid "Suriname" msgstr "Σουρινάμ" +#. 728 +msgid "South Sudan" +msgstr "" + #. 678 msgid "Sao Tome and Principe" msgstr "Sao Tome και Principe" @@ -1128,6 +1147,10 @@ msgid "El Salvador" msgstr "Ελ Σαλβαδόρ" +#. 534 +msgid "Sint Maarten (Dutch part)" +msgstr "" + #. 760 msgid "Syrian Arab Republic" msgstr "Αραβική Δημοκρατία της Συρίας" @@ -1288,7 +1311,8 @@ "navit usage:\n" "navit [options] [configfile]\n" "\t-c <file>: use <file> as config file\n" -"\t-d <n>: set the global debug output level to <n> (0-3).\n" +"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting " +"from config file.\n" "\t-h: print this usage info and exit.\n" "\t-v: Print the version and exit.\n" msgstr "" @@ -1305,7 +1329,8 @@ msgid "Using config file '%s'\n" msgstr "" -msgid "Internal initialization failed, exiting\n" +msgid "" +"Internal initialization failed, exiting. Check previous error messages.\n" msgstr "" msgid "unknown street" @@ -1503,31 +1528,16 @@ msgid "Route 0000km 0+00:00 ETA" msgstr "Διαδρομή 0000χλμ Χρόνος που απομένει 0+00:00" -msgid "Back to map" -msgstr "Πίσω στο χάρτη" - -msgid "Main Menu" -msgstr "Κύριο Μενού" - msgid "Help" msgstr "Βοήθεια" -msgid "Back" -msgstr "Προηγ." +#, c-format +msgid "Waypoint %s" +msgstr "" -msgid "Add Bookmark" -msgstr "Προσθήκη σελιδοδείκτη" +msgid "Select waypoint to insert the new one before" +msgstr "" -#. Adds the Bookmark folders -msgid "Add Bookmark folder" -msgstr "Πρόσθεση φακέλου Σελιδοδείκτη" - -msgid "Rename" -msgstr "Μετονομασία" - -msgid "POIs" -msgstr "Σημεία Ενδιαφέροντος" - msgid "View in Browser" msgstr "Επισκόπηση σε Φυλλομετρητή" @@ -1546,6 +1556,9 @@ msgid "Set as position (and deactivate vehicle)" msgstr "" +msgid "POIs" +msgstr "Σημεία Ενδιαφέροντος" + msgid "View on map" msgstr "Προβολή στο χάρτη" @@ -1570,6 +1583,9 @@ msgid "Delete Bookmark" msgstr "Διαγραφή Σελιδοδείκτη" +msgid "Delete waypoint" +msgstr "" + msgid "Bookmarks" msgstr "Σελιδοδείκτες" @@ -1579,12 +1595,16 @@ msgid "Save waypoints" msgstr "" -msgid "Replace Waypoints" +msgid "Replace with waypoints" msgstr "" msgid "Delete Folder" msgstr "" +#. Adds the Bookmark folders +msgid "Add Bookmark folder" +msgstr "Πρόσθεση φακέλου Σελιδοδείκτη" + #. Pastes the Bookmark msgid "Paste bookmark" msgstr "Επικόληση σελιδοδείκτη" @@ -1593,18 +1613,6 @@ msgid "Bookmark %s" msgstr "Σελιδοδείκτης %s" -msgid "Former Destinations" -msgstr "Προγενέστερες διαδρομές" - -msgid "- No former destinations available -" -msgstr "" - -msgid "House number" -msgstr "Αριθμός σπιτιού" - -msgid "Layout" -msgstr "Διάταξη" - #, c-format msgid "Download %s" msgstr "" @@ -1621,9 +1629,6 @@ msgid "Download completely" msgstr "" -msgid "Maps" -msgstr "Χάρτες" - msgid "Show Satellite Status" msgstr "Εμφάνιση Κατάστασης Δορυφόρων" @@ -1662,6 +1667,44 @@ msgid "Show NMEA data" msgstr "Εμφάνιση δεδομένων ΝΜΕΑ" +msgid "Add Bookmark" +msgstr "Προσθήκη σελιδοδείκτη" + +msgid "Rename" +msgstr "Μετονομασία" + +msgid "About Navit" +msgstr "Περί του Navit" + +#. Authors +msgid "By" +msgstr "Από" + +#. Contributors +msgid "And all the Navit Team" +msgstr "Και όλη την ομάδα του Navit" + +msgid "members and contributors." +msgstr "μέλη και συνεισφέροντες" + +msgid "Waypoints" +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 "Longitude Latitude" +msgstr "" + +msgid "Enter coordinates, for example:" +msgstr "" + msgid "Vehicle" msgstr "Όχημα" @@ -1680,38 +1723,48 @@ msgid "Plan with Waypoints" msgstr "" -msgid "Message" -msgstr "Μήνυμα" +msgid "Maps" +msgstr "Χάρτες" -msgid "Next" -msgstr "" +msgid "Layout" +msgstr "Διάταξη" -msgid "Prev" -msgstr "" +msgid "Height Profile" +msgstr "Ύψος προφίλ" msgid "Route Description" msgstr "Περιγραφή Διαδρομής" -msgid "Height Profile" -msgstr "Ύψος προφίλ" - msgid "Show Locale" msgstr "Eμφάνιση Εντοπιότητας" -msgid "About Navit" -msgstr "Περί του Navit" +msgid "Former Destinations" +msgstr "Προγενέστερες διαδρομές" -#. Authors -msgid "By" -msgstr "Από" +msgid "- No former destinations available -" +msgstr "" -#. Contributors -msgid "And all the Navit Team" -msgstr "Και όλη την ομάδα του Navit" +msgid "Message" +msgstr "Μήνυμα" -msgid "members and contributors." -msgstr "μέλη και συνεισφέροντες" +msgid "Back" +msgstr "Προηγ." +msgid "Back to map" +msgstr "Πίσω στο χάρτη" + +msgid "Main Menu" +msgstr "Κύριο Μενού" + +msgid "House number" +msgstr "Αριθμός σπιτιού" + +msgid "Next" +msgstr "" + +msgid "Prev" +msgstr "" + msgid "Return to route!" msgstr "" @@ -1786,12 +1839,21 @@ "Waypoint" msgstr "" +msgid "Satellite Status" +msgstr "" + +msgid "NMEA Data" +msgstr "" + msgid "car_shortest" msgstr "" msgid "car_avoid_tolls" msgstr "" +msgid "car_pedantic" +msgstr "" + msgid "horse" msgstr "άλογο" Modified: trunk/navit/po/en_AU.po.in =================================================================== --- trunk/navit/po/en_AU.po.in 2013-04-28 20:52:44 UTC (rev 5463) +++ trunk/navit/po/en_AU.po.in 2013-05-01 22:17:27 UTC (rev 5464) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-23 20:16+0200\n" +"POT-Creation-Date: 2013-04-22 18:30+0200\n" "PO-Revision-Date: 2010-09-12 05:53+0000\n" "Last-Translator: Athol Mullen <Unknown>\n" "Language-Team: English (Australia) <en...@li...>\n" @@ -279,6 +279,13 @@ msgid "Roadbook" msgstr "Roadbook" +#, c-format +msgid "Waypoint %d" +msgstr "" + +msgid "Visit before..." +msgstr "" + msgid "Set as position" msgstr "Set as position" @@ -416,6 +423,10 @@ msgid "Bolivia" msgstr "Bolivia" +#. 535 +msgid "Bonaire, Sint Eustatius and Saba" +msgstr "" + #. 076 msgid "Brazil" msgstr "Brazil" @@ -504,6 +515,10 @@ msgid "Cape Verde" msgstr "Cape Verde" +#. 531 +msgid "Curacao" +msgstr "" + #. 162 msgid "Christmas Island" msgstr "Christmas Island" @@ -1120,6 +1135,10 @@ msgid "Suriname" msgstr "Suriname" +#. 728 +msgid "South Sudan" +msgstr "" + #. 678 msgid "Sao Tome and Principe" msgstr "Sao Tome and Principe" @@ -1128,6 +1147,10 @@ msgid "El Salvador" msgstr "El Salvador" +#. 534 +msgid "Sint Maarten (Dutch part)" +msgstr "" + #. 760 msgid "Syrian Arab Republic" msgstr "Syrian Arab Republic" @@ -1288,7 +1311,8 @@ "navit usage:\n" "navit [options] [configfile]\n" "\t-c <file>: use <file> as config file\n" -"\t-d <n>: set the global debug output level to <n> (0-3).\n" +"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting " +"from config file.\n" "\t-h: print this usage info and exit.\n" "\t-v: Print the version and exit.\n" msgstr "" @@ -1305,7 +1329,8 @@ msgid "Using config file '%s'\n" msgstr "" -msgid "Internal initialization failed, exiting\n" +msgid "" +"Internal initialization failed, exiting. Check previous error messages.\n" msgstr "" msgid "unknown street" @@ -1503,31 +1528,16 @@ msgid "Route 0000km 0+00:00 ETA" msgstr "Route 0000km 0+00:00 ETA" -msgid "Back to map" -msgstr "Back to map" - -msgid "Main Menu" -msgstr "Main Menu" - msgid "Help" msgstr "Help" -msgid "Back" -msgstr "Back" +#, c-format +msgid "Waypoint %s" +msgstr "" -msgid "Add Bookmark" -msgstr "Add Bookmark" +msgid "Select waypoint to insert the new one before" +msgstr "" -#. Adds the Bookmark folders -msgid "Add Bookmark folder" -msgstr "Add Bookmark folder" - -msgid "Rename" -msgstr "Rename" - -msgid "POIs" -msgstr "POIs" - msgid "View in Browser" msgstr "View in Browser" @@ -1546,6 +1556,9 @@ msgid "Set as position (and deactivate vehicle)" msgstr "" +msgid "POIs" +msgstr "POIs" + msgid "View on map" msgstr "View on map" @@ -1570,6 +1583,9 @@ msgid "Delete Bookmark" msgstr "Delete Bookmark" +msgid "Delete waypoint" +msgstr "" + msgid "Bookmarks" msgstr "Bookmarks" @@ -1579,12 +1595,16 @@ msgid "Save waypoints" msgstr "" -msgid "Replace Waypoints" +msgid "Replace with waypoints" msgstr "" msgid "Delete Folder" msgstr "" +#. Adds the Bookmark folders +msgid "Add Bookmark folder" +msgstr "Add Bookmark folder" + #. Pastes the Bookmark msgid "Paste bookmark" msgstr "Paste bookmark" @@ -1593,18 +1613,6 @@ msgid "Bookmark %s" msgstr "Bookmark %s" -msgid "Former Destinations" -msgstr "Former Destinations" - -msgid "- No former destinations available -" -msgstr "" - -msgid "House number" -msgstr "House number" - -msgid "Layout" -msgstr "Layout" - #, c-format msgid "Download %s" msgstr "" @@ -1621,9 +1629,6 @@ msgid "Download completely" msgstr "" -msgid "Maps" -msgstr "Maps" - msgid "Show Satellite Status" msgstr "Show Satellite Status" @@ -1662,6 +1667,44 @@ msgid "Show NMEA data" msgstr "Show NMEA data" +msgid "Add Bookmark" +msgstr "Add Bookmark" + +msgid "Rename" +msgstr "Rename" + +msgid "About Navit" +msgstr "About Navit" + +#. Authors +msgid "By" +msgstr "By" + +#. Contributors +msgid "And all the Navit Team" +msgstr "... [truncated message content] |
From: <md...@us...> - 2013-04-28 20:52:50
|
Revision: 5463 http://navit.svn.sourceforge.net/navit/?rev=5463&view=rev Author: mdankov Date: 2013-04-28 20:52:44 +0000 (Sun, 28 Apr 2013) Log Message: ----------- Add:core:Improve street search speed by using string hash instead of linear search in character simplification algorithm. Modified Paths: -------------- trunk/navit/navit/linguistics.c Modified: trunk/navit/navit/linguistics.c =================================================================== --- trunk/navit/navit/linguistics.c 2013-04-28 20:09:45 UTC (rev 5462) +++ trunk/navit/navit/linguistics.c 2013-04-28 20:52:44 UTC (rev 5463) @@ -275,7 +275,7 @@ NULL }; -static GHashTable *casefold_hash; +static GHashTable *casefold_hash, *special_hash; /* @@ -319,7 +319,20 @@ return ret; } +static char** +linguistics_get_special(char *str, char *end) +{ + char *buf; + int len; + if(!end) + end=g_utf8_find_next_char(str,NULL); + len=end-str+1; + buf=g_alloca(len); + g_strlcpy(buf,str,len); + return g_hash_table_lookup(special_hash,buf); +} + /** * @brief Replace special characters in string (e.g. umlauts) with plain letters. * This is useful e.g. to canonicalize a string for comparison. @@ -354,25 +367,22 @@ in_rest-=len; if (len > 1) { - for (i = 0 ; i < sizeof(special)/sizeof(special[0]); i++) { - const char *search=special[i][0]; - if (!strncmp(in,search,len)) { - const char *replace=special[i][mode]; - if (replace) { - int replace_len=strlen(replace); - if(out-ret+replace_len+in_rest>ret_len) { - char *new_ret; - ret_len+=(replace_len-len)*10; - new_ret=g_realloc(ret,ret_len+1); - out=new_ret+(out-ret); - ret=new_ret; - } - dbg(1,"found %s %s %d %s %d\n",in,search,len,replace,replace_len); - strcpy(out, replace); - out+=replace_len; - match=1; - break; + char **spc=linguistics_get_special(in, next); + if (spc) { + const char *replace=spc[mode]; + if (replace) { + int replace_len=strlen(replace); + if(out-ret+replace_len+in_rest>ret_len) { + char *new_ret; + ret_len+=(replace_len-len)*10; + new_ret=g_realloc(ret,ret_len+1); + out=new_ret+(out-ret); + ret=new_ret; } + dbg(1,"found %s %s %d %s %d\n",in,spc[0],len,replace,replace_len); + strcpy(out, replace); + out+=replace_len; + match=1; } } } @@ -448,12 +458,19 @@ k+=strlen(s2); } } + + special_hash=g_hash_table_new(g_str_hash, g_str_equal); + for (i = 0 ; i < sizeof(special)/sizeof(special[0]); i++) + g_hash_table_insert(special_hash,(gpointer)special[i][0],special[i]); + } void linguistics_free(void) { g_hash_table_destroy(casefold_hash); + g_hash_table_destroy(special_hash); casefold_hash=NULL; + special_hash=NULL; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2013-04-28 20:09:52
|
Revision: 5462 http://navit.svn.sourceforge.net/navit/?rev=5462&view=rev Author: martin-s Date: 2013-04-28 20:09:45 +0000 (Sun, 28 Apr 2013) Log Message: ----------- Add:Core:Attributes for battery monitoring Modified Paths: -------------- trunk/navit/navit/attr_def.h Modified: trunk/navit/navit/attr_def.h =================================================================== --- trunk/navit/navit/attr_def.h 2013-04-28 18:26:39 UTC (rev 5461) +++ trunk/navit/navit/attr_def.h 2013-04-28 20:09:45 UTC (rev 5462) @@ -175,6 +175,13 @@ ATTR(min_dist) ATTR(max_dist) ATTR(cache_size) +ATTR(battery_voltage) /* mV */ +ATTR(battery_current) /* mA */ +ATTR(battery_capacity) /* Wh */ +ATTR(battery_capacity_rel) /* ppm */ +ATTR(battery_charge) /* mAh */ +ATTR(battery_resistance) /* mOhm */ +ATTR(battery_temperature) /* mK */ ATTR2(0x00027500,type_rel_abs_begin) /* These attributes are int that can either hold relative * * or absolute values. A relative value is indicated by * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2013-04-28 18:26:46
|
Revision: 5461 http://navit.svn.sourceforge.net/navit/?rev=5461&view=rev Author: martin-s Date: 2013-04-28 18:26:39 +0000 (Sun, 28 Apr 2013) Log Message: ----------- Add:gui_internal:Let escape function convert integers to strings Modified Paths: -------------- trunk/navit/navit/gui/internal/gui_internal_command.c Modified: trunk/navit/navit/gui/internal/gui_internal_command.c =================================================================== --- trunk/navit/navit/gui/internal/gui_internal_command.c 2013-04-28 18:25:34 UTC (rev 5460) +++ trunk/navit/navit/gui/internal/gui_internal_command.c 2013-04-28 18:26:39 UTC (rev 5461) @@ -133,7 +133,7 @@ gui_internal_cmd_escape(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) { struct attr escaped; - if (!in || !in[0] || !ATTR_IS_STRING(in[0]->type)) { + if (!in || !in[0]) { dbg(0,"first parameter missing or wrong type\n"); return; } @@ -141,8 +141,16 @@ dbg(0,"output missing\n"); return; } - escaped.type=in[0]->type; - escaped.u.str=gui_internal_escape(escape_mode_string,in[0]->u.str); + if (ATTR_IS_STRING(in[0]->type)) { + escaped.type=in[0]->type; + escaped.u.str=gui_internal_escape(escape_mode_string,in[0]->u.str); + } else if (ATTR_IS_INT(in[0]->type)) { + escaped.type=attr_type_string_begin; + escaped.u.str=g_strdup_printf("%d",in[0]->u.num); + } else { + dbg(0,"first parameter wrong type\n"); + return; + } dbg(1,"in %s result %s\n",in[0]->u.str,escaped.u.str); *out=attr_generic_add_attr(*out, attr_dup(&escaped)); g_free(escaped.u.str); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2013-04-28 18:25:41
|
Revision: 5460 http://navit.svn.sourceforge.net/navit/?rev=5460&view=rev Author: martin-s Date: 2013-04-28 18:25:34 +0000 (Sun, 28 Apr 2013) Log Message: ----------- Add:gui_internal:Allow preset values in input tags Modified Paths: -------------- trunk/navit/navit/gui/internal/gui_internal_html.c Modified: trunk/navit/navit/gui/internal/gui_internal_html.c =================================================================== --- trunk/navit/navit/gui/internal/gui_internal_html.c 2013-04-28 16:56:03 UTC (rev 5459) +++ trunk/navit/navit/gui/internal/gui_internal_html.c 2013-04-28 18:25:34 UTC (rev 5460) @@ -275,7 +275,8 @@ } } if (!strcmp(type,"text") || !strcmp(type,"password")) { - html->w=gui_internal_label_new(this, NULL); + char *value=find_attr(names, values, "value"); + html->w=gui_internal_label_new(this, value); html->w->background=this->background; html->w->flags |= div_flags(names, values); html->w->state|=STATE_EDITABLE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2013-04-28 16:56:09
|
Revision: 5459 http://navit.svn.sourceforge.net/navit/?rev=5459&view=rev Author: martin-s Date: 2013-04-28 16:56:03 +0000 (Sun, 28 Apr 2013) Log Message: ----------- Add:android:Put common code in android.c Modified Paths: -------------- trunk/navit/navit/android.c Modified: trunk/navit/navit/android.c =================================================================== --- trunk/navit/navit/android.c 2013-04-28 16:43:18 UTC (rev 5458) +++ trunk/navit/navit/android.c 2013-04-28 16:56:03 UTC (rev 5459) @@ -61,6 +61,18 @@ return 1; } + +int +android_find_static_method(jclass class, char *name, char *args, jmethodID *ret) +{ + *ret = (*jnienv)->GetStaticMethodID(jnienv, class, name, args); + if (*ret == NULL) { + dbg(0,"Failed to get static Method %s with signature %s\n",name,args); + return 0; + } + return 1; +} + JNIEXPORT void JNICALL Java_org_navitproject_navit_Navit_NavitMain( JNIEnv* env, jobject thiz, jobject activity, jobject lang, int version, jobject display_density_string, jobject path) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2013-04-28 16:43:24
|
Revision: 5458 http://navit.svn.sourceforge.net/navit/?rev=5458&view=rev Author: martin-s Date: 2013-04-28 16:43:18 +0000 (Sun, 28 Apr 2013) Log Message: ----------- Add:Core:Allow multiple text domains for navit translations Modified Paths: -------------- trunk/navit/navit/main.c trunk/navit/navit/navit_nls.c trunk/navit/navit/navit_nls.h Modified: trunk/navit/navit/main.c =================================================================== --- trunk/navit/navit/main.c 2013-04-28 16:17:04 UTC (rev 5457) +++ trunk/navit/navit/main.c 2013-04-28 16:43:18 UTC (rev 5458) @@ -421,8 +421,7 @@ #define STRINGIFY(x) STRINGIFY2(x) setlocale(LC_MESSAGES,STRINGIFY(FORCE_LOCALE)); #endif - bindtextdomain(PACKAGE, getenv("NAVIT_LOCALEDIR")); - bind_textdomain_codeset (PACKAGE, "UTF-8"); + navit_nls_add_textdomain(PACKAGE, getenv("NAVIT_LOCALEDIR")); textdomain(PACKAGE); #endif } Modified: trunk/navit/navit/navit_nls.c =================================================================== --- trunk/navit/navit/navit_nls.c 2013-04-28 16:17:04 UTC (rev 5457) +++ trunk/navit/navit/navit_nls.c 2013-04-28 16:43:18 UTC (rev 5458) @@ -1,33 +1,71 @@ #include "config.h" #include "debug.h" +#include <glib.h> #ifdef USE_LIBGNUINTL #include <libgnuintl.h> #else #include <libintl.h> #endif +static GList *textdomains; +char * +navit_nls_add_textdomain(const char *package, const char *dir) +{ +#ifdef ENABLE_NLS + char *ret=bindtextdomain(package, dir); + bind_textdomain_codeset(package, "UTF-8"); + textdomains=g_list_append(textdomains, g_strdup(package)); + return ret; +#endif +} +void +navit_nls_remove_textdomain(const char *package) +{ +#ifdef ENABLE_NLS + GList *i=textdomains; + while (i) { + if (!strcmp(i->data, package)) { + textdomains=g_list_remove_all(textdomains, i->data); + g_free(i->data); + return; + } + i=g_list_next(i); + } +#endif +} + const char * navit_nls_gettext(const char *msgid) { #ifdef ENABLE_NLS - return gettext(msgid); -#else + GList *i=textdomains; + while (i) { + const char *ret=dgettext(i->data, msgid); + if (ret != msgid) + return ret; + i=g_list_next(i); + } +#endif return msgid; -#endif } const char * navit_nls_ngettext(const char *msgid, const char *msgid_plural, unsigned long int n) { #ifdef ENABLE_NLS - return ngettext(msgid, msgid_plural, n); -#else + GList *i=textdomains; + while (i) { + const char *ret=dngettext(i->data, msgid, msgid_plural, n); + if (ret != msgid && ret != msgid_plural) + return ret; + i=g_list_next(i); + } +#endif if (n == 1) { return msgid; } else { return msgid_plural; } -#endif } Modified: trunk/navit/navit/navit_nls.h =================================================================== --- trunk/navit/navit/navit_nls.h 2013-04-28 16:17:04 UTC (rev 5457) +++ trunk/navit/navit/navit_nls.h 2013-04-28 16:43:18 UTC (rev 5458) @@ -1,5 +1,7 @@ #ifndef __NAVIT_NLS_H__ +char *navit_nls_add_textdomain(const char *package, const char *dir); +char *navit_nls_remove_textdomain(const char *package); const char *navit_nls_gettext(const char *msgid); const char *navit_nls_ngettext(const char *msgid, const char *msgid_plural, unsigned long int n); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2013-04-28 16:17:10
|
Revision: 5457 http://navit.svn.sourceforge.net/navit/?rev=5457&view=rev Author: martin-s Date: 2013-04-28 16:17:04 +0000 (Sun, 28 Apr 2013) Log Message: ----------- Fix:Core:Fixed previous commit Modified Paths: -------------- trunk/navit/navit/navit_nls.c Modified: trunk/navit/navit/navit_nls.c =================================================================== --- trunk/navit/navit/navit_nls.c 2013-04-28 16:11:36 UTC (rev 5456) +++ trunk/navit/navit/navit_nls.c 2013-04-28 16:17:04 UTC (rev 5457) @@ -22,6 +22,7 @@ navit_nls_ngettext(const char *msgid, const char *msgid_plural, unsigned long int n) { #ifdef ENABLE_NLS + return ngettext(msgid, msgid_plural, n); #else if (n == 1) { return msgid; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2013-04-28 16:11:42
|
Revision: 5456 http://navit.svn.sourceforge.net/navit/?rev=5456&view=rev Author: martin-s Date: 2013-04-28 16:11:36 +0000 (Sun, 28 Apr 2013) Log Message: ----------- Add:Core:Made a central entry point for translation in preparation of future changes Modified Paths: -------------- trunk/navit/navit/CMakeLists.txt trunk/navit/navit/Makefile.am trunk/navit/navit/android.c trunk/navit/navit/command.c trunk/navit/navit/country.c trunk/navit/navit/gui/gtk/destination.c trunk/navit/navit/gui/gtk/gui_gtk_action.c trunk/navit/navit/navigation.c trunk/navit/navit/navit_nls.h Added Paths: ----------- trunk/navit/navit/navit_nls.c Modified: trunk/navit/navit/CMakeLists.txt =================================================================== --- trunk/navit/navit/CMakeLists.txt 2013-04-28 15:18:17 UTC (rev 5455) +++ trunk/navit/navit/CMakeLists.txt 2013-04-28 16:11:36 UTC (rev 5456) @@ -7,7 +7,7 @@ # navit cre set(NAVIT_SRC announcement.c atom.c attr.c cache.c callback.c command.c compass.c config_.c coord.c country.c data_window.c debug.c event.c file.c geom.c graphics.c gui.c item.c layout.c log.c main.c map.c maps.c - linguistics.c mapset.c maptype.c menu.c messages.c bookmarks.c navit.c navigation.c osd.c param.c phrase.c plugin.c popup.c + linguistics.c mapset.c maptype.c menu.c messages.c bookmarks.c navit.c navit_nls.c navigation.c osd.c param.c phrase.c plugin.c popup.c profile.c profile_option.c projection.c roadprofile.c route.c routech.c search.c speech.c start_real.c sunriset.c transform.c track.c util.c vehicle.c vehicleprofile.c xmlconfig.c ) Modified: trunk/navit/navit/Makefile.am =================================================================== --- trunk/navit/navit/Makefile.am 2013-04-28 15:18:17 UTC (rev 5455) +++ trunk/navit/navit/Makefile.am 2013-04-28 16:11:36 UTC (rev 5456) @@ -58,7 +58,7 @@ map_data.h mapset.h maptype.h menu.h messages.h navigation.h navit.h osd.h \ param.h phrase.h plugin.h point.h plugin_def.h projection.h popup.h route.h profile.h roadprofile.h search.h speech.h start_real.h \ transform.h track.h types.h util.h vehicle.h vehicleprofile.h window.h xmlconfig.h zipfile.h \ - navit_nls.h sunriset.c sunriset.h glib_slice.h + navit_nls.c navit_nls.h sunriset.c sunriset.h glib_slice.h XSLTS=@XSLTS@ navit.xml: navit_shipped.xml $(foreach xslt, $(subst $(comma), ,$(XSLTS)), $(addsuffix .xslt,$(addprefix xslt/,$(xslt)))) navit_android_xml Modified: trunk/navit/navit/android.c =================================================================== --- trunk/navit/navit/android.c 2013-04-28 15:18:17 UTC (rev 5455) +++ trunk/navit/navit/android.c 2013-04-28 16:11:36 UTC (rev 5456) @@ -198,7 +198,7 @@ s=(*env)->GetStringUTFChars(env, str, NULL); //dbg(0,"*****string=%s\n",s); - localized_str=gettext(s); + localized_str=navit_nls_gettext(s); //dbg(0,"localized string=%s",localized_str); // jstring dataStringValue = (jstring) localized_str; @@ -441,7 +441,7 @@ if (strlen(res->country->iso2)==2) { jstring j_iso2 = (*env)->NewStringUTF(env, res->country->iso2); - jstring j_name = (*env)->NewStringUTF(env, gettext(res->country->name)); + jstring j_name = (*env)->NewStringUTF(env, navit_nls_gettext(res->country->name)); current_country = (jobjectArray)(*env)->NewObjectArray(env, 2, (*env)->FindClass(env, "java/lang/String"), NULL); Modified: trunk/navit/navit/command.c =================================================================== --- trunk/navit/navit/command.c 2013-04-28 15:18:17 UTC (rev 5455) +++ trunk/navit/navit/command.c 2013-04-28 16:11:36 UTC (rev 5456) @@ -643,7 +643,7 @@ if (!strcmp(function,"_") && list && list[0] && list[0]->type >= attr_type_string_begin && list[0]->type <= attr_type_string_end) { result_free(res); res->attr.type=list[0]->type; - res->attr.u.str=g_strdup(gettext(list[0]->u.str)); + res->attr.u.str=g_strdup(navit_nls_gettext(list[0]->u.str)); res->allocated=1; } else if (!strncmp(function,"new ",4)) { Modified: trunk/navit/navit/country.c =================================================================== --- trunk/navit/navit/country.c 2013-04-28 15:18:17 UTC (rev 5455) +++ trunk/navit/navit/country.c 2013-04-28 16:11:36 UTC (rev 5456) @@ -317,7 +317,7 @@ } return 0; case attr_label: - attr->u.str=gettext(country->name); + attr->u.str=navit_nls_gettext(country->name); this_->attr_next=attr_country_id; return 1; case attr_country_id: @@ -337,7 +337,7 @@ this_->attr_next=attr_country_name; return 1; case attr_country_name: - attr->u.str=gettext(country->name); + attr->u.str=navit_nls_gettext(country->name); this_->attr_next=attr_none; return 1; default: @@ -403,7 +403,7 @@ match(this_, attr_country_iso3, this_->country->iso3) || match(this_, attr_country_iso2, this_->country->iso2) || match(this_, attr_country_car, this_->country->car) || - match(this_, attr_country_name, gettext(this_->country->name))) { + match(this_, attr_country_name, navit_nls_gettext(this_->country->name))) { this_->item.id_lo=this_->country->id; return &this_->item; } Modified: trunk/navit/navit/gui/gtk/destination.c =================================================================== --- trunk/navit/navit/gui/gtk/destination.c 2013-04-28 15:18:17 UTC (rev 5455) +++ trunk/navit/navit/gui/gtk/destination.c 2013-04-28 16:11:36 UTC (rev 5456) @@ -148,7 +148,7 @@ g_list_free(columns_list); while (*column_text) { GtkCellRenderer *cell=gtk_cell_renderer_text_new(); - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (param->treeview),-1, gettext(*column_text), cell, "text", i, NULL); + gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (param->treeview),-1, navit_nls_gettext(*column_text), cell, "text", i, NULL); i++; column_text++; } Modified: trunk/navit/navit/gui/gtk/gui_gtk_action.c =================================================================== --- trunk/navit/navit/gui/gtk/gui_gtk_action.c 2013-04-28 15:18:17 UTC (rev 5455) +++ trunk/navit/navit/gui/gtk/gui_gtk_action.c 2013-04-28 16:11:36 UTC (rev 5456) @@ -32,11 +32,8 @@ #include "callback.h" #include "debug.h" #include "destination.h" +#include "navit_nls.h" -#define gettext_noop(String) String -#define _(STRING) gettext(STRING) -#define _n(STRING) gettext_noop(STRING) - struct menu_priv { char *path; GtkAction *action; Modified: trunk/navit/navit/navigation.c =================================================================== --- trunk/navit/navit/navigation.c 2013-04-28 15:18:17 UTC (rev 5455) +++ trunk/navit/navit/navigation.c 2013-04-28 16:11:36 UTC (rev 5456) @@ -464,14 +464,14 @@ } if (imperial) { if (is_length) - return g_strdup_printf(ngettext("one mile","%d miles", dist/1000), dist/1000); + return g_strdup_printf(navit_nls_ngettext("one mile","%d miles", dist/1000), dist/1000); else - return g_strdup_printf(ngettext("in one mile","in %d miles", dist/1000), dist/1000); + return g_strdup_printf(navit_nls_ngettext("in one mile","in %d miles", dist/1000), dist/1000); } else { if (is_length) - return g_strdup_printf(ngettext("one kilometer","%d kilometers", dist/1000), dist/1000); + return g_strdup_printf(navit_nls_ngettext("one kilometer","%d kilometers", dist/1000), dist/1000); else - return g_strdup_printf(ngettext("in one kilometer","in %d kilometers", dist/1000), dist/1000); + return g_strdup_printf(navit_nls_ngettext("in one kilometer","in %d kilometers", dist/1000), dist/1000); } } Added: trunk/navit/navit/navit_nls.c =================================================================== --- trunk/navit/navit/navit_nls.c (rev 0) +++ trunk/navit/navit/navit_nls.c 2013-04-28 16:11:36 UTC (rev 5456) @@ -0,0 +1,32 @@ +#include "config.h" +#include "debug.h" + +#ifdef USE_LIBGNUINTL +#include <libgnuintl.h> +#else +#include <libintl.h> +#endif + + +const char * +navit_nls_gettext(const char *msgid) +{ +#ifdef ENABLE_NLS + return gettext(msgid); +#else + return msgid; +#endif +} + +const char * +navit_nls_ngettext(const char *msgid, const char *msgid_plural, unsigned long int n) +{ +#ifdef ENABLE_NLS +#else + if (n == 1) { + return msgid; + } else { + return msgid_plural; + } +#endif +} Modified: trunk/navit/navit/navit_nls.h =================================================================== --- trunk/navit/navit/navit_nls.h 2013-04-28 15:18:17 UTC (rev 5455) +++ trunk/navit/navit/navit_nls.h 2013-04-28 16:11:36 UTC (rev 5456) @@ -1,27 +1,11 @@ #ifndef __NAVIT_NLS_H__ -#include "config.h" -#ifdef ENABLE_NLS -#ifdef USE_LIBGNUINTL -#include <libgnuintl.h> -#else -#include <libintl.h> -#endif -#define _(STRING) gettext(STRING) +const char *navit_nls_gettext(const char *msgid); +const char *navit_nls_ngettext(const char *msgid, const char *msgid_plural, unsigned long int n); + +#define _(STRING) navit_nls_gettext(STRING) #define gettext_noop(String) String #define _n(STRING) gettext_noop(STRING) -#else -#define _(STRING) STRING -#define _n(STRING) STRING -#define gettext(STRING) STRING -static inline const char *ngettext(const char *msgid, const char *msgid_plural, unsigned long int n) -{ - if (n == 1) { - return msgid; - } else { - return msgid_plural; - } -} -#endif + #define __NAVIT_NLS_H__ #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |