Menu
▾
▴
navit-cvs-commit — CVS commit mailing list
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: Martin S. <mar...@us...> - 2008-01-24 07:31:37
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18172 Modified Files: osm2navit.c Log Message: Fix:Tool:changed wrong tag in osm2navit Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** osm2navit.c 24 Jan 2008 07:02:24 -0000 1.40 --- osm2navit.c 24 Jan 2008 07:31:40 -0000 1.41 *************** *** 136,140 **** "w natural wood wood\n" "w natural water water_poly\n" ! "w natural coast water_line\n" "w place suburb town_poly\n" "w place town town_poly\n" --- 136,140 ---- "w natural wood wood\n" "w natural water water_poly\n" ! "w natural coastline water_line\n" "w place suburb town_poly\n" "w place town town_poly\n" |
|
From: Martin S. <mar...@us...> - 2008-01-24 07:02:24
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10904 Modified Files: osm2navit.c Log Message: Fix:Tools:Added fix from afaber (thanks) for tile handling Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** osm2navit.c 23 Jan 2008 21:35:34 -0000 1.39 --- osm2navit.c 24 Jan 2008 07:02:24 -0000 1.40 *************** *** 30,33 **** --- 30,34 ---- static int nodeid,wayid; static int report,phase; + static int ignore_unkown = 0; static char *attrmap={ *************** *** 156,159 **** --- 157,179 ---- static GHashTable *way_key_hash, *node_key_hash; + static GHashTable *strings_hash = NULL; + + + static char* string_hash_lookup( const char* key ) + { + char* key_ptr = NULL; + + if ( strings_hash == NULL ) { + strings_hash = g_hash_table_new(g_str_hash, g_str_equal); + } + + if ( ( key_ptr = g_hash_table_lookup(strings_hash, key )) == NULL ) { + key_ptr = g_strdup( key ); + g_hash_table_insert(strings_hash, key_ptr, (gpointer)key_ptr ); + + } + return key_ptr; + } + static void build_attrmap_line(char *line) *************** *** 193,201 **** if (! value_hash) { value_hash=g_hash_table_new(g_str_hash, g_str_equal); ! g_hash_table_insert(key_hash, g_strdup(k), value_hash); } if (v) { data=(gpointer)item_from_name(i); ! g_hash_table_insert(value_hash, g_strdup(v), data); } #if 0 --- 213,221 ---- if (! value_hash) { value_hash=g_hash_table_new(g_str_hash, g_str_equal); ! g_hash_table_insert(key_hash, string_hash_lookup(k), value_hash); } if (v) { data=(gpointer)item_from_name(i); ! g_hash_table_insert(value_hash, string_hash_lookup(v), data); } #if 0 *************** *** 400,408 **** if (report) fprintf(stderr,"Unknown %s %d value of '%s' '%s'\n", in_way ? "way" : "node", in_way ? wayid:nodeid, k, v); type=in_way ? type_street_unkn : type_point_unkn; ! g_hash_table_insert(value_hash, g_strdup(v), (gpointer)item.type); } ! if (type != type_street_unkn && type != type_point_unkn) item.type=type; } --- 420,439 ---- if (report) fprintf(stderr,"Unknown %s %d value of '%s' '%s'\n", in_way ? "way" : "node", in_way ? wayid:nodeid, k, v); + if ( ignore_unkown == 1 ) + return; type=in_way ? type_street_unkn : type_point_unkn; ! g_hash_table_insert(value_hash, string_hash_lookup( v ), (gpointer)item.type); } ! if ( (type != type_street_unkn ) && ( type != type_point_unkn ) ) ! { item.type=type; + } + else + { + if ( ignore_unkown == 1 ) + { + level = 10; + } + } } *************** *** 429,433 **** static struct tile_head { ! int size; int total_size; char *name; --- 460,464 ---- static struct tile_head { ! int num_subtiles; int total_size; char *name; *************** *** 437,441 **** int process; struct tile_head *next; ! char subtiles[0]; } *tile_head_root; --- 468,472 ---- int process; struct tile_head *next; ! // char subtiles[0]; } *tile_head_root; *************** *** 470,473 **** --- 501,511 ---- + static char** th_get_subtile( const struct tile_head* th, int idx ) + { + char* subtile_ptr = NULL; + subtile_ptr = (char*)th + sizeof( struct tile_head ) + idx * sizeof( char *); + return (char**)subtile_ptr; + } + static void extend_buffer(struct buffer *b) *************** *** 832,836 **** return NULL; bytes_read+=r; - g_assert((ib->len+1)*4 < sizeof(buffer)); s=(ib->len+1)*4-sizeof(*ib); r=fread(ib+1, s, 1, in); --- 870,873 ---- *************** *** 966,982 **** th=g_hash_table_lookup(tile_hash, tile); if (! th) { ! th=malloc(sizeof(*th)+strlen(tile)+1); assert(th != NULL); ! strcpy(th->subtiles, tile); ! th->size=strlen(tile)+1; th->total_size=0; th->total_size_used=0; th->zipnum=0; th->zip_data=NULL; ! th->name=g_strdup(tile); if (tile_hash2) ! g_hash_table_insert(tile_hash2, th->name, th); if (tiles_list) ! *tiles_list=g_list_append(*tiles_list, th->name); processed_tiles++; if (debug_tile(tile)) --- 1003,1021 ---- th=g_hash_table_lookup(tile_hash, tile); if (! th) { ! th=malloc(sizeof(struct tile_head)+ sizeof( char* ) ); assert(th != NULL); ! // strcpy(th->subtiles, tile); ! th->num_subtiles=1; th->total_size=0; th->total_size_used=0; th->zipnum=0; th->zip_data=NULL; ! th->name=string_hash_lookup(tile); ! *th_get_subtile( th, 0 ) = th->name; ! if (tile_hash2) ! g_hash_table_insert(tile_hash2, string_hash_lookup( th->name ), th); if (tiles_list) ! *tiles_list=g_list_append(*tiles_list, string_hash_lookup( th->name ) ); processed_tiles++; if (debug_tile(tile)) *************** *** 986,990 **** if (debug_tile(tile)) fprintf(stderr,"New total size of %s(%p):%d\n", th->name, th, th->total_size); ! g_hash_table_insert(tile_hash, th->name, th); } --- 1025,1029 ---- if (debug_tile(tile)) fprintf(stderr,"New total size of %s(%p):%d\n", th->name, th, th->total_size); ! g_hash_table_insert(tile_hash, string_hash_lookup( th->name ), th); } *************** *** 1012,1028 **** thb=ths; g_hash_table_remove(tile_hash, sub); ! g_free(thb->name); ! thb->name=g_strdup(base); ! g_hash_table_insert(tile_hash, thb->name, thb); } else { ! thb=realloc(thb, sizeof(*thb)+ths->size+thb->size); assert(thb != NULL); ! memcpy(thb->subtiles+thb->size, ths->subtiles, ths->size); ! thb->size+=ths->size; thb->total_size+=ths->total_size; ! g_hash_table_insert(tile_hash, thb->name, thb); g_hash_table_remove(tile_hash, sub); - g_free(ths->name); g_free(ths); } --- 1051,1065 ---- thb=ths; g_hash_table_remove(tile_hash, sub); ! thb->name=string_hash_lookup(base); ! g_hash_table_insert(tile_hash, string_hash_lookup( thb->name ), thb); } else { ! thb=realloc(thb, sizeof(struct tile_head)+( ths->num_subtiles+thb->num_subtiles ) * sizeof( char*) ); assert(thb != NULL); ! memcpy( th_get_subtile( thb, thb->num_subtiles ), th_get_subtile( ths, 0 ), ths->num_subtiles * sizeof( char*) ); ! thb->num_subtiles+=ths->num_subtiles; thb->total_size+=ths->total_size; ! g_hash_table_insert(tile_hash, string_hash_lookup( thb->name ), thb); g_hash_table_remove(tile_hash, sub); g_free(ths); } *************** *** 1242,1263 **** add_tile_hash(struct tile_head *th) { ! int dlen,len,maxnamelen=0; ! char *data; #if 0 ! g_hash_table_insert(tile_hash2, th->name, th); #endif ! dlen=th->size; ! data=th->subtiles; ! while (dlen > 0) { if (debug_tile(data) || debug_tile(th->name)) { ! fprintf(stderr,"Parent for '%s' is '%s'\n", data, th->name); } ! g_hash_table_insert(tile_hash2, data, th); ! len=strlen(data); ! if (len > maxnamelen) maxnamelen=len; ! data+=len+1; ! dlen-=len+1; } return maxnamelen; --- 1279,1303 ---- add_tile_hash(struct tile_head *th) { ! int idx,len,maxnamelen=0; ! char **data; #if 0 ! g_hash_table_insert(tile_hash2, string_hash_lookup( th->name ), th); #endif ! for( idx = 0; idx < th->num_subtiles; idx++ ) { ! ! data = th_get_subtile( th, idx ); ! if (debug_tile(data) || debug_tile(th->name)) { ! fprintf(stderr,"Parent for '%s' is '%s'\n", *data, th->name); } ! ! g_hash_table_insert(tile_hash2, *data, th); ! ! len = strlen( *data ); ! ! if (len > maxnamelen) { maxnamelen=len; ! } } return maxnamelen; *************** *** 1313,1319 **** write_tilesdir(int phase, int maxlen, FILE *out) { ! int dlen,len,zipnum=0; GList *tiles_list,*next; ! char *data; struct tile_head *th,**last=NULL; --- 1353,1359 ---- write_tilesdir(int phase, int maxlen, FILE *out) { ! int idx,len,zipnum=0; GList *tiles_list,*next; ! char **data; struct tile_head *th,**last=NULL; *************** *** 1345,1356 **** th->zipnum=zipnum++; fprintf(out,"%s:%d",(char *)next->data,th->total_size); ! dlen=th->size; ! data=th->subtiles; ! while (dlen > 0) { ! fprintf(out,":%s", data); ! while (*data++) ! dlen--; ! dlen--; } fprintf(out,"\n"); } --- 1385,1394 ---- th->zipnum=zipnum++; fprintf(out,"%s:%d",(char *)next->data,th->total_size); ! ! for ( idx = 0; idx< th->num_subtiles; idx++ ){ ! data= th_get_subtile( th, idx ); ! fprintf(out,":%s", *data); } + fprintf(out,"\n"); } *************** *** 1746,1753 **** {"start", 1, 0, 's'}, {"input-file", 1, 0, 'i'}, {"ways-only", 0, 0, 'W'}, {0, 0, 0, 0} }; ! c = getopt_long (argc, argv, "NWa:ce:hks:w", long_options, &option_index); if (c == -1) break; --- 1784,1792 ---- {"start", 1, 0, 's'}, {"input-file", 1, 0, 'i'}, + {"ignore-unknown", 0, 0, 'n'}, {"ways-only", 0, 0, 'W'}, {0, 0, 0, 0} }; ! c = getopt_long (argc, argv, "Nni:Wa:ce:hks:w", long_options, &option_index); if (c == -1) break; *************** *** 1771,1774 **** --- 1810,1817 ---- usage(stdout); break; + case 'n': + fprintf(stderr,"I will IGNORE unknown types\n"); + ignore_unkown=1; + break; case 'k': fprintf(stderr,"I will KEEP tmp files\n"); |
|
From: Michael F. <ho...@us...> - 2008-01-23 21:43:03
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26649 Modified Files: navit.xml Log Message: Core:Fix:Change order of POIs to avoid cluttering. Thanks to Aurelien Jacobs for the patch. Index: navit.xml =================================================================== RCS file: /cvsroot/navit/navit/src/navit.xml,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** navit.xml 23 Jan 2008 21:35:34 -0000 1.28 --- navit.xml 23 Jan 2008 21:43:06 -0000 1.29 *************** *** 525,529 **** </item> ! <item type="poi_airport" order="0-"> <icon src="airport.xpm" /> </item> --- 525,529 ---- </item> ! <item type="poi_airport" order="5-"> <icon src="airport.xpm" /> </item> *************** *** 531,538 **** <icon src="ghost_town.xpm" /> </item> ! <item type="poi_hotel" order="0-"> <icon src="hotel.xpm" /> </item> ! <item type="poi_car_parking" order="0-"> <icon src="parking.xpm" /> </item> --- 531,538 ---- <icon src="ghost_town.xpm" /> </item> ! <item type="poi_hotel" order="12-"> <icon src="hotel.xpm" /> </item> ! <item type="poi_car_parking" order="11-"> <icon src="parking.xpm" /> </item> *************** *** 540,544 **** <icon src="car_dealer.xpm" /> </item> ! <item type="poi_fuel" order="0-"> <icon src="fuel.xpm" /> </item> --- 540,544 ---- <icon src="car_dealer.xpm" /> </item> ! <item type="poi_fuel" order="10-"> <icon src="fuel.xpm" /> </item> *************** *** 546,553 **** <icon src="shopping.xpm" /> </item> ! <item type="poi_attraction" order="0-"> <icon src="attraction.xpm" /> </item> ! <item type="poi_bar" order="0-"> <icon src="bar.xpm" /> </item> --- 546,553 ---- <icon src="shopping.xpm" /> </item> ! <item type="poi_attraction" order="5-"> <icon src="attraction.xpm" /> </item> ! <item type="poi_bar" order="12-"> <icon src="bar.xpm" /> </item> *************** *** 555,568 **** <icon src="bridge.xpm" /> </item> ! <item type="highway_exit" order="0-"> <icon src="exit.xpm" /> </item> ! <item type="poi_camp_rv" order="0-"> <icon src="camping.xpm" /> </item> ! <item type="poi_museum_history" order="0-"> <icon src="museum.xpm" /> </item> ! <item type="poi_hospital" order="0-"> <icon src="hospital.xpm" /> </item> --- 555,568 ---- <icon src="bridge.xpm" /> </item> ! <item type="highway_exit" order="11-"> <icon src="exit.xpm" /> </item> ! <item type="poi_camp_rv" order="9-"> <icon src="camping.xpm" /> </item> ! <item type="poi_museum_history" order="12-"> <icon src="museum.xpm" /> </item> ! <item type="poi_hospital" order="12-"> <icon src="hospital.xpm" /> </item> *************** *** 570,580 **** <circle color="#8080ff" radius="3" /> </item> ! <item type="poi_dining" order="0-"> <icon src="dining.xpm" /> </item> ! <item type="poi_fastfood" order="0-"> <icon src="fastfood.xpm" /> </item> ! <item type="poi_police" order="0-"> <icon src="police.xpm" /> </item> --- 570,580 ---- <circle color="#8080ff" radius="3" /> </item> ! <item type="poi_dining" order="12-"> <icon src="dining.xpm" /> </item> ! <item type="poi_fastfood" order="12-"> <icon src="fastfood.xpm" /> </item> ! <item type="poi_police" order="12-"> <icon src="police.xpm" /> </item> *************** *** 585,589 **** <icon src="autoservice.xpm" /> </item> ! <item type="poi_bank" order="0-"> <icon src="bank.xpm" /> </item> --- 585,589 ---- <icon src="autoservice.xpm" /> </item> ! <item type="poi_bank" order="12-"> <icon src="bank.xpm" /> </item> *************** *** 624,631 **** <icon src="cemetery.xpm" /> </item> ! <item type="poi_church" order="0-"> <icon src="church.xpm" /> </item> ! <item type="poi_cinema" order="0-"> <icon src="cinema.xpm" /> </item> --- 624,631 ---- <icon src="cemetery.xpm" /> </item> ! <item type="poi_church" order="11-"> <icon src="church.xpm" /> </item> ! <item type="poi_cinema" order="12-"> <icon src="cinema.xpm" /> </item> *************** *** 669,673 **** <icon src="fair.xpm" /> </item> ! <item type="poi_firebrigade" order="0-"> <icon src="firebrigade.xpm" /> </item> --- 669,673 ---- <icon src="fair.xpm" /> </item> ! <item type="poi_firebrigade" order="12-"> <icon src="firebrigade.xpm" /> </item> *************** *** 681,685 **** <icon src="garmin.xpm" /> </item> ! <item type="poi_golf" order="0-"> <icon src="golf.xpm" /> </item> --- 681,685 ---- <icon src="garmin.xpm" /> </item> ! <item type="poi_golf" order="12-"> <icon src="golf.xpm" /> </item> *************** *** 699,703 **** <icon src="icesport.xpm" /> </item> ! <item type="poi_information" order="0-"> <icon src="information.xpm" /> </item> --- 699,703 ---- <icon src="icesport.xpm" /> </item> ! <item type="poi_information" order="12-"> <icon src="information.xpm" /> </item> *************** *** 711,715 **** <icon src="levee.xpm" /> </item> ! <item type="poi_library" order="0-"> <icon src="library.xpm" /> </item> --- 711,715 ---- <icon src="levee.xpm" /> </item> ! <item type="poi_library" order="12-"> <icon src="library.xpm" /> </item> *************** *** 750,757 **** <icon src="personal_service.xpm" /> </item> ! <item type="poi_pharmacy" order="0-"> <icon src="pharmacy.xpm" /> </item> ! <item type="poi_post" order="0-"> <icon src="post.xpm" /> </item> --- 750,757 ---- <icon src="personal_service.xpm" /> </item> ! <item type="poi_pharmacy" order="12-"> <icon src="pharmacy.xpm" /> </item> ! <item type="poi_post" order="13-"> <icon src="post.xpm" /> </item> *************** *** 765,772 **** <icon src="resort.xpm" /> </item> ! <item type="poi_rest_room" order="0-"> <icon src="rest_room.xpm" /> </item> ! <item type="poi_restaurant" order="0-"> <icon src="restaurant.xpm" /> </item> --- 765,772 ---- <icon src="resort.xpm" /> </item> ! <item type="poi_rest_room" order="13-"> <icon src="rest_room.xpm" /> </item> ! <item type="poi_restaurant" order="12-"> <icon src="restaurant.xpm" /> </item> *************** *** 774,778 **** <icon src="restricted_area.xpm" /> </item> ! <item type="poi_restroom" order="0-"> <icon src="restroom.xpm" /> </item> --- 774,778 ---- <icon src="restricted_area.xpm" /> </item> ! <item type="poi_restroom" order="13-"> <icon src="restroom.xpm" /> </item> *************** *** 783,787 **** <icon src="scenic_area.xpm" /> </item> ! <item type="poi_school" order="0-"> <icon src="school.xpm" /> </item> --- 783,787 ---- <icon src="scenic_area.xpm" /> </item> ! <item type="poi_school" order="12-"> <icon src="school.xpm" /> </item> *************** *** 816,820 **** <icon src="shower.xpm" /> </item> ! <item type="poi_skiing" order="0-"> <icon src="skiing.xpm" /> </item> --- 816,820 ---- <icon src="shower.xpm" /> </item> ! <item type="poi_skiing" order="12-"> <icon src="skiing.xpm" /> </item> *************** *** 834,844 **** <icon src="subdivision.xpm" /> </item> ! <item type="poi_swimming" order="0-"> <icon src="swimming.xpm" /> </item> ! <item type="poi_telephone" order="0-"> <icon src="telephone.xpm" /> </item> ! <item type="poi_theater" order="0-"> <icon src="theater.xpm" /> </item> --- 834,844 ---- <icon src="subdivision.xpm" /> </item> ! <item type="poi_swimming" order="12-"> <icon src="swimming.xpm" /> </item> ! <item type="poi_telephone" order="13-"> <icon src="telephone.xpm" /> </item> ! <item type="poi_theater" order="12-"> <icon src="theater.xpm" /> </item> *************** *** 846,850 **** <icon src="tide.xpm" /> </item> ! <item type="poi_tower" order="0-"> <icon src="tower.xpm" /> </item> --- 846,850 ---- <icon src="tide.xpm" /> </item> ! <item type="poi_tower" order="13-"> <icon src="tower.xpm" /> </item> *************** *** 870,874 **** <icon src="zoo.xpm" /> </item> ! <item type="poi_picnic" order="0-"> <icon src="picnic.xpm" /> </item> --- 870,874 ---- <icon src="zoo.xpm" /> </item> ! <item type="poi_picnic" order="11-"> <icon src="picnic.xpm" /> </item> |
|
From: Michael F. <ho...@us...> - 2008-01-23 21:35:30
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23528/src Modified Files: item_def.h navit.xml osm2navit.c Log Message: Core:Add:Add definitions for runway and taxiway. Thanks to Aurelien Jacobs for the patch. Index: item_def.h =================================================================== RCS file: /cvsroot/navit/navit/src/item_def.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** item_def.h 16 Jan 2008 22:59:38 -0000 1.17 --- item_def.h 23 Jan 2008 21:35:34 -0000 1.18 *************** *** 245,248 **** --- 245,250 ---- ITEM(roundabout) ITEM(rg_segment) + ITEM(aeroway_runway) + ITEM(aeroway_taxiway) /* Area */ ITEM2(0xc0000000,area) Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** osm2navit.c 22 Jan 2008 19:49:57 -0000 1.38 --- osm2navit.c 23 Jan 2008 21:35:34 -0000 1.39 *************** *** 104,107 **** --- 104,109 ---- "w building glasshouse building_poly\n" "w building\n" + "w aeroway runway aeroway_runway\n" + "w aeroway taxiway aeroway_taxiway\n" "w highway cycleway street_nopass\n" "w highway footway street_nopass\n" Index: navit.xml =================================================================== RCS file: /cvsroot/navit/navit/src/navit.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** navit.xml 18 Jan 2008 16:08:08 -0000 1.27 --- navit.xml 23 Jan 2008 21:35:34 -0000 1.28 *************** *** 408,411 **** --- 408,494 ---- <label label_size="9" /> </item> + <item type="aeroway_taxiway" order="10"> + <polyline color="#989994" width="4" /> + <polyline color="#d3dbbc" width="2" /> + </item> + <item type="aeroway_taxiway" order="11"> + <polyline color="#989994" width="6" /> + <polyline color="#d3dbbc" width="4" /> + </item> + <item type="aeroway_taxiway" order="12"> + <polyline color="#989994" width="10" /> + <polyline color="#d3dbbc" width="8" /> + </item> + <item type="aeroway_taxiway" order="13"> + <polyline color="#989994" width="12" /> + <polyline color="#d3dbbc" width="9" /> + </item> + <item type="aeroway_taxiway" order="14"> + <polyline color="#989994" width="15" /> + <polyline color="#d3dbbc" width="13" /> + </item> + <item type="aeroway_taxiway" order="15"> + <polyline color="#989994" width="17" /> + <polyline color="#d3dbbc" width="14" /> + </item> + <item type="aeroway_taxiway" order="16"> + <polyline color="#989994" width="33" /> + <polyline color="#d3dbbc" width="26" /> + </item> + <item type="aeroway_taxiway" order="17"> + <polyline color="#989994" width="69" /> + <polyline color="#d3dbbc" width="61" /> + </item> + <item type="aeroway_taxiway" order="18"> + <polyline color="#989994" width="132" /> + <polyline color="#d3dbbc" width="126" /> + </item> + <item type="aeroway_runway" order="2-6"> + <polyline color="#404040" width="1" /> + </item> + <item type="aeroway_runway" order="7-8"> + <polyline color="#404040" width="3" /> + <polyline color="#d3dbbc" width="1" /> + </item> + <item type="aeroway_runway" order="9"> + <polyline color="#6b6f5f" width="5" /> + <polyline color="#d3dbbc" width="3" /> + </item> + <item type="aeroway_runway" order="10"> + <polyline color="#6b6f5f" width="6" /> + <polyline color="#d3dbbc" width="4" /> + </item> + <item type="aeroway_runway" order="11"> + <polyline color="#6b6f5f" width="9" /> + <polyline color="#d3dbbc" width="7" /> + </item> + <item type="aeroway_runway" order="12"> + <polyline color="#6b6f5f" width="13" /> + <polyline color="#d3dbbc" width="9" /> + </item> + <item type="aeroway_runway" order="13"> + <polyline color="#6b6f5f" width="18" /> + <polyline color="#d3dbbc" width="14" /> + </item> + <item type="aeroway_runway" order="14"> + <polyline color="#6b6f5f" width="21" /> + <polyline color="#d3dbbc" width="17" /> + </item> + <item type="aeroway_runway" order="15"> + <polyline color="#6b6f5f" width="24" /> + <polyline color="#d3dbbc" width="20" /> + </item> + <item type="aeroway_runway" order="16"> + <polyline color="#6b6f5f" width="39" /> + <polyline color="#d3dbbc" width="33" /> + </item> + <item type="aeroway_runway" order="17"> + <polyline color="#6b6f5f" width="78" /> + <polyline color="#d3dbbc" width="72" /> + </item> + <item type="aeroway_runway" order="18"> + <polyline color="#6b6f5f" width="156" /> + <polyline color="#d3dbbc" width="150" /> + </item> <item type="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="12-"> <circle color="#000000" radius="3" label_size="7" /> |
|
From: Michael F. <ho...@us...> - 2008-01-23 21:25:54
|
Update of /cvsroot/navit/navit/src/graphics/gtk_drawing_area In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19172/src/graphics/gtk_drawing_area Modified Files: graphics_gtk_drawing_area.c Log Message: GTK:Add:Support for font: ttf-dejavu. Thanks to Aurelien Jacobs for the patch. Index: graphics_gtk_drawing_area.c =================================================================== RCS file: /cvsroot/navit/navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** graphics_gtk_drawing_area.c 14 Jan 2008 19:33:24 -0000 1.27 --- graphics_gtk_drawing_area.c 23 Jan 2008 21:25:56 -0000 1.28 *************** *** 74,77 **** --- 74,78 ---- "/usr/share/fonts/truetype", "/usr/share/fonts/truetype/msttcorefonts", + "/usr/share/fonts/truetype/ttf-dejavu", "/usr/share/fonts/ttf", "/usr/share/fonts/corefonts", |
|
From: Martin S. <mar...@us...> - 2008-01-23 20:18:38
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23513 Modified Files: navigation.c navigation.h navit.c Log Message: Fix:Core:Remove old navigation if destination changes Index: navigation.h =================================================================== RCS file: /cvsroot/navit/navit/src/navigation.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** navigation.h 5 Jan 2008 20:04:22 -0000 1.10 --- navigation.h 23 Jan 2008 20:18:42 -0000 1.11 *************** *** 9,16 **** enum item_type; struct callback; ! struct item; struct mapset; struct navigation; - struct navigation_list; struct route; struct navigation *navigation_new(struct mapset *ms); --- 9,15 ---- enum item_type; struct callback; ! struct map; struct mapset; struct navigation; struct route; struct navigation *navigation_new(struct mapset *ms); *************** *** 18,25 **** int navigation_set_announce(struct navigation *this_, enum item_type type, int *level); void navigation_update(struct navigation *this_, struct route *route); void navigation_destroy(struct navigation *this_); int navigation_register_callback(struct navigation *this_, enum attr_type type, struct callback *cb); void navigation_unregister_callback(struct navigation *this_, enum attr_type type, struct callback *cb); ! struct map * navigation_get_map(struct navigation *this_); void navigation_init(void); /* end of prototypes */ --- 17,25 ---- int navigation_set_announce(struct navigation *this_, enum item_type type, int *level); void navigation_update(struct navigation *this_, struct route *route); + void navigation_flush(struct navigation *this_); void navigation_destroy(struct navigation *this_); int navigation_register_callback(struct navigation *this_, enum attr_type type, struct callback *cb); void navigation_unregister_callback(struct navigation *this_, enum attr_type type, struct callback *cb); ! struct map *navigation_get_map(struct navigation *this_); void navigation_init(void); /* end of prototypes */ Index: navigation.c =================================================================== RCS file: /cvsroot/navit/navit/src/navigation.c,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** navigation.c 5 Jan 2008 20:04:22 -0000 1.34 --- navigation.c 23 Jan 2008 20:18:42 -0000 1.35 *************** *** 624,629 **** --- 624,637 ---- void + navigation_flush(struct navigation *this_) + { + navigation_destroy_itms_cmds(this_, NULL); + } + + + void navigation_destroy(struct navigation *this_) { + navigation_flush(this_); item_hash_destroy(this_->hash); callback_list_destroy(this_->callback); Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** navit.c 8 Jan 2008 17:53:37 -0000 1.75 --- navit.c 23 Jan 2008 20:18:42 -0000 1.76 *************** *** 580,583 **** --- 580,585 ---- if (this_->route) { route_set_destination(this_->route, c); + if (this_->navigation) + navigation_flush(this_->navigation); navit_draw(this_); } |
|
From: Martin S. <mar...@us...> - 2008-01-23 19:27:35
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5108/gui/sdl Modified Files: gui_sdl_window.cpp Log Message: Fix:SDL:Fixed use of display list and map selection Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** gui_sdl_window.cpp 8 Jan 2008 10:46:23 -0000 1.47 --- gui_sdl_window.cpp 23 Jan 2008 19:27:38 -0000 1.48 *************** *** 193,201 **** char fps [12]; ! struct map_selection sel; memset(&sel, 0, sizeof(sel)); sel.u.c_rect.rl.x=800; sel.u.c_rect.rl.y=600; transform_set_screen_selection(navit_get_trans(this_->nav), &sel); --- 193,211 ---- char fps [12]; ! struct map_selection sel,sel2; memset(&sel, 0, sizeof(sel)); + memset(&sel2, 0, sizeof(sel2)); sel.u.c_rect.rl.x=800; sel.u.c_rect.rl.y=600; + #if 0 + sel.next=&sel2; + sel2.u.c_rect.rl.x=-200; + sel2.u.c_rect.rl.y=0; + sel2.u.c_rect.lu.x=1000; + sel2.u.c_rect.lu.y=-800; + for (int i=0 ; i < layer_end ; i++) + sel2.order[i]=-4; + #endif transform_set_screen_selection(navit_get_trans(this_->nav), &sel); *************** *** 250,254 **** show_road_name(); ! navit_draw_displaylist(sdl_gui_navit); inject_input(must_quit); --- 260,267 ---- show_road_name(); ! if (DLid && *DLid) ! glCallList(*DLid); ! else ! navit_draw_displaylist(sdl_gui_navit); inject_input(must_quit); |
|
From: Martin S. <mar...@us...> - 2008-01-23 19:27:34
|
Update of /cvsroot/navit/navit/src/graphics/opengl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5108/graphics/opengl Modified Files: graphics_opengl.c Log Message: Fix:SDL:Fixed use of display list and map selection Index: graphics_opengl.c =================================================================== RCS file: /cvsroot/navit/navit/src/graphics/opengl/graphics_opengl.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** graphics_opengl.c 30 Nov 2007 22:21:57 -0000 1.13 --- graphics_opengl.c 23 Jan 2008 19:27:38 -0000 1.14 *************** *** 351,357 **** int i; - GLuint id = glGenLists(1); // create a display list - if(!id) return id; // failed to create a list, return 0 - GLUtesselator *tess = gluNewTess(); // create a tessellator if(!tess) return 0; // failed to create tessellation object, return 0 --- 351,354 ---- *************** *** 380,384 **** // Here, we are looking at only vertex coods, so the 2nd and 3rd params are // pointing same address. - glNewList(id, GL_COMPILE); glColor4f( gc->fr, gc->fg, gc->fb, gc->fa); gluTessBeginPolygon(tess, 0); // with NULL data --- 377,380 ---- *************** *** 389,399 **** gluTessEndContour(tess); gluTessEndPolygon(tess); - glEndList(); gluDeleteTess(tess); // delete after tessellation - - // Actually display the polygon. - // FIXME It would maybe be better to display them before calling swap_buffers - glCallList(id); } --- 385,390 ---- *************** *** 441,445 **** // dbg(0,"%s : %i,%i, %f\n",text,dx,dy,(180*atan2(dx,dy)/3.14)); SDL_print(text,p->x,p->y,(180*atan2(dx,dy)/3.14)-90); - } --- 432,435 ---- *************** *** 551,560 **** draw_mode(struct graphics_priv *gr, enum draw_mode_num mode) { ! #if 0 ! if (mode == draw_mode_begin) ! glNewList(gr->DLid,GL_COMPILE); ! if (mode == draw_mode_end) ! glEndList(); ! #endif #if 0 --- 541,550 ---- draw_mode(struct graphics_priv *gr, enum draw_mode_num mode) { ! if (gr->DLid) { ! if (mode == draw_mode_begin) ! glNewList(gr->DLid,GL_COMPILE); ! if (mode == draw_mode_end) ! glEndList(); ! } #if 0 *************** *** 735,738 **** --- 725,732 ---- if (strcmp(type,"opengl_displaylist")) return NULL; + #if 0 + dbg(1,"Creating the DL from driver\n"); + this->DLid = glGenLists(1); + #endif return &this->DLid; } *************** *** 795,800 **** // draw=gtk_drawnig_area_new(); - dbg(1,"Creating the DL from driver\n"); - this->DLid = glGenLists(1); // Initialize the fonts --- 789,792 ---- |
|
From: Martin S. <mar...@us...> - 2008-01-23 19:27:08
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5035 Modified Files: map.c transform.c Log Message: Fix:Core:Fixed selection transformation Index: map.c =================================================================== RCS file: /cvsroot/navit/navit/src/map.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** map.c 5 Jan 2008 22:46:19 -0000 1.12 --- map.c 23 Jan 2008 19:27:10 -0000 1.13 *************** *** 233,236 **** --- 233,237 ---- *next=*sel; *last=next; + last=&next->next; sel = sel->next; } Index: transform.c =================================================================== RCS file: /cvsroot/navit/navit/src/transform.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** transform.c 5 Jan 2008 22:46:19 -0000 1.17 --- transform.c 23 Jan 2008 19:27:10 -0000 1.18 *************** *** 324,327 **** --- 324,328 ---- while (ms) { msm=g_new0(struct map_selection, 1); + *msm=*ms; pr=&ms->u.p_rect; screen_pnt[0].x=pr->lu.x; |
|
From: Martin S. <mar...@us...> - 2008-01-22 19:49:53
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20870 Modified Files: osm2navit.c Log Message: Fix:Tools:Put higher order streets closer to the tile tree root Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** osm2navit.c 22 Jan 2008 19:30:29 -0000 1.37 --- osm2navit.c 22 Jan 2008 19:49:57 -0000 1.38 *************** *** 1169,1173 **** buffer[0]='\0'; max=14; ! if (ib->type == type_street_n_lanes || ib->type == type_highway_city || ib->type == type_highway_land) max=8; if (ib->type == type_street_3_city || ib->type == type_street_4_city || ib->type == type_street_3_land || ib->type == type_street_4_land) --- 1169,1173 ---- buffer[0]='\0'; max=14; ! if (ib->type == type_street_n_lanes || ib->type == type_highway_city || ib->type == type_highway_land || ib->type == type_ramp) max=8; if (ib->type == type_street_3_city || ib->type == type_street_4_city || ib->type == type_street_3_land || ib->type == type_street_4_land) |
|
From: Martin S. <mar...@us...> - 2008-01-22 19:33:04
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16011 Modified Files: route.c Log Message: Fix:Core:Increase point limit, reduce route graph map clutter Index: route.c =================================================================== RCS file: /cvsroot/navit/navit/src/route.c,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** route.c 5 Jan 2008 22:46:19 -0000 1.38 --- route.c 22 Jan 2008 19:33:08 -0000 1.39 *************** *** 1004,1018 **** street_get_data (struct item *item) { ! struct coord c[1000]; int count=0; struct street_data *ret; struct attr attr; ! while (count < 1000) { if (!item_coord_get(item, &c[count], 1)) break; count++; } ! g_assert(count < 1000); ret=g_malloc(sizeof(struct street_data)+count*sizeof(struct coord)); ret->item=*item; --- 1004,1019 ---- street_get_data (struct item *item) { ! int maxcount=2000; ! struct coord c[maxcount]; int count=0; struct street_data *ret; struct attr attr; ! while (count < maxcount) { if (!item_coord_get(item, &c[count], 1)) break; count++; } ! g_assert(count < maxcount); ret=g_malloc(sizeof(struct street_data)+count*sizeof(struct coord)); ret->item=*item; *************** *** 1460,1464 **** if (mr->str) g_free(mr->str); ! mr->str=g_strdup_printf("%d", p->value); attr->u.str = mr->str; mr->attr_next=attr_none; --- 1461,1468 ---- if (mr->str) g_free(mr->str); ! if (p->value != INT_MAX) ! mr->str=g_strdup_printf("%d", p->value); ! else ! mr->str=g_strdup("-"); attr->u.str = mr->str; mr->attr_next=attr_none; |
|
From: Martin S. <mar...@us...> - 2008-01-22 19:30:26
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14765 Modified Files: osm2navit.c Log Message: Fix:Tools:Put higher order streets closer to the tile tree root Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** osm2navit.c 21 Jan 2008 20:17:31 -0000 1.36 --- osm2navit.c 22 Jan 2008 19:30:29 -0000 1.37 *************** *** 883,887 **** static void ! tile(struct rect *r, char *ret) { int x0,x1,x2,x3,x4; --- 883,887 ---- static void ! tile(struct rect *r, char *ret, int max) { int x0,x1,x2,x3,x4; *************** *** 892,896 **** x4=world_bbox.h.x; y4=world_bbox.h.y; ! for (i = 0 ; i < 14 ; i++) { x2=(x0+x4)/2; y2=(y0+y4)/2; --- 892,896 ---- x4=world_bbox.h.x; y4=world_bbox.h.y; ! for (i = 0 ; i < max ; i++) { x2=(x0+x4)/2; y2=(y0+y4)/2; *************** *** 1159,1162 **** --- 1159,1164 ---- struct rect r; char buffer[1024]; + int max; + while ((ib=read_item(in))) { if (ib->type < 0x80000000) *************** *** 1166,1170 **** bbox((struct coord *)(ib+1), ib->clen/2, &r); buffer[0]='\0'; ! tile(&r, buffer); #if 0 fprintf(stderr,"%s\n", buffer); --- 1168,1178 ---- bbox((struct coord *)(ib+1), ib->clen/2, &r); buffer[0]='\0'; ! max=14; ! if (ib->type == type_street_n_lanes || ib->type == type_highway_city || ib->type == type_highway_land) ! max=8; ! if (ib->type == type_street_3_city || ib->type == type_street_4_city || ib->type == type_street_3_land || ib->type == type_street_4_land) ! max=12; ! ! tile(&r, buffer, max); #if 0 fprintf(stderr,"%s\n", buffer); |
|
From: Martin S. <mar...@us...> - 2008-01-22 19:01:15
|
Update of /cvsroot/navit/navit/src/data/binfile In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2590 Modified Files: binfile.c Log Message: Fix:data_binfile:Consider every layer for order Index: binfile.c =================================================================== RCS file: /cvsroot/navit/navit/src/data/binfile/binfile.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** binfile.c 21 Jan 2008 20:19:23 -0000 1.15 --- binfile.c 22 Jan 2008 19:01:18 -0000 1.16 *************** *** 284,287 **** --- 284,291 ---- if (coord_rect_overlap(r, &sel->u.c_rect)) { order=sel->order[0]; + if (sel->order[1] > order) + order=sel->order[1]; + if (sel->order[2] > order) + order=sel->order[2]; dbg(1,"min %d max %d order %d\n", mima->min, mima->max, order); if (!mima->min && !mima->max) |
|
From: Martin S. <mar...@us...> - 2008-01-22 08:45:15
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11922 Modified Files: xmlconfig.c Log Message: Fix:Core:Added a better error description in case of missing config tags Index: xmlconfig.c =================================================================== RCS file: /cvsroot/navit/navit/src/xmlconfig.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** xmlconfig.c 18 Jan 2008 16:08:08 -0000 1.26 --- xmlconfig.c 22 Jan 2008 08:45:16 -0000 1.27 *************** *** 661,666 **** (!parent_name && func->parent) || (parent_name && !func->parent)) { g_set_error(error,G_MARKUP_ERROR,G_MARKUP_ERROR_INVALID_CONTENT, ! "Element '%s' within unexpected context '%s'. Expected '%s'", ! element_name, parent_name, func->parent); return; } --- 661,666 ---- (!parent_name && func->parent) || (parent_name && !func->parent)) { g_set_error(error,G_MARKUP_ERROR,G_MARKUP_ERROR_INVALID_CONTENT, ! "Element '%s' within unexpected context '%s'. Expected '%s'%s", ! element_name, parent_name, func->parent, ! strcmp(func->parent,"config") ? "\nPlease add <config> </config> tags at the beginning/end of your navit.xml": ""); return; } |
|
From: Martin S. <mar...@us...> - 2008-01-21 20:19:33
|
Update of /cvsroot/navit/navit/src/data/binfile In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14398 Modified Files: binfile.c Log Message: Fix:data_binfile:Fixed map tile tree pruning Index: binfile.c =================================================================== RCS file: /cvsroot/navit/navit/src/data/binfile/binfile.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** binfile.c 15 Jan 2008 13:32:35 -0000 1.14 --- binfile.c 21 Jan 2008 20:19:23 -0000 1.15 *************** *** 19,22 **** --- 19,27 ---- static int map_id; + struct minmax { + short min; + short max; + }; + struct tile { int *start; *************** *** 271,281 **** static int ! selection_contains(struct map_selection *sel, struct coord_rect *r) { if (! sel) return 1; while (sel) { ! if (coord_rect_overlap(r, &sel->u.c_rect)) ! return 1; sel=sel->next; } --- 276,293 ---- static int ! selection_contains(struct map_selection *sel, struct coord_rect *r, struct minmax *mima) { + int order; if (! sel) return 1; while (sel) { ! if (coord_rect_overlap(r, &sel->u.c_rect)) { ! order=sel->order[0]; ! dbg(1,"min %d max %d order %d\n", mima->min, mima->max, order); ! if (!mima->min && !mima->max) ! return 1; ! if (order >= mima->min && order <= mima->max) ! return 1; ! } sel=sel->next; } *************** *** 289,292 **** --- 301,305 ---- { struct tile *t; + struct minmax *mima; for (;;) { t=mr->t; *************** *** 311,315 **** r.rl.x=t->pos_coord[2]; r.rl.y=t->pos_coord[1]; ! if (!mr->m->eoc || !selection_contains(mr->sel, &r)) { continue; } --- 324,329 ---- r.rl.x=t->pos_coord[2]; r.rl.y=t->pos_coord[1]; ! mima=(struct minmax *)(t->pos_attr+2); ! if (!mr->m->eoc || !selection_contains(mr->sel, &r, mima)) { continue; } |
|
From: Martin S. <mar...@us...> - 2008-01-21 20:17:57
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13259 Modified Files: osm2navit.c Log Message: Fix:Tools:Added new mappings to osm2navit Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** osm2navit.c 17 Jan 2008 09:41:56 -0000 1.35 --- osm2navit.c 21 Jan 2008 20:17:31 -0000 1.36 *************** *** 91,94 **** --- 91,95 ---- "n sport skiing poi_skiing\n" "n aeroway aerodrome poi_airport\n" + "n aeroway airport poi_airport\n" "n aeroway terminal poi_airport\n" "n aeroway helipad poi_heliport\n" *************** *** 99,102 **** --- 100,104 ---- "n place town town_label_2e4\n" "n place village town_label_2e3\n" + "n place hamlet town_label_2e2\n" "w amenity place_of_worship building_poly\n" "w building glasshouse building_poly\n" *************** *** 131,138 **** --- 133,142 ---- "w natural wood wood\n" "w natural water water_poly\n" + "w natural coast water_line\n" "w place suburb town_poly\n" "w place town town_poly\n" "w power line powerline\n" "w railway rail rail\n" + "w railway narrow_gauge rail\n" "w railway station building_poly\n" "w railway subway rail\n" *************** *** 144,147 **** --- 148,153 ---- "w waterway stream water_line\n" "w waterway drain water_line\n" + "w boundary administrative border_country\n" + "w route ferry ferry\n" }; |
|
From: Alexander A. <za...@us...> - 2008-01-18 19:13:26
|
Update of /cvsroot/navit/navit/src/data/garmin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12548 Modified Files: garmin.c Log Message: Fix: remove GO_POI usage, and use short for object types Index: garmin.c =================================================================== RCS file: /cvsroot/navit/navit/src/data/garmin/garmin.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** garmin.c 8 Jan 2008 17:12:56 -0000 1.15 --- garmin.c 18 Jan 2008 19:13:28 -0000 1.16 *************** *** 422,433 **** static struct item * ! garmin_poi2item(struct map_rect_priv *mr, struct gobject *o, unsigned char otype) { - int subtype; - - subtype = gar_object_subtype(o); if (mr->mpriv->conv) ! mr->item.type = g2n_get_type(mr->mpriv->conv, G2N_POINT, ! (otype << 8) | subtype); mr->item.meth = &methods_garmin_point; return &mr->item; --- 422,429 ---- static struct item * ! garmin_poi2item(struct map_rect_priv *mr, struct gobject *o, unsigned short otype) { if (mr->mpriv->conv) ! mr->item.type = g2n_get_type(mr->mpriv->conv, G2N_POINT, otype); mr->item.meth = &methods_garmin_point; return &mr->item; *************** *** 435,439 **** static struct item * ! garmin_pl2item(struct map_rect_priv *mr, struct gobject *o, unsigned char otype) { if (mr->mpriv->conv) --- 431,435 ---- static struct item * ! garmin_pl2item(struct map_rect_priv *mr, struct gobject *o, unsigned short otype) { if (mr->mpriv->conv) *************** *** 444,448 **** static struct item * ! garmin_pg2item(struct map_rect_priv *mr, struct gobject *o, unsigned char otype) { if (mr->mpriv->conv) --- 440,444 ---- static struct item * ! garmin_pg2item(struct map_rect_priv *mr, struct gobject *o, unsigned short otype) { if (mr->mpriv->conv) *************** *** 455,464 **** garmin_obj2item(struct map_rect_priv *mr, struct gobject *o) { ! unsigned char otype; otype = gar_obj_type(o); mr->item.type = type_none; switch (o->type) { case GO_POINT: - case GO_POI: return garmin_poi2item(mr, o, otype); case GO_POLYLINE: --- 451,459 ---- garmin_obj2item(struct map_rect_priv *mr, struct gobject *o) { ! unsigned short otype; otype = gar_obj_type(o); mr->item.type = type_none; switch (o->type) { case GO_POINT: return garmin_poi2item(mr, o, otype); case GO_POLYLINE: |
|
From: Michael F. <ho...@us...> - 2008-01-18 16:08:05
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30047 Modified Files: navit.xml xmlconfig.c Log Message: Fix:Core:Make navit.xml a wellformed document Index: navit.xml =================================================================== RCS file: /cvsroot/navit/navit/src/navit.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** navit.xml 5 Jan 2008 22:46:19 -0000 1.26 --- navit.xml 18 Jan 2008 16:08:08 -0000 1.27 *************** *** 1,4 **** --- 1,5 ---- <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE navit SYSTEM "navit.dtd"> + <config> <plugins> <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so"/> *************** *** 828,829 **** --- 829,831 ---- </layout> </navit> + </config> Index: xmlconfig.c =================================================================== RCS file: /cvsroot/navit/navit/src/xmlconfig.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** xmlconfig.c 7 Jan 2008 21:24:47 -0000 1.25 --- xmlconfig.c 18 Jan 2008 16:08:08 -0000 1.26 *************** *** 146,149 **** --- 146,156 ---- static int + xmlconfig_config(struct xmlstate *state) + { + state->element_object = 1; + return 1; + } + + static int xmlconfig_plugins(struct xmlstate *state) { *************** *** 595,600 **** int (*func)(struct xmlstate *state); } elements[] = { ! { "debug", NULL, xmlconfig_debug}, ! { "navit", NULL, xmlconfig_navit}, { "graphics", "navit", xmlconfig_graphics}, { "gui", "navit", xmlconfig_gui}, --- 602,608 ---- int (*func)(struct xmlstate *state); } elements[] = { ! { "config", NULL, xmlconfig_config}, ! { "debug", "config", xmlconfig_debug}, ! { "navit", "config", xmlconfig_navit}, { "graphics", "navit", xmlconfig_graphics}, { "gui", "navit", xmlconfig_gui}, *************** *** 620,624 **** { "log", "vehicle", xmlconfig_log}, { "window_items", "navit", xmlconfig_window_items}, ! { "plugins", NULL, xmlconfig_plugins}, { "plugin", "plugins", xmlconfig_plugin}, {}, --- 628,632 ---- { "log", "vehicle", xmlconfig_log}, { "window_items", "navit", xmlconfig_window_items}, ! { "plugins", "config", xmlconfig_plugins}, { "plugin", "plugins", xmlconfig_plugin}, {}, |
|
From: Martin S. <mar...@us...> - 2008-01-17 09:41:55
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14324 Modified Files: osm2navit.c Log Message: Fix:Tools:Fixed a buffer overflow in osm2navit Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** osm2navit.c 16 Jan 2008 23:33:03 -0000 1.34 --- osm2navit.c 17 Jan 2008 09:41:56 -0000 1.35 *************** *** 811,815 **** } ! static char buffer[65536]; int bytes_read=0; --- 811,815 ---- } ! static char buffer[131072]; int bytes_read=0; *************** *** 824,827 **** --- 824,828 ---- return NULL; bytes_read+=r; + g_assert((ib->len+1)*4 < sizeof(buffer)); s=(ib->len+1)*4-sizeof(*ib); r=fread(ib+1, s, 1, in); |
|
From: Albert L F. <af...@us...> - 2008-01-16 23:33:00
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19629 Modified Files: osm2navit.c Log Message: Add:tools/osm2navit:Add powerline and landuse=farm tags Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** osm2navit.c 16 Jan 2008 22:00:25 -0000 1.33 --- osm2navit.c 16 Jan 2008 23:33:03 -0000 1.34 *************** *** 100,103 **** --- 100,104 ---- "n place village town_label_2e3\n" "w amenity place_of_worship building_poly\n" + "w building glasshouse building_poly\n" "w building\n" "w highway cycleway street_nopass\n" *************** *** 113,116 **** --- 114,118 ---- "w highway secondary street_3_city\n" "w highway pedestrian street_nopass\n" + "w highway unsurfaced street_nopass\n" "w highway primary street_4_city\n" "w highway primary_link ramp\n" *************** *** 125,128 **** --- 127,131 ---- "w landuse industrial industry_poly\n" "w landuse residential town_poly\n" + "w landuse farm farm_poly\n" "w leisure park park_poly\n" "w natural wood wood\n" *************** *** 130,137 **** --- 133,142 ---- "w place suburb town_poly\n" "w place town town_poly\n" + "w power line powerline\n" "w railway rail rail\n" "w railway station building_poly\n" "w railway subway rail\n" "w railway tram rail\n" + "w sport golf golf_course\n" "w waterway canal water_line\n" "w waterway river water_line\n" *************** *** 139,143 **** "w waterway stream water_line\n" "w waterway drain water_line\n" - "w sport golf golf_course\n" }; --- 144,147 ---- |
|
From: Martin S. <mar...@us...> - 2008-01-16 22:59:36
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4420 Modified Files: item_def.h Log Message: Fix:Core:Added new types from wiki page Index: item_def.h =================================================================== RCS file: /cvsroot/navit/navit/src/item_def.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** item_def.h 5 Jan 2008 22:46:19 -0000 1.16 --- item_def.h 16 Jan 2008 22:59:38 -0000 1.17 *************** *** 205,208 **** --- 205,209 ---- ITEM(poi_gc_stages) ITEM(poi_gc_reference) + ITEM(poi_gc_webcam) /* Line */ ITEM2(0x80000000,line) *************** *** 276,277 **** --- 277,279 ---- ITEM(place_poly) ITEM(station_poly) + ITEM(farm_poly) |
Update of /cvsroot/navit/navit/po In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24145 Modified Files: cs.po de.po es.po fi.po fr.po it.po nl.po no.po pl.po Added Files: da.po Log Message: Add:Translation:New Danish translation (thanks Glemsom) Index: it.po =================================================================== RCS file: /cvsroot/navit/navit/po/it.po,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** it.po 26 Dec 2007 11:18:22 -0000 1.12 --- it.po 16 Jan 2008 22:30:50 -0000 1.13 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-26 11:26+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Andrea GHENSI <and...@gm...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-01-16 23:15+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Andrea GHENSI <and...@gm...>\n" *************** *** 16,80 **** "Content-Transfer-Encoding: 8bit\n" ! #: ../src/main.c:94 #, c-format msgid "Running from source directory\n" msgstr "Esecuzione dalla directory sorgente\n" ! #: ../src/main.c:110 #, fuzzy, c-format msgid "setting '%s' to '%s'\n" msgstr "Utilizzo il file di configurazione '%s'\n" ! #: ../src/main.c:173 #, c-format msgid "No config file navit.xml, navit.xml.local found\n" msgstr "" ! #: ../src/main.c:177 #, c-format msgid "Error parsing '%s': %s\n" msgstr "Errore analizzando '%s': %s\n" ! #: ../src/main.c:180 #, c-format msgid "Using '%s'\n" msgstr "Utilizzo il file di configurazione '%s'\n" ! #: ../src/main.c:183 #, c-format msgid "No instance has been created, exiting\n" msgstr "Nessuna istanza creata, esco\n" ! #: ../src/navigation.c:173 #, fuzzy, c-format msgid "%d m" msgstr "%d m" ! #: ../src/navigation.c:175 #, fuzzy, c-format msgid "in %d m" msgstr "tra %d m" ! #: ../src/navigation.c:179 #, c-format msgid "%d meters" msgstr "%d metri" ! #: ../src/navigation.c:181 #, c-format msgid "in %d meters" msgstr "tra %d metri" ! #: ../src/navigation.c:187 #, c-format msgid "%d.%d kilometer" msgstr "%d.%d chilometri" ! #: ../src/navigation.c:189 #, c-format msgid "in %d.%d kilometers" msgstr "tra %d.%d chilometri" ! #: ../src/navigation.c:193 #, fuzzy, c-format msgid "one kilometer" --- 16,80 ---- "Content-Transfer-Encoding: 8bit\n" ! #: ../src/main.c:108 #, c-format msgid "Running from source directory\n" msgstr "Esecuzione dalla directory sorgente\n" ! #: ../src/main.c:124 #, fuzzy, c-format msgid "setting '%s' to '%s'\n" msgstr "Utilizzo il file di configurazione '%s'\n" ! #: ../src/main.c:202 #, c-format msgid "No config file navit.xml, navit.xml.local found\n" msgstr "" ! #: ../src/main.c:206 #, c-format msgid "Error parsing '%s': %s\n" msgstr "Errore analizzando '%s': %s\n" ! #: ../src/main.c:209 #, c-format msgid "Using '%s'\n" msgstr "Utilizzo il file di configurazione '%s'\n" ! #: ../src/main.c:212 #, c-format msgid "No instance has been created, exiting\n" msgstr "Nessuna istanza creata, esco\n" ! #: ../src/navigation.c:162 #, fuzzy, c-format msgid "%d m" msgstr "%d m" ! #: ../src/navigation.c:164 #, fuzzy, c-format msgid "in %d m" msgstr "tra %d m" ! #: ../src/navigation.c:168 #, c-format msgid "%d meters" msgstr "%d metri" ! #: ../src/navigation.c:170 #, c-format msgid "in %d meters" msgstr "tra %d metri" ! #: ../src/navigation.c:176 #, c-format msgid "%d.%d kilometer" msgstr "%d.%d chilometri" ! #: ../src/navigation.c:178 #, c-format msgid "in %d.%d kilometers" msgstr "tra %d.%d chilometri" ! #: ../src/navigation.c:182 #, fuzzy, c-format msgid "one kilometer" *************** *** 83,87 **** msgstr[1] "un chilometro" ! #: ../src/navigation.c:195 #, fuzzy, c-format msgid "in one kilometer" --- 83,87 ---- msgstr[1] "un chilometro" ! #: ../src/navigation.c:184 #, fuzzy, c-format msgid "in one kilometer" *************** *** 90,203 **** msgstr[1] "tra un chilometro" ! #: ../src/navigation.c:399 msgid "right" msgstr "destra" ! #: ../src/navigation.c:406 msgid "left" msgstr "sinistra" ! #: ../src/navigation.c:410 msgid "easily " msgstr "di poco " ! #: ../src/navigation.c:414 msgid "strongly " msgstr "molto " ! #: ../src/navigation.c:417 msgid "unknown " msgstr "sconosciuto " ! #: ../src/navigation.c:423 #, fuzzy msgid "When possible, please turn around" msgstr "Appena possibile, invertire il senso di marcia" ! #: ../src/navigation.c:430 #, c-format msgid "Follow the road for the next %s" msgstr "Seguire la strada per i prossimi %s" ! #: ../src/navigation.c:434 msgid "soon" msgstr "tra poco" ! #: ../src/navigation.c:440 msgid "now" msgstr "adesso" ! #: ../src/navigation.c:443 msgid "error" msgstr "errore" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:447 #, fuzzy, c-format msgid "Turn %1$s%2$s %3$s" msgstr "%s, svoltare %s%s" ! #: ../src/navigation.c:450 #, c-format msgid "You have reached your destination %s" msgstr "Hai raggiunto la destinazione %s" ! #: ../src/navit.c:614 ../src/gui/gtk/gui_gtk_action.c:185 msgid "Layout" msgstr "Layout" ! #: ../src/navit.c:630 msgid "Projection" msgstr "Proiezione" ! #: ../src/navit.c:685 #, fuzzy msgid "Former Destinations" msgstr "Destinazione" ! #: ../src/navit.c:695 msgid "Bookmarks" msgstr "" ! #: ../src/navit.c:733 msgid "Vehicle" msgstr "" ! #: ../src/navit.c:768 #, fuzzy msgid "Command" msgstr "Polonia" ! #: ../src/navit.c:773 msgid "Length" msgstr "" ! #: ../src/navit.c:778 msgid "Time" msgstr "" ! #: ../src/navit.c:783 #, fuzzy msgid "Destination Length" msgstr "Destinazione" ! #: ../src/navit.c:788 #, fuzzy msgid "Destination Time" msgstr "Destinazione" ! #: ../src/navit.c:810 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "Quaderno di viaggio" ! #: ../src/navit.c:1030 ../src/gui/gtk/destination.c:365 ! #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Mappa" ! #: ../src/navit.c:1037 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Percorso" #: ../src/country.c:24 msgid "Czech Republic" --- 90,226 ---- msgstr[1] "tra un chilometro" ! #: ../src/navigation.c:402 msgid "right" msgstr "destra" ! #: ../src/navigation.c:409 msgid "left" msgstr "sinistra" ! #: ../src/navigation.c:413 msgid "easily " msgstr "di poco " ! #: ../src/navigation.c:417 msgid "strongly " msgstr "molto " ! #: ../src/navigation.c:420 msgid "unknown " msgstr "sconosciuto " ! #: ../src/navigation.c:426 #, fuzzy msgid "When possible, please turn around" msgstr "Appena possibile, invertire il senso di marcia" ! #: ../src/navigation.c:433 #, c-format msgid "Follow the road for the next %s" msgstr "Seguire la strada per i prossimi %s" ! #: ../src/navigation.c:437 msgid "soon" msgstr "tra poco" ! #: ../src/navigation.c:443 msgid "now" msgstr "adesso" ! #: ../src/navigation.c:446 msgid "error" msgstr "errore" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:450 #, fuzzy, c-format msgid "Turn %1$s%2$s %3$s" msgstr "%s, svoltare %s%s" ! #: ../src/navigation.c:453 #, c-format msgid "You have reached your destination %s" msgstr "Hai raggiunto la destinazione %s" ! #: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Layout" ! #: ../src/navit.c:668 msgid "Projection" msgstr "Proiezione" ! #: ../src/navit.c:723 #, fuzzy msgid "Former Destinations" msgstr "Destinazione" ! #: ../src/navit.c:733 msgid "Bookmarks" msgstr "" ! #: ../src/navit.c:771 msgid "Vehicle" msgstr "" ! #: ../src/navit.c:821 #, fuzzy msgid "Command" msgstr "Polonia" ! #: ../src/navit.c:826 msgid "Length" msgstr "" ! #: ../src/navit.c:832 msgid "Time" msgstr "" ! #: ../src/navit.c:837 #, fuzzy msgid "Destination Length" msgstr "Destinazione" ! #: ../src/navit.c:843 #, fuzzy msgid "Destination Time" msgstr "Destinazione" ! #: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "Quaderno di viaggio" ! #: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368 ! #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Mappa" ! #: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Percorso" + #: ../src/popup.c:229 + #, c-format + msgid "Point 0x%x 0x%x" + msgstr "" + + #: ../src/popup.c:230 + #, c-format + msgid "Screen %d %d" + msgstr "" + + #: ../src/popup.c:239 + msgid "Set as position" + msgstr "" + + #: ../src/popup.c:240 + #, fuzzy + msgid "Set as destination" + msgstr "Destinazione" + + #: ../src/popup.c:241 + msgid "Add as bookmark" + msgstr "" + #: ../src/country.c:24 msgid "Czech Republic" *************** *** 448,596 **** msgstr "Svalbard e Jan Mayen" ! #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:100 ! #: ../src/gui/gtk/destination.c:101 ../src/gui/gtk/destination.c:102 #, fuzzy msgid "Car" msgstr "Pulisci" ! #: ../src/gui/gtk/destination.c:99 msgid "Iso2" msgstr "" ! #: ../src/gui/gtk/destination.c:99 msgid "Iso3" msgstr "" ! #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:331 msgid "Country" msgstr "Stato" ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 #, fuzzy msgid "Postal" msgstr "Portogallo" ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 msgid "Town" msgstr "" ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 #, fuzzy msgid "District" msgstr "Distretto" ! #: ../src/gui/gtk/destination.c:101 ../src/gui/gtk/destination.c:102 ! #: ../src/gui/gtk/destination.c:340 msgid "Street" msgstr "Via" ! #: ../src/gui/gtk/destination.c:102 ../src/gui/gtk/destination.c:342 msgid "Number" msgstr "Numero" ! #: ../src/gui/gtk/destination.c:326 #, fuzzy msgid "Enter Destination" msgstr "Destinazione" ! #: ../src/gui/gtk/destination.c:333 msgid "Zip Code" msgstr "Codice ZIP" ! #: ../src/gui/gtk/destination.c:335 msgid "City" msgstr "Città " ! #: ../src/gui/gtk/destination.c:337 msgid "District/Township" msgstr "Distretto" ! #: ../src/gui/gtk/destination.c:366 msgid "Bookmark" msgstr "" ! #: ../src/gui/gtk/destination.c:367 ../src/gui/gtk/gui_gtk_action.c:195 msgid "Destination" msgstr "Destinazione" ! #: ../src/gui/gtk/gui_gtk_action.c:182 msgid "Display" msgstr "Visualizza" ! #: ../src/gui/gtk/gui_gtk_action.c:186 msgid "ZoomOut" msgstr "Zoom -" ! #: ../src/gui/gtk/gui_gtk_action.c:187 msgid "ZoomIn" msgstr "Zoom +" ! #: ../src/gui/gtk/gui_gtk_action.c:188 msgid "Refresh" msgstr "Aggiorna" ! #: ../src/gui/gtk/gui_gtk_action.c:191 ../src/gui/gtk/gui_gtk_action.c:193 msgid "Info" msgstr "Informazioni" ! #: ../src/gui/gtk/gui_gtk_action.c:196 msgid "Clear" msgstr "Pulisci" ! #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Test" msgstr "Test" ! #: ../src/gui/gtk/gui_gtk_action.c:198 msgid "_Quit" msgstr "_Esci" ! #: ../src/gui/gtk/gui_gtk_action.c:205 msgid "Cursor" msgstr "Cursore" ! #: ../src/gui/gtk/gui_gtk_action.c:206 msgid "Tracking" msgstr "Tracking" ! #: ../src/gui/gtk/gui_gtk_action.c:207 msgid "Orientation" msgstr "Bussola" ! #: ../src/gui/gtk/gui_gtk_action.c:209 ../src/gui/gtk/gui_gtk_action.c:211 msgid "Fullscreen" msgstr "Schermo intero" ! #: ../src/gui/gtk/gui_gtk_action.c:219 msgid "Data" msgstr "Dati" ! #: ../src/gui/gtk/gui_gtk_action.c:220 msgid "VisibleBlocks" msgstr "BlocchiVisibili" ! #: ../src/gui/gtk/gui_gtk_action.c:221 msgid "VisibleTowns" msgstr "Città Visibili" ! #: ../src/gui/gtk/gui_gtk_action.c:222 msgid "VisiblePolys" msgstr "PoligoniVisibili" ! #: ../src/gui/gtk/gui_gtk_action.c:223 msgid "VisibleStreets" msgstr "StradeVisibili" ! #: ../src/gui/gtk/gui_gtk_action.c:224 msgid "VisiblePoints" msgstr "PuntiVisibili" ! #: ../src/gui/gtk/gui_gtk_action.c:225 #, fuzzy ! msgid "RouteGraph" ! msgstr "Percorso" #~ msgid "two kilometers" --- 471,659 ---- msgstr "Svalbard e Jan Mayen" ! #: ../src/gui/gtk/destination.c:96 ../src/gui/gtk/destination.c:97 ! #: ../src/gui/gtk/destination.c:98 ../src/gui/gtk/destination.c:99 #, fuzzy msgid "Car" msgstr "Pulisci" ! #: ../src/gui/gtk/destination.c:96 msgid "Iso2" msgstr "" ! #: ../src/gui/gtk/destination.c:96 msgid "Iso3" msgstr "" ! #: ../src/gui/gtk/destination.c:96 ../src/gui/gtk/destination.c:334 msgid "Country" msgstr "Stato" ! #: ../src/gui/gtk/destination.c:97 ../src/gui/gtk/destination.c:98 ! #: ../src/gui/gtk/destination.c:99 #, fuzzy msgid "Postal" msgstr "Portogallo" ! #: ../src/gui/gtk/destination.c:97 ../src/gui/gtk/destination.c:98 ! #: ../src/gui/gtk/destination.c:99 msgid "Town" msgstr "" ! #: ../src/gui/gtk/destination.c:97 ../src/gui/gtk/destination.c:98 ! #: ../src/gui/gtk/destination.c:99 #, fuzzy msgid "District" msgstr "Distretto" ! #: ../src/gui/gtk/destination.c:98 ../src/gui/gtk/destination.c:99 ! #: ../src/gui/gtk/destination.c:343 msgid "Street" msgstr "Via" ! #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:345 msgid "Number" msgstr "Numero" ! #: ../src/gui/gtk/destination.c:329 #, fuzzy msgid "Enter Destination" msgstr "Destinazione" ! #: ../src/gui/gtk/destination.c:336 msgid "Zip Code" msgstr "Codice ZIP" ! #: ../src/gui/gtk/destination.c:338 msgid "City" msgstr "Città " ! #: ../src/gui/gtk/destination.c:340 msgid "District/Township" msgstr "Distretto" ! #: ../src/gui/gtk/destination.c:369 msgid "Bookmark" msgstr "" ! #: ../src/gui/gtk/destination.c:370 ../src/gui/gtk/gui_gtk_action.c:208 msgid "Destination" msgstr "Destinazione" ! #: ../src/gui/gtk/gui_gtk_action.c:195 msgid "Display" msgstr "Visualizza" ! #: ../src/gui/gtk/gui_gtk_action.c:199 msgid "ZoomOut" msgstr "Zoom -" ! #: ../src/gui/gtk/gui_gtk_action.c:200 msgid "ZoomIn" msgstr "Zoom +" ! #: ../src/gui/gtk/gui_gtk_action.c:201 msgid "Refresh" msgstr "Aggiorna" ! #: ../src/gui/gtk/gui_gtk_action.c:204 ../src/gui/gtk/gui_gtk_action.c:206 msgid "Info" msgstr "Informazioni" ! #: ../src/gui/gtk/gui_gtk_action.c:209 msgid "Clear" msgstr "Pulisci" ! #: ../src/gui/gtk/gui_gtk_action.c:210 msgid "Test" msgstr "Test" ! #: ../src/gui/gtk/gui_gtk_action.c:211 msgid "_Quit" msgstr "_Esci" ! #: ../src/gui/gtk/gui_gtk_action.c:218 msgid "Cursor" msgstr "Cursore" ! #: ../src/gui/gtk/gui_gtk_action.c:219 msgid "Tracking" msgstr "Tracking" ! #: ../src/gui/gtk/gui_gtk_action.c:220 msgid "Orientation" msgstr "Bussola" ! #: ../src/gui/gtk/gui_gtk_action.c:222 ../src/gui/gtk/gui_gtk_action.c:224 msgid "Fullscreen" msgstr "Schermo intero" ! #: ../src/gui/gtk/gui_gtk_action.c:232 msgid "Data" msgstr "Dati" ! #: ../src/gui/gtk/gui_gtk_action.c:233 msgid "VisibleBlocks" msgstr "BlocchiVisibili" ! #: ../src/gui/gtk/gui_gtk_action.c:234 msgid "VisibleTowns" msgstr "Città Visibili" ! #: ../src/gui/gtk/gui_gtk_action.c:235 msgid "VisiblePolys" msgstr "PoligoniVisibili" ! #: ../src/gui/gtk/gui_gtk_action.c:236 msgid "VisibleStreets" msgstr "StradeVisibili" ! #: ../src/gui/gtk/gui_gtk_action.c:237 msgid "VisiblePoints" msgstr "PuntiVisibili" ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "N" ! msgstr "" ! ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "NE" ! msgstr "" ! ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "E" ! msgstr "" ! ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "SE" ! msgstr "" ! ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "S" ! msgstr "" ! ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "SW" ! msgstr "" ! ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "W" ! msgstr "" ! ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "NW" ! msgstr "" ! ! #: ../src/gui/gtk/gui_gtk_statusbar.c:105 ! #, c-format ! msgid "Route %4.0fkm %02d:%02d ETA" ! msgstr "" ! ! #: ../src/gui/gtk/gui_gtk_statusbar.c:156 ! msgid "Route 0000km 0+00:00 ETA" ! msgstr "" ! #, fuzzy ! #~ msgid "RouteGraph" ! #~ msgstr "Percorso" #~ msgid "two kilometers" --- NEW FILE: da.po --- # Danish translation for Navit # Copyright (C) 2008 # This file is distributed under the same license as the navit package. # Glenn Sommer <gl...@gm...>, 2008. # msgid "" msgstr "" "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-01-15 20:02+0100\n" "PO-Revision-Date: 2008-01-15 22:20+0100\n" "Last-Translator: Glenn Sommer <gl...@gm...>>\n" "Language-Team: Glenn Sommer <gl...@gm...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: ../src/main.c:108 #, c-format msgid "Running from source directory\n" msgstr "Afvikler fra kildekode mappen\n" #: ../src/main.c:124 #, c-format msgid "setting '%s' to '%s'\n" msgstr "sætter '%s' til '%s'\n" #: ../src/main.c:202 #, c-format msgid "No config file navit.xml, navit.xml.local found\n" msgstr "Ingen konfigurationsfil navit.xml eller navit.xml.local fundet\n" #: ../src/main.c:206 #, c-format msgid "Error parsing '%s': %s\n" msgstr "Fejl ved analyse '%s': %s\n" #: ../src/main.c:209 #, c-format msgid "Using '%s'\n" msgstr "Bruger '%s'\n" #: ../src/main.c:212 #, c-format msgid "No instance has been created, exiting\n" msgstr "Ingen instanser er oprettet, afslutter\n" #: ../src/navigation.c:162 #, c-format msgid "%d m" msgstr "%d m" #: ../src/navigation.c:164 #, c-format msgid "in %d m" msgstr "i %d m" #: ../src/navigation.c:168 #, c-format msgid "%d meters" msgstr "%d meter" #: ../src/navigation.c:170 #, c-format msgid "in %d meters" msgstr "om %d meters" #: ../src/navigation.c:176 #, c-format msgid "%d.%d kilometer" msgstr "%d.%d kilometer" #: ../src/navigation.c:178 #, c-format msgid "in %d.%d kilometers" msgstr "om %d.%d kilometer" #: ../src/navigation.c:182 #, c-format #, fuzzy, c-format msgid "one kilometer" msgid_plural "%d kilometers" msgstr[0] "én kilometer" msgstr[1] "én kilometer" #: ../src/navigation.c:184 #, fuzzy, c-format msgid "in one kilometer" msgid_plural "in %d kilometers" msgstr[0] "om én kilometer" msgstr[1] "om én kilometer" #: ../src/navigation.c:402 msgid "right" msgstr "højre" #: ../src/navigation.c:409 msgid "left" msgstr "venstre" #: ../src/navigation.c:413 msgid "easily " msgstr "blødt " #: ../src/navigation.c:417 msgid "strongly " msgstr "skarpt " #: ../src/navigation.c:420 msgid "unknown " msgstr "ukendt " #: ../src/navigation.c:426 msgid "When possible, please turn around" msgstr "NÃ¥r muligt, vend venligst om" #: ../src/navigation.c:433 #, c-format msgid "Follow the road for the next %s" msgstr "Følg vejen de næste %s" #: ../src/navigation.c:437 msgid "soon" msgstr "snart" #: ../src/navigation.c:443 msgid "now" msgstr "nu" #: ../src/navigation.c:446 msgid "error" msgstr "fejl" #. TRANSLATORS: The first argument is strength, the second direction and the third distance #: ../src/navigation.c:450 #, c-format msgid "Turn %1$s%2$s %3$s" msgstr "Drej %1$s til %2$s %3$s" #: ../src/navigation.c:453 #, c-format msgid "You have reached your destination %s" msgstr "Du er fremme ved destinationen %s" #: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Layout" #: ../src/navit.c:668 msgid "Projection" msgstr "Visning" #: ../src/navit.c:723 msgid "Former Destinations" msgstr "Tidligere destinationer" #: ../src/navit.c:733 msgid "Bookmarks" msgstr "Bogmærker" #: ../src/navit.c:771 msgid "Vehicle" msgstr "Køretøj" #: ../src/navit.c:821 msgid "Command" msgstr "Kommando" #: ../src/navit.c:826 msgid "Length" msgstr "Længde" #: ../src/navit.c:832 msgid "Time" msgstr "Tid" #: ../src/navit.c:837 msgid "Destination Length" msgstr "Længde til destinationen" #: ../src/navit.c:843 msgid "Destination Time" msgstr "Tid til destinationen" #: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "Vejbog" #: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Kort" #: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Rute" #: ../src/popup.c:229 #, c-format msgid "Point 0x%x 0x%x" msgstr "Punkt 0x%x 0x%x" #: ../src/popup.c:230 #, c-format msgid "Screen %d %d" msgstr "Skærm %d %d" #: ../src/popup.c:239 msgid "Set as position" msgstr "Sæt som position" #: ../src/popup.c:240 msgid "Set as destination" msgstr "Sæt som destination" #: ../src/popup.c:241 msgid "Add as bookmark" msgstr "Tilføj som bogmærke" #: ../src/country.c:24 msgid "Czech Republic" msgstr "Tjekkiet" #: ../src/country.c:25 msgid "Slovakia" msgstr "Slovakiet" #: ../src/country.c:26 msgid "San Marino" msgstr "San Marino" #: ../src/country.c:27 msgid "Estonia" msgstr "Estland" #: ../src/country.c:28 msgid "Georgia" msgstr "Georgien" #: ../src/country.c:29 msgid "Latvia" msgstr "Latvia" #: ../src/country.c:30 msgid "Lithuania" msgstr "Litauen" #: ../src/country.c:31 msgid "Moldova" msgstr "Moldova" #: ../src/country.c:32 msgid "Russian Federation" msgstr "Rusland" #: ../src/country.c:33 msgid "Ukraine" msgstr "Ukraine" #: ../src/country.c:34 msgid "Belarus" msgstr "Hvide-rusland" #: ../src/country.c:35 msgid "Egypt" msgstr "Egypten" #: ../src/country.c:36 msgid "Greece" msgstr "Grækenland" #: ../src/country.c:37 msgid "Netherlands" msgstr "Holland" #: ../src/country.c:38 msgid "Belgium" msgstr "Belgien" #: ../src/country.c:39 msgid "France" msgstr "Frankring" #: ../src/country.c:40 msgid "Spain" msgstr "Spanien" #: ../src/country.c:41 msgid "Hungary" msgstr "Ungarn" #: ../src/country.c:42 msgid "Italy" msgstr "Italien" #: ../src/country.c:43 msgid "Romania" msgstr "Romænien" #: ../src/country.c:44 msgid "Switzerland" msgstr "Schweiz" #: ../src/country.c:45 msgid "Austria" msgstr "Australien" #: ../src/country.c:46 msgid "United Kingdom" msgstr "Storbritanien" #: ../src/country.c:47 msgid "Denmark" msgstr "Danmark" #: ../src/country.c:48 msgid "Sweden" msgstr "Sverige" #: ../src/country.c:49 msgid "Norway" msgstr "Norge" #: ../src/country.c:50 msgid "Poland" msgstr "Polen" #: ../src/country.c:51 msgid "Germany" msgstr "Tyskland" #: ../src/country.c:52 msgid "Gibraltar" msgstr "Gibraltar" #: ../src/country.c:53 msgid "Portugal" msgstr "Portugal" #: ../src/country.c:54 msgid "Luxembourg" msgstr "Luxembourg" #: ../src/country.c:55 msgid "Ireland" msgstr "Irland" #: ../src/country.c:56 msgid "Iceland" msgstr "Island" #: ../src/country.c:57 msgid "Albania" msgstr "Albanien" #: ../src/country.c:58 msgid "Malta" msgstr "Malta" #: ../src/country.c:59 msgid "Cyprus" msgstr "Cypern" #: ../src/country.c:60 msgid "Finland" msgstr "Finland" #: ../src/country.c:61 msgid "Bulgaria" msgstr "Bulgarien" #: ../src/country.c:62 msgid "Lebanon" msgstr "Libanon" #: ../src/country.c:63 msgid "Andorra" msgstr "Andorra" #: ../src/country.c:64 msgid "Syria" msgstr "Syrien" #: ../src/country.c:65 msgid "Saudi Arabia" msgstr "Saudi-Arabien" #: ../src/country.c:66 msgid "Libia" msgstr "Liberia" #: ../src/country.c:67 msgid "Israel" msgstr "Israel" #: ../src/country.c:68 msgid "Palestinia" msgstr "Palæstina" #: ../src/country.c:69 msgid "Liechtenstein" msgstr "Liechtenstein" #: ../src/country.c:70 msgid "Morocco" msgstr "Marokko" #: ../src/country.c:71 msgid "Algeria" msgstr "Algeriet" #: ../src/country.c:72 msgid "Tunisia" msgstr "Tunesien" #: ../src/country.c:73 msgid "Serbia" msgstr "Serbien" #: ../src/country.c:74 msgid "Jordan" msgstr "Jordan" #: ../src/country.c:75 msgid "Croatia" msgstr "Kroatien" #: ../src/country.c:76 msgid "Slovenia" msgstr "Slovenien" #: ../src/country.c:77 msgid "Bosnia and Herzegovina" msgstr "Bosnien-Hercegovina" #: ../src/country.c:78 msgid "Macedonia" msgstr "Makedonien" #: ../src/country.c:79 msgid "Turkey" msgstr "Tyrkiet" #: ../src/country.c:80 msgid "Monaco" msgstr "Monaco" #: ../src/country.c:81 msgid "Azerbaijan" msgstr "Aserbajdsjan" #: ../src/country.c:82 msgid "Armenia" msgstr "Armenien" #: ../src/country.c:83 msgid "Faroe Islands" msgstr "Færøerne" #: ../src/country.c:84 msgid "Western Sahara" msgstr "Vestsahara" #: ../src/country.c:85 msgid "Svalbard and Jan Mayen" msgstr "" #: ../src/gui/gtk/destination.c:96 ../src/gui/gtk/destination.c:97 #: ../src/gui/gtk/destination.c:98 ../src/gui/gtk/destination.c:99 msgid "Car" msgstr "Bil" #: ../src/gui/gtk/destination.c:96 msgid "Iso2" msgstr "Iso2" #: ../src/gui/gtk/destination.c:96 msgid "Iso3" msgstr "Iso3" #: ../src/gui/gtk/destination.c:96 ../src/gui/gtk/destination.c:334 msgid "Country" msgstr "Land" #: ../src/gui/gtk/destination.c:97 ../src/gui/gtk/destination.c:98 #: ../src/gui/gtk/destination.c:99 msgid "Postal" msgstr "" #: ../src/gui/gtk/destination.c:97 ../src/gui/gtk/destination.c:98 #: ../src/gui/gtk/destination.c:99 msgid "Town" msgstr "By" #: ../src/gui/gtk/destination.c:97 ../src/gui/gtk/destination.c:98 #: ../src/gui/gtk/destination.c:99 msgid "District" msgstr "OmrÃ¥de" #: ../src/gui/gtk/destination.c:98 ../src/gui/gtk/destination.c:99 #: ../src/gui/gtk/destination.c:343 msgid "Street" msgstr "Gade" #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:345 msgid "Number" msgstr "Nummer" #: ../src/gui/gtk/destination.c:329 msgid "Enter Destination" msgstr "Indtast destination" #: ../src/gui/gtk/destination.c:336 msgid "Zip Code" msgstr "Postnummer" #: ../src/gui/gtk/destination.c:338 msgid "City" msgstr "By" #: ../src/gui/gtk/destination.c:340 msgid "District/Township" msgstr "Distrikt" #: ../src/gui/gtk/destination.c:369 msgid "Bookmark" msgstr "Bogmærke" #: ../src/gui/gtk/destination.c:370 ../src/gui/gtk/gui_gtk_action.c:208 msgid "Destination" msgstr "Destination" #: ../src/gui/gtk/gui_gtk_action.c:195 msgid "Display" msgstr "Vis" #: ../src/gui/gtk/gui_gtk_action.c:199 msgid "ZoomOut" msgstr "Zoom ud" #: ../src/gui/gtk/gui_gtk_action.c:200 msgid "ZoomIn" msgstr "Zoom ind" #: ../src/gui/gtk/gui_gtk_action.c:201 msgid "Refresh" msgstr "Forny" #: ../src/gui/gtk/gui_gtk_action.c:204 ../src/gui/gtk/gui_gtk_action.c:206 msgid "Info" msgstr "Information" #: ../src/gui/gtk/gui_gtk_action.c:209 msgid "Clear" msgstr "Ryd" #: ../src/gui/gtk/gui_gtk_action.c:210 msgid "Test" msgstr "Test" #: ../src/gui/gtk/gui_gtk_action.c:211 msgid "_Quit" msgstr "_Afslut" #: ../src/gui/gtk/gui_gtk_action.c:218 msgid "Cursor" msgstr "Markør" #: ../src/gui/gtk/gui_gtk_action.c:219 msgid "Tracking" msgstr "Sporing" #: ../src/gui/gtk/gui_gtk_action.c:220 msgid "Orientation" msgstr "Retning" #: ../src/gui/gtk/gui_gtk_action.c:222 ../src/gui/gtk/gui_gtk_action.c:224 msgid "Fullscreen" msgstr "Fuldskærm" #: ../src/gui/gtk/gui_gtk_action.c:232 msgid "Data" msgstr "Data" #: ../src/gui/gtk/gui_gtk_action.c:233 msgid "VisibleBlocks" msgstr "Synlige Blokke" #: ../src/gui/gtk/gui_gtk_action.c:234 msgid "VisibleTowns" msgstr "Synlige byer" #: ../src/gui/gtk/gui_gtk_action.c:235 msgid "VisiblePolys" msgstr "Synlige Polygomer" #: ../src/gui/gtk/gui_gtk_action.c:236 msgid "VisibleStreets" msgstr "Synlige veje" #: ../src/gui/gtk/gui_gtk_action.c:237 msgid "VisiblePoints" msgstr "Synlige punkter" #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 msgid "N" msgstr "N" #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 msgid "NE" msgstr "NÃ" #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 msgid "E" msgstr "Ã" #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 msgid "SE" msgstr "SÃ" #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 msgid "S" msgstr "S" #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 msgid "SW" msgstr "SV" #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 msgid "W" msgstr "V" #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 msgid "NW" msgstr "NV" #: ../src/gui/gtk/gui_gtk_statusbar.c:105 #, c-format msgid "Route %4.0fkm %02d:%02d ETA" msgstr "Rute %4.0fkm %02d:%02d ETA" #: ../src/gui/gtk/gui_gtk_statusbar.c:156 msgid "Route 0000km 0+00:00 ETA" msgstr "Rute 0000km 0+00:00 ETA" Index: fr.po =================================================================== RCS file: /cvsroot/navit/navit/po/fr.po,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** fr.po 26 Dec 2007 11:18:22 -0000 1.35 --- fr.po 16 Jan 2008 22:30:50 -0000 1.36 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-26 11:26+0100\n" "PO-Revision-Date: 2007-12-17 11:36+0100\n" "Last-Translator: KaZeR <ka...@al...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-01-16 23:15+0100\n" "PO-Revision-Date: 2007-12-17 11:36+0100\n" "Last-Translator: KaZeR <ka...@al...>\n" *************** *** 17,81 **** "Plural-Forms: nplurals=2; plural=n != 1;\n" ! #: ../src/main.c:94 #, c-format msgid "Running from source directory\n" msgstr "Execution depuis le dossier source\n" ! #: ../src/main.c:110 #, c-format msgid "setting '%s' to '%s'\n" msgstr "'%s' mis à '%s'\n" ! #: ../src/main.c:173 #, c-format msgid "No config file navit.xml, navit.xml.local found\n" msgstr "Fichier de configuration navit.xml ou navit.xml.local non trouvé\n" ! #: ../src/main.c:177 #, c-format msgid "Error parsing '%s': %s\n" msgstr "Erreur lors du traitement de '%s': %s\n" ! #: ../src/main.c:180 #, c-format msgid "Using '%s'\n" msgstr "Utilisation de '%s'\n" ! #: ../src/main.c:183 #, c-format msgid "No instance has been created, exiting\n" msgstr "Pas d'instance créée, sortie\n" ! #: ../src/navigation.c:173 #, c-format msgid "%d m" msgstr "%d mètres" ! #: ../src/navigation.c:175 #, c-format msgid "in %d m" msgstr "dans %d m" ! #: ../src/navigation.c:179 #, c-format msgid "%d meters" msgstr "%d mètres" ! #: ../src/navigation.c:181 #, c-format msgid "in %d meters" msgstr "dans %d mètres" ! #: ../src/navigation.c:187 #, c-format msgid "%d.%d kilometer" msgstr "%d,%d kilomètres" ! #: ../src/navigation.c:189 #, c-format msgid "in %d.%d kilometers" msgstr "dans %d.%d kilomètres" ! #: ../src/navigation.c:193 #, c-format msgid "one kilometer" --- 17,81 ---- "Plural-Forms: nplurals=2; plural=n != 1;\n" ! #: ../src/main.c:108 #, c-format msgid "Running from source directory\n" msgstr "Execution depuis le dossier source\n" ! #: ../src/main.c:124 #, c-format msgid "setting '%s' to '%s'\n" msgstr "'%s' mis à '%s'\n" ! #: ../src/main.c:202 #, c-format msgid "No config file navit.xml, navit.xml.local found\n" msgstr "Fichier de configuration navit.xml ou navit.xml.local non trouvé\n" ! #: ../src/main.c:206 #, c-format msgid "Error parsing '%s': %s\n" msgstr "Erreur lors du traitement de '%s': %s\n" ! #: ../src/main.c:209 #, c-format msgid "Using '%s'\n" msgstr "Utilisation de '%s'\n" ! #: ../src/main.c:212 #, c-format msgid "No instance has been created, exiting\n" msgstr "Pas d'instance créée, sortie\n" ! #: ../src/navigation.c:162 #, c-format msgid "%d m" msgstr "%d mètres" ! #: ../src/navigation.c:164 #, c-format msgid "in %d m" msgstr "dans %d m" ! #: ../src/navigation.c:168 #, c-format msgid "%d meters" msgstr "%d mètres" ! #: ../src/navigation.c:170 #, c-format msgid "in %d meters" msgstr "dans %d mètres" ! #: ../src/navigation.c:176 #, c-format msgid "%d.%d kilometer" msgstr "%d,%d kilomètres" ! #: ../src/navigation.c:178 #, c-format msgid "in %d.%d kilometers" msgstr "dans %d.%d kilomètres" ! #: ../src/navigation.c:182 #, c-format msgid "one kilometer" *************** *** 84,88 **** msgstr[1] "%d kilomètres" ! #: ../src/navigation.c:195 #, c-format msgid "in one kilometer" --- 84,88 ---- msgstr[1] "%d kilomètres" ! #: ../src/navigation.c:184 #, c-format msgid "in one kilometer" *************** *** 91,202 **** msgstr[1] "dans %d kilomètres" ! #: ../src/navigation.c:399 msgid "right" msgstr "à droite" ! #: ../src/navigation.c:406 msgid "left" msgstr "à gauche" ! #: ../src/navigation.c:410 msgid "easily " msgstr "légérement " ! #: ../src/navigation.c:414 msgid "strongly " msgstr "fortement " ! #: ../src/navigation.c:417 msgid "unknown " msgstr "inconnu" ! #: ../src/navigation.c:423 msgid "When possible, please turn around" msgstr "Dès que possible, faites demi-tour" ! #: ../src/navigation.c:430 #, c-format msgid "Follow the road for the next %s" msgstr "Suivez la route sur %s" ! #: ../src/navigation.c:434 msgid "soon" msgstr "bientôt" ! #: ../src/navigation.c:440 msgid "now" msgstr "maintenant" ! #: ../src/navigation.c:443 msgid "error" msgstr "erreur" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:447 #, c-format msgid "Turn %1$s%2$s %3$s" msgstr "%3$s tournez %1$s%2$s" ! #: ../src/navigation.c:450 #, c-format msgid "You have reached your destination %s" msgstr "Vous êtes arrivé à votre destination %s" ! #: ../src/navit.c:614 ../src/gui/gtk/gui_gtk_action.c:185 msgid "Layout" msgstr "Calques" ! #: ../src/navit.c:630 msgid "Projection" msgstr "Projection" ! #: ../src/navit.c:685 msgid "Former Destinations" msgstr "Destinations précédentes" ! #: ../src/navit.c:695 msgid "Bookmarks" msgstr "" ! #: ../src/navit.c:733 msgid "Vehicle" msgstr "" ! #: ../src/navit.c:768 #, fuzzy msgid "Command" msgstr "Pologne" ! #: ../src/navit.c:773 msgid "Length" msgstr "" ! #: ../src/navit.c:778 msgid "Time" msgstr "" ! #: ../src/navit.c:783 #, fuzzy msgid "Destination Length" msgstr "Destination" ! #: ../src/navit.c:788 #, fuzzy msgid "Destination Time" msgstr "Destination" ! #: ../src/navit.c:810 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "Carnet de route" ! #: ../src/navit.c:1030 ../src/gui/gtk/destination.c:365 ! #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Carte" ! #: ../src/navit.c:1037 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Route" #: ../src/country.c:24 msgid "Czech Republic" --- 91,225 ---- msgstr[1] "dans %d kilomètres" ! #: ../src/navigation.c:402 msgid "right" msgstr "à droite" ! #: ../src/navigation.c:409 msgid "left" msgstr "à gauche" ! #: ../src/navigation.c:413 msgid "easily " msgstr "légérement " ! #: ../src/navigation.c:417 msgid "strongly " msgstr "fortement " ! #: ../src/navigation.c:420 msgid "unknown " msgstr "inconnu" ! #: ../src/navigation.c:426 msgid "When possible, please turn around" msgstr "Dès que possible, faites demi-tour" ! #: ../src/navigation.c:433 #, c-format msgid "Follow the road for the next %s" msgstr "Suivez la route sur %s" ! #: ../src/navigation.c:437 msgid "soon" msgstr "bientôt" ! #: ../src/navigation.c:443 msgid "now" msgstr "maintenant" ! #: ../src/navigation.c:446 msgid "error" msgstr "erreur" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:450 #, c-format msgid "Turn %1$s%2$s %3$s" msgstr "%3$s tournez %1$s%2$s" ! #: ../src/navigation.c:453 #, c-format msgid "You have reached your destination %s" msgstr "Vous êtes arrivé à votre destination %s" ! #: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Calques" ! #: ../src/navit.c:668 msgid "Projection" msgstr "Projection" ! #: ../src/navit.c:723 msgid "Former Destinations" msgstr "Destinations précédentes" ! #: ../src/navit.c:733 msgid "Bookmarks" msgstr "" ! #: ../src/navit.c:771 msgid "Vehicle" msgstr "" ! #: ../src/navit.c:821 #, fuzzy msgid "Command" msgstr "Pologne" ! #: ../src/navit.c:826 msgid "Length" msgstr "" ! #: ../src/navit.c:832 msgid "Time" msgstr "" ! #: ../src/navit.c:837 #, fuzzy msgid "Destination Length" msgstr "Destination" ! #: ../src/navit.c:843 #, fuzzy msgid "Destination Time" msgstr "Destination" ! #: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "Carnet de route" ! #: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368 ! #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Carte" ! #: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Route" + #: ../src/popup.c:229 + #, c-format + msgid "Point 0x%x 0x%x" + msgstr "" + + #: ../src/popup.c:230 + #, c-format + msgid "Screen %d %d" + msgstr "" + + #: ../src/popup.c:239 + msgid "Set as position" + msgstr "" + + #: ../src/popup.c:240 + #, fuzzy + msgid "Set as destination" + msgstr "Destination" + + #: ../src/popup.c:241 + msgid "Add as bookmark" + msgstr "" + #: ../src/country.c:24 msgid "Czech Republic" *************** *** 447,590 **** msgstr "Spitzberg" ! #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:100 ! #: ../src/gui/gtk/destination.c:101 ../src/gui/gtk/destination.c:102 msgid "Car" msgstr "Voiture" ! #: ../src/gui/gtk/destination.c:99 msgid "Iso2" msgstr "" ! #: ../src/gui/gtk/destination.c:99 msgid "Iso3" msgstr "" ! #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:331 msgid "Country" msgstr "Pays" ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 msgid "Postal" msgstr "Code Postal" ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 msgid "Town" msgstr "" ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 msgid "District" msgstr "District" ! #: ../src/gui/gtk/destination.c:101 ../src/gui/gtk/destination.c:102 ! #: ../src/gui/gtk/destination.c:340 msgid "Street" msgstr "Rue" ! #: ../src/gui/gtk/destination.c:102 ../src/gui/gtk/destination.c:342 msgid "Number" msgstr "Numéro" ! #: ../src/gui/gtk/destination.c:326 msgid "Enter Destination" msgstr "Destination" ! #: ../src/gui/gtk/destination.c:333 msgid "Zip Code" msgstr "Code postal" ! #: ../src/gui/gtk/destination.c:335 msgid "City" msgstr "Ville" ! #: ../src/gui/gtk/destination.c:337 msgid "District/Township" msgstr "District" ! #: ../src/gui/gtk/destination.c:366 msgid "Bookmark" msgstr "" ! #: ../src/gui/gtk/destination.c:367 ../src/gui/gtk/gui_gtk_action.c:195 msgid "Destination" msgstr "Destination" ! #: ../src/gui/gtk/gui_gtk_action.c:182 msgid "Display" msgstr "Affichage" ! #: ../src/gui/gtk/gui_gtk_action.c:186 msgid "ZoomOut" msgstr "Zoom Arrière" ! #: ../src/gui/gtk/gui_gtk_action.c:187 msgid "ZoomIn" msgstr "Zoom Avant" ! #: ../src/gui/gtk/gui_gtk_action.c:188 msgid "Refresh" msgstr "Rafraichir" ! #: ../src/gui/gtk/gui_gtk_action.c:191 ../src/gui/gtk/gui_gtk_action.c:193 msgid "Info" msgstr "Info" ! #: ../src/gui/gtk/gui_gtk_action.c:196 msgid "Clear" msgstr "Effacer" ! #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Test" msgstr "Test" ! #: ../src/gui/gtk/gui_gtk_action.c:198 msgid "_Quit" msgstr "_Quitter" ! #: ../src/gui/gtk/gui_gtk_action.c:205 msgid "Cursor" msgstr "Curseur" ! #: ../src/gui/gtk/gui_gtk_action.c:206 msgid "Tracking" msgstr "Suivi" ! #: ../src/gui/gtk/gui_gtk_action.c:207 msgid "Orientation" msgstr "Orientation" ! #: ../src/gui/gtk/gui_gtk_action.c:209 ../src/gui/gtk/gui_gtk_action.c:211 msgid "Fullscreen" msgstr "Plein écran" ! #: ../src/gui/gtk/gui_gtk_action.c:219 msgid "Data" msgstr "Données" ! #: ../src/gui/gtk/gui_gtk_action.c:220 msgid "VisibleBlocks" msgstr "Blocs visibles" ! #: ../src/gui/gtk/gui_gtk_action.c:221 msgid "VisibleTowns" msgstr "Villes visibles" ! #: ../src/gui/gtk/gui_gtk_action.c:222 msgid "VisiblePolys" msgstr "Polys visibles" ! #: ../src/gui/gtk/gui_gtk_action.c:223 msgid "VisibleStreets" msgstr "Rues visibles" ! #: ../src/gui/gtk/gui_gtk_action.c:224 msgid "VisiblePoints" msgstr "Points visibles" ! #: ../src/gui/gtk/gui_gtk_action.c:225 ! msgid "RouteGraph" ! msgstr "RouteGraph" #~ msgid "two kilometers" --- 470,653 ---- msgstr "Spitzberg" ! #: ../src/gui/gtk/destination.c:96 ../src/gui/gtk/destination.c:97 ! #: ../src/gui/gtk/destination.c:98 ../src/gui/gtk/destination.c:99 msgid "Car" msgstr "Voiture" ! #: ../src/gui/gtk/destination.c:96 msgid "Iso2" msgstr "" ! #: ../src/gui/gtk/destination.c:96 msgid "Iso3" msgstr "" ! #: ../src/gui/gtk/destination.c:96 ../src/gui/gtk/destination.c:334 msgid "Country" msgstr "Pays" ! #: ../src/gui/gtk/destination.c:97 ../src/gui/gtk/destination.c:98 ! #: ../src/gui/gtk/destination.c:99 msgid "Postal" msgstr "Code Postal" ! #: ../src/gui/gtk/destination.c:97 ../src/gui/gtk/destination.c:98 ! #: ../src/gui/gtk/destination.c:99 msgid "Town" msgstr "" ! #: ../src/gui/gtk/destination.c:97 ../src/gui/gtk/destination.c:98 ! #: ../src/gui/gtk/destination.c:99 msgid "District" msgstr "District" ! #: ../src/gui/gtk/destination.c:98 ../src/gui/gtk/destination.c:99 ! #: ../src/gui/gtk/destination.c:343 msgid "Street" msgstr "Rue" ! #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:345 msgid "Number" msgstr "Numéro" ! #: ../src/gui/gtk/destination.c:329 msgid "Enter Destination" msgstr "Destination" ! #: ../src/gui/gtk/destination.c:336 msgid "Zip Code" msgstr "Code postal" ! #: ../src/gui/gtk/destination.c:338 msgid "City" msgstr "Ville" ! #: ../src/gui/gtk/destination.c:340 msgid "District/Township" msgstr "District" ! #: ../src/gui/gtk/destination.c:369 msgid "Bookmark" msgstr "" ! #: ../src/gui/gtk/destination.c:370 ../src/gui/gtk/gui_gtk_action.c:208 msgid "Destination" msgstr "Destination" ! #: ../src/gui/gtk/gui_gtk_action.c:195 msgid "Display" msgstr "Affichage" ! #: ../src/gui/gtk/gui_gtk_action.c:199 msgid "ZoomOut" msgstr "Zoom Arrière" ! #: ../src/gui/gtk/gui_gtk_action.c:200 msgid "ZoomIn" msgstr "Zoom Avant" ! #: ../src/gui/gtk/gui_gtk_action.c:201 msgid "Refresh" msgstr "Rafraichir" ! #: ../src/gui/gtk/gui_gtk_action.c:204 ../src/gui/gtk/gui_gtk_action.c:206 msgid "Info" msgstr "Info" ! #: ../src/gui/gtk/gui_gtk_action.c:209 msgid "Clear" msgstr "Effacer" ! #: ../src/gui/gtk/gui_gtk_action.c:210 msgid "Test" msgstr "Test" ! #: ../src/gui/gtk/gui_gtk_action.c:211 msgid "_Quit" msgstr "_Quitter" ! #: ../src/gui/gtk/gui_gtk_action.c:218 msgid "Cursor" msgstr "Curseur" ! #: ../src/gui/gtk/gui_gtk_action.c:219 msgid "Tracking" msgstr "Suivi" ! #: ../src/gui/gtk/gui_gtk_action.c:220 msgid "Orientation" msgstr "Orientation" ! #: ../src/gui/gtk/gui_gtk_action.c:222 ../src/gui/gtk/gui_gtk_action.c:224 msgid "Fullscreen" msgstr "Plein écran" ! #: ../src/gui/gtk/gui_gtk_action.c:232 msgid "Data" msgstr "Données" ! #: ../src/gui/gtk/gui_gtk_action.c:233 msgid "VisibleBlocks" msgstr "Blocs visibles" ! #: ../src/gui/gtk/gui_gtk_action.c:234 msgid "VisibleTowns" msgstr "Villes visibles" ! #: ../src/gui/gtk/gui_gtk_action.c:235 msgid "VisiblePolys" msgstr "Polys visibles" ! #: ../src/gui/gtk/gui_gtk_action.c:236 msgid "VisibleStreets" msgstr "Rues visibles" ! #: ../src/gui/gtk/gui_gtk_action.c:237 msgid "VisiblePoints" msgstr "Points visibles" ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "N" ! msgstr "" ! ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "NE" ! msgstr "" ! ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "E" ! msgstr "" ! ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "SE" ! msgstr "" ! ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "S" ! msgstr "" ! ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "SW" ! msgstr "" ! ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "W" ! msgstr "" ! ! #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83 ! msgid "NW" ! msgstr "" ! ! #: ../src/gui/gtk/gui_gtk_statusbar.c:105 ! #, c-format ! msgid "Route %4.0fkm %02d:%02d ETA" ! msgstr "" ! ! #: ../src/gui/gtk/gui_gtk_statusbar.c:156 ! msgid "Route 0000km 0+00:00 ETA" ! msgstr "" ! ! #~ msgid "RouteGraph" ! #~ msgstr "RouteGraph" #~ msgid "two kilometers" Index: nl.po =================================================================== RCS file: /cvsroot/navit/navit/po/nl.po,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** nl.po 14 Jan 2008 22:34:36 -0000 1.2 --- nl.po 16 Jan 2008 22:30:50 -0000 1.3 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-01-14 23:23+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: afaber <afaber_at_sourceforge_dot._net>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-01-16 23:15+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: afaber <afaber_at_sourceforge_dot._net>\n" *************** *** 646,650 **** msgstr "Route %4.0fkm %02d:%02d Aankomsttijd" ! #: ../src/gui/gtk/gui_gtk_statusbar.c:153 msgid "Route 0000km 0+00:00 ETA" msgstr "Route 0000km 0+00:00 Aankomsttijd" --- 646,650 ---- msgstr "Route %4.0fkm %02d:%02d Aankomsttijd" ! #: ../src/gui/gtk/gui_gtk_statusbar.c:156 msgid "Route 0000km 0+00:00 ETA" msgstr "Route 0000km 0+00:00 Aankomsttijd" Index: de.po =================================================================== RCS file: /cvsroot/navit/navit/po/de.po,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** de.po 26 Dec 2007 11:18:22 -0000 1.21 --- de.po 16 Jan 2008 22:30:49 -0000 1.22 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-26 11:26+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Martin Schaller <mar...@so...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-01-16 23:15+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Martin Schaller <mar...@so...>\n" *************** *** 17,81 **** "Plural-Forms: nplurals=2; plural=n != 1;\n" ! #: ../src/main.c:94 #, c-format msgid "Running from source directory\n" msgstr "Aufruf aus Quellverzeichnis\n" ! #: ../src/main.c:110 #, c-format msgid "setting '%s' to '%s'\n" msgstr "setze '%s' auf '%s'\n" ! #: ../src/main.c:173 #, c-format msgid "No config file navit.xml, navit.xml.local found\n" msgstr "Keine Konfigurationsdatei navit.xml, navit.xml.local gefunden\n" ! #: ../src/main.c:177 #, c-format msgid "Error parsing '%s': %s\n" msgstr "Fehler beim Parsen von '%s': %s\n" ! #: ../src/main.c:180 #, c-format msgid "Using '%s'\n" msgstr "Benutze '%s'\n" ! #: ../src/main.c:183 #, c-format msgid "No instance has been created, exiting\n" msgstr "Es wurde keine Instanz erzeugt, Ende\n" ! #: ../src/navigation.c:173 #, c-format msgid "%d m" msgstr "%d Meter" ! #: ../src/navigation.c:175 #, c-format msgid "in %d m" msgstr "In %d metern" ! #: ../src/navigation.c:179 #, c-format msgid "%d meters" msgstr "%d Meter" ! #: ../src/navigation.c:181 #, c-format msgid "in %d meters" msgstr "In %d metern" ! #: ../src/navigation.c:187 #, c-format msgid "%d.%d kilometer" msgstr "%d,%d Kilometer" ! #: ../src/navigation.c:189 #, c-format msgid "in %d.%d kilometers" msgstr "In %d,%d Kilometern" ! #: ../src/navigation.c:193 #, c-format msgid "one kilometer" --- 17,81 ---- "Plural-Forms: nplurals=2; plural=n != 1;\n" ! #: ../src/main.c:108 #, c-format msgid "Running from source directory\n" msgstr "Aufruf aus Quellverzeichnis\n" ! #: ../src/main.c:124 #, c-format msgid "setting '%s' to '%s'\n" msgstr "setze '%s' auf '%s'\n" ! #: ../src/main.c:202 #, c-format msgid "No config file navit.xml, navit.xml.local found\n" msgstr "Keine Konfigurationsdatei navit.xml, navit.xml.local gefunden\n" ! #: ../src/main.c:206 #, c-format msgid "Error parsing '%s': %s\n" msgstr "Fehler beim Parsen von '%s': %s\n" ! #: ../src/main.c:209 #, c-format msgid "Using '%s'\n" msgstr "Benutze '%s'\n" ! #: ../src/main.c:212 #, c-format msgid "No instance has been created, exiting\n" msgstr "Es wurde keine Instanz erzeugt, Ende\n" ! #: ../src/navigation.c:162 #, c-format msgid "%d m" msgstr "%d Meter" ! #: ../src/navigation.c:164 #, c-format msgid "in %d m" msgstr "In %d metern" ! #: ../src/navigation.c:168 #, c-format msgid "%d meters" msgstr "%d Meter" ! #: ../src/navigation.c:170 #, c-format msgid "in %d meters" msgstr "In %d metern" ! #: ../src/navigation.c:176 #, c-format msgid "%d.%d kilometer" msgstr "%d,%d Kilometer" ! #: ../src/navigation.c:178 #, c-format msgid "in %d.%d kilometers" msgstr "In %d,%d Kilometern" ! #: ../src/navigation.c:182 #, c-format msgid "one kilometer" *************** *** 84,88 **** msgstr[1] "%d Kilometer" ! #: ../src/navigation.c:195 #, c-format msgid "in one kilometer" --- 84,88 ---- msgstr[1] "%d Kilometer" ! #: ../src/navigation.c:184 #, c-format msgid "in one kilometer" *************** *** 91,200 **** msgstr[1] "In %d Kilometern" ! #: ../src/navigation.c:399 msgid "right" msgstr "rechts" ! #: ../src/navigation.c:406 msgid "left" msgstr "links" ! #: ../src/navigation.c:410 msgid "easily " msgstr "leicht " ! #: ../src/navigation.c:414 msgid "strongly " msgstr "scharf " ! #: ../src/navigation.c:417 msgid "unknown " msgstr "unbekannt " # ! #: ../src/navigation.c:423 msgid "When possible, please turn around" msgstr "Wenn möglich bitte wenden" ! #: ../src/navigation.c:430 #, c-format msgid "Follow the road for the next %s" msgstr "Dem StraÃenverlauf %s folgen" ! #: ../src/navigation.c:434 msgid "soon" msgstr "Demnächst" ! #: ../src/navigation.c:440 msgid "now" msgstr "Jetzt" ! #: ../src/navigation.c:443 msgid "error" msgstr "fehler" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:447 #, c-format msgid "Turn %1$s%2$s %3$s" msgstr "%3$s %1$s%2$s abbiegen" ! #: ../src/navigation.c:450 #, c-format msgid "You have reached your destination %s" msgstr "%s haben Sie ihr Ziel erreicht" ! #: ../src/navit.c:614 ../src/gui/gtk/gui_gtk_action.c:185 msgid "Layout" msgstr "Layout" ! #: ../src/navit.c:630 msgid "Projection" msgstr "Projektion" ! #: ../src/navit.c:685 msgid "Former Destinations" msgstr "Frühere Ziele" ! #: ../src/navit.c:695 msgid "Bookmarks" msgstr "Lesezeichen" ! #: ../src/navit.c:733 msgid "Vehicle" msgstr "Fahrzeug" ! #: ../src/navit.c:768 msgid "Command" msgstr "Kommando" ! #: ../src/navit.c:773 msgid "Length" msgstr "Länge" ! #: ../src/navit.c:778 msgid "Time" msgstr "Zeit" ! #: ../src/navit.c:783 msgid "Destination Length" msgstr "Länge Ziel" ! #: ../src/navit.c:788 msgid "Destination Time" msgstr "Zeit Ziel" ! #: ../src/navit.c:810 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "StraÃenliste" ! #: ../src/navit.c:1030 ../src/gui/gtk/destination.c:365 ! #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Karte" ! #: ../src/navit.c:1037 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Route" #: ../src/country.c:24 msgid "Czech Republic" --- 91,222 ---- msgstr[1] "In %d Kilometern" ! #: ../src/navigation.c:402 msgid "right" msgstr "rechts" ! #: ../src/navigation.c:409 msgid "left" msgstr "links" ! #: ../src/navigation.c:413 msgid "easily " msgstr "leicht " ! #: ../src/navigation.c:417 msgid "strongly " msgstr "scharf " ! #: ../src/navigation.c:420 msgid "unknown " msgstr "unbekannt " # ! #: ../src/navigation.c:426 msgid "When possible, please turn around" msgstr "Wenn möglich bitte wenden" ! #: ../src/navigation.c:433 #, c-format msgid "Follow the road for the next %s" msgstr "Dem StraÃenverlauf %s folgen" ! #: ../src/navigation.c:437 msgid "soon" msgstr "Demnächst" ! #: ../src/navigation.c:443 msgid "now" msgstr "Jetzt" ! #: ../src/navigation.c:446 msgid "error" msgstr "fehler" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:450 #, c-format msgid "Turn %1$s%2$s %3$s" msgstr "%3$s %1$s%2$s abbiegen" ! #: ../src/navigation.c:453 #, c-format msgid "You have reached your destination %s" msgstr "%s haben Sie ihr Ziel erreicht" ! #: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Layout" ! #: ../src/navit.c:668 msgid "Projection" msgstr "Projektion" ! #: ../src/navit.c:723 msgid "Former Destinations" msgstr "Frühere Ziele" ! #: ../src/navit.c:733 msgid "Bookmarks" msgstr "Lesezeichen" ! #: ../src/navit.c:771 msgid "Vehicle" msgstr "Fahrzeug" ! #: ../src/navit.c:821 msgid "Command" msgstr "Kommando" ! #: ../src/navit.c:826 msgid "Length" msgstr "Länge" ! #: ../src/navit.c:832 msgid "Time" msgstr "Zeit" ! #: ../src/navit.c:837 msgid "Destination Length" msgstr "Länge Ziel" ! #: ../src/navit.c:843 msgid "Destination Time" msgstr "Zeit Ziel" ! #: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "StraÃenliste" ! #: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368 ! #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Karte" ! #: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Route" + #: ../src/popup.c:229 + #, c-format + msgid "Point 0x%x 0x%x" + msgstr "Punkt 0x%x 0x%x" + + #: ../src/popup.c:230 + #, c-format + msgid "Screen %d %d" + msgstr "Bildschirm %d %d" + + #: ../src/popup.c:239 + msgid "Set as position" + msgstr "Als Position setzen" + + #: ../src/popup.c:240 + msgid "Set as destination" + msgstr "Als Ziel setzen" + + #: ../src/popup.c:241 + msgid "Add as bookmark" + msgstr "Als Lesezeichen aufnehmen" + #: ../src/country.c:24 msgid "Czech Republic" *************** *** 446,607 **** msgstr "Svalbard und Jan Mayen" ! #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:100 ! #: ../src/gui/gtk/destination.c:101 ../src/gui/gtk/destination.c:102 msgid "Car" msgstr "Auto" ! #: ../src/gui/gtk/destination.c:99 msgid "Iso2" msgstr "Iso2" ! #: ../src/gui/gtk/destination.c:99 msgid "Iso3" msgstr "Iso3" ! #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:331 msgid "Country" msgstr "Land" # ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 msgid "Postal" msgstr "PLZ" ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 msgid "Town" msgstr "Ort" # ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 msgid "District" msgstr "Ortsteil" ! #: ../src/gui/gtk/destination.c:101 ../src/gui/gtk/destination.c:102 ! #: ../src/gui/gtk/destination.c:340 msgid "Street" msgstr "StraÃe" ! #: ../src/gui/gtk/destination.c:102 ../src/gui/gtk/destination.c:342 msgid "Number" msgstr "Nummer" # ! #: ../src/gui/gtk/destination.c:326 msgid "Enter Destination" msgstr "Ziel eingeben" ! #: ../src/gui/gtk/destination.c:333 msgid "Zip Code" msgstr "PLZ" ! #: ../src/gui/gtk/destination.c:335 msgid "City" msgstr "Ort" ! #: ../src/gui/gtk/destination.c:337 msgid "District/Township" msgstr "Ortsteil/Gemeinde" ! #: ../src/gui/gtk/destination.c:366 msgid "Bookmark" msgstr "Lesezeichen" ! #: ../src/gui/gtk/destination.c:367 ../src/gui/gtk/gui_gtk_action.c:195 msgid "Destination" msgstr "Ziel" ! #: ../src/gui/gtk/gui_gtk_action.c:182 msgid "Display" msgstr "Anzeige" ! #: ../src/gui/gtk/gui_gtk_action.c:186 msgid "ZoomOut" msgstr "Verkleinern" ! #: ../src/gui/gtk/gui_gtk_action.c:187 msgid "ZoomIn" msgstr "VergröÃern" ! #: ../src/gui/gtk/gui_gtk_action.c:188 msgid "Refresh" msgstr "Aktualisieren" ! #: ../src/gui/gtk/gui_gtk_action.c:191 ../src/gui/gtk/gui_gtk_action.c:193 msgid "Info" msgstr "Info" ! #: ../src/gui/gtk/gui_gtk_action.c:196 msgid "Clear" msgstr "Löschen" ! #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Test" msgstr "Test" ! #: ../src/gui/gtk/gui_gtk_action.c:198 msgid "_Quit" msgstr "Beenden" ! #: ../src/gui/gtk/gui_gtk_action.c:205 msgid "Cursor" msgstr "Marke" ! #: ../src/gui/gtk/gui_gtk_action.c:206 msgid "Tracking" msgstr "Spurverfolgung" ! #: ../src/gui/gtk/gui_gtk_action.c:207 msgid "Orientation" msgstr "Orientierung" ! #: ../src/gui/gtk/gui_gtk_action.c:209 ../src/gui/gtk/gui_gtk_action.c:211 msgid "Fullscreen" msgstr "Vollbild" ! #: ../src/gui/gtk/gui_gtk_action.c:219 msgid "Data" msgstr "Daten" ! #: ../src/gui/gtk/gui_gtk_action.c:220 msgid "VisibleBlocks" msgstr "Sichtbare Blöcke" ! #: ../src/gui/gtk/gui_gtk_action.c:221 msgid "VisibleTowns" msgstr "Sichtbare Städte" ! #: ../src/gui/gtk/gui_gtk_action.c:222 msgid "VisiblePolys" msgstr "Sichtbare Polygone" ! #: ../src/gui/gtk/gui_gtk_action.c:223 msgid "VisibleStreets" msgstr "Sichtbare StraÃen" ! #: ../src/gui/gtk/gui_gtk_action.c:224 msgid "VisiblePoints" msgstr "Sichtbare Punkte" ! #: ../src/gui/gtk/gui_gtk_action.c:225 ! msgid "RouteGraph" ! msgstr "Route-Graph" ! #~ msgid "Point 0x%x 0x%x" ! #~ msgstr "Punkt 0x%x 0x%x" ! #~ msgid "Screen %d %d" ! #~ msgstr "Bildschirm %d %d" ! #~ msgid "Set as position" ! #~ msgstr "Als Position setzen" ! #~ msgid "Set as destination" ! #~ msgstr "Als Ziel setzen" ! #~ msgid "Add as bookmark" ! #~ msgstr "Als Lesezeichen aufnehmen" #~ msgid "two kilometers" --- 468,654 ---- msgstr "Svalbard und Jan Mayen" ! #: ../src/gui/gtk/destination.c:96 ../src/gui/gtk/destination.c:97 ! #: ../src/gui/gtk/destination.c:98 ../src/gui/gtk/destination.c:99 msgid "Car" msgstr "Auto" ! #: ../src/gui/gtk/destination.c:96 msgid "Iso2" msgstr "Iso2" ! #: ../src/gui/gtk/destination.c:96 msgid "Iso3" msgstr "Iso3" ! #: ../src/gui/gtk/destination.c:96 ../src/gui/gtk/destination.c:334 msgid "Country" msgstr "Land" # ! #: ../src/gui/gtk/destination.c:97 ../src/gui/gtk/destination.... [truncated message content] |
|
From: Martin S. <mar...@us...> - 2008-01-16 22:00:25
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10831 Modified Files: osm2navit.c Log Message: Fix:Tools:Fixed one way handling in osm2navit Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** osm2navit.c 16 Jan 2008 20:41:08 -0000 1.32 --- osm2navit.c 16 Jan 2008 22:00:25 -0000 1.33 *************** *** 314,318 **** level=7; if (! strcmp(k,"oneway")) { ! if (! strcmp(v,"true") || !strcmp(v,"yes")) { flags_attr_value=AF_ONEWAY; flags_attr.len=2; --- 314,318 ---- level=7; if (! strcmp(k,"oneway")) { ! if (! strcasecmp(v,"true") || !strcasecmp(v,"yes") || !strcmp(v,"1")) { flags_attr_value=AF_ONEWAY; flags_attr.len=2; |
|
From: Albert L F. <af...@us...> - 2008-01-16 21:10:12
|
Update of /cvsroot/navit/navit/src/vehicle/file In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21966 Modified Files: vehicle_file.c Log Message: Fix:vehicle/vehicle_file:fix locale specific floating point conversion issues Index: vehicle_file.c =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle/file/vehicle_file.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** vehicle_file.c 16 Jan 2008 20:54:35 -0000 1.8 --- vehicle_file.c 16 Jan 2008 21:10:12 -0000 1.9 *************** *** 294,299 **** Speed in Knots[5],"N"[6],"Speed in KM/H"[7],"K"[8] */ ! sscanf(item[1], "%lf", &priv->direction); ! sscanf(item[7], "%lf", &priv->speed); } if (!strncmp(buffer, "$GPRMC", 6)) { --- 294,299 ---- Speed in Knots[5],"N"[6],"Speed in KM/H"[7],"K"[8] */ ! priv->direction = g_ascii_strtod( item[1], NULL ); ! priv->speed = g_ascii_strtod( item[7], NULL ); } if (!strncmp(buffer, "$GPRMC", 6)) { *************** *** 304,309 **** magnetic variation[10],magnetic variation direction[11] */ ! sscanf(item[8], "%lf", &priv->direction); ! sscanf(item[7], "%lf", &priv->speed); priv->speed *= 1.852; } --- 304,309 ---- magnetic variation[10],magnetic variation direction[11] */ ! priv->direction = g_ascii_strtod( item[8], NULL ); ! priv->speed = g_ascii_strtod( item[7], NULL ); priv->speed *= 1.852; } |
|
From: Martin S. <mar...@us...> - 2008-01-16 20:54:32
|
Update of /cvsroot/navit/navit/src/vehicle/file In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14050 Modified Files: vehicle_file.c Log Message: Fix:vehicle_file:Fixed incorrect behaviour for western or south hemisphere Index: vehicle_file.c =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle/file/vehicle_file.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** vehicle_file.c 12 Jan 2008 23:11:57 -0000 1.7 --- vehicle_file.c 16 Jan 2008 20:54:35 -0000 1.8 *************** *** 262,265 **** --- 262,268 ---- priv->geo.lat += lat / 60; + if (!strcasecmp(item[3],"S")) + priv->geo.lat=-priv->geo.lat; + lng = g_ascii_strtod(item[4], NULL); priv->geo.lng = floor(lng / 100); *************** *** 267,270 **** --- 270,276 ---- priv->geo.lng += lng / 60; + if (!strcasecmp(item[5],"W")) + priv->geo.lng=-priv->geo.lng; + sscanf(item[6], "%d", &priv->status); sscanf(item[7], "%d", &priv->sats_used); |
13 messages has been excluded from this view by a project administrator.
