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-02-17 14:58:17
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6540 Modified Files: country.c Log Message: Fix:Core:Added comments to country.c to aid in translation Index: country.c =================================================================== RCS file: /cvsroot/navit/navit/src/country.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** country.c 17 Feb 2008 12:02:23 -0000 1.10 --- country.c 17 Feb 2008 14:58:20 -0000 1.11 *************** *** 22,271 **** struct country country[]= { ! { 20, "AND", "AD", "AND", _n("Andorra")}, ! {784, "UAE", "AE", "ARE", _n("United Arab Emirates")}, ! { 4, "AFG", "AF", "AFG", _n("Afghanistan")}, ! { 28, "AG", "AG", "ATG", _n("Antigua and Barbuda")}, ! {660, NULL, "AI", "AIA", _n("Anguilla")}, ! { 8, "AL", "AL", "ALB", _n("Albania")}, ! { 51, "ARM", "AM", "ARM", _n("Armenia")}, ! {530, "NA", "AN", "ANT", _n("Netherlands Antilles")}, ! { 24, "ANG", "AO", "AGO", _n("Angola")}, ! { 10, NULL, "AQ", "ATA", _n("Antarctica")}, ! { 32, "RA", "AR", "ARG", _n("Argentina")}, ! { 16, NULL, "AS", "ASM", _n("American Samoa")}, ! { 40, "A", "AT", "AUT", _n("Austria")}, ! { 36, "AUS", "AU", "AUS", _n("Australia")}, ! {533, "ARU", "AW", "ABW", _n("Aruba")}, ! {248, "AX", "AX", "ALA", _n("Aland Islands")}, ! { 31, "AZ", "AZ", "AZE", _n("Azerbaijan")}, ! { 70, "BiH", "BA", "BIH", _n("Bosnia and Herzegovina")}, ! { 52, "BDS", "BB", "BRB", _n("Barbados")}, ! { 50, "BD", "BD", "BGD", _n("Bangladesh")}, ! { 56, "B", "BE", "BEL", _n("Belgium")}, ! {854, "BF", "BF", "BFA", _n("Burkina Faso")}, ! {100, "BG", "BG", "BGR", _n("Bulgaria")}, ! { 48, "BRN", "BH", "BHR", _n("Bahrain")}, ! {108, "RU", "BI", "BDI", _n("Burundi")}, ! {204, "BJ", "BJ", "BEN", _n("Benin")}, ! {652, NULL, "BL", "BLM", _n("Saint Barthelemy")}, ! { 60, NULL, "BM", "BMU", _n("Bermuda")}, ! { 96, "BRU", "BN", "BRN", _n("Brunei Darussalam")}, ! { 68, "BOL", "BO", "BOL", _n("Bolivia")}, ! { 76, "BR", "BR", "BRA", _n("Brazil")}, ! { 44, "BS", "BS", "BHS", _n("Bahamas")}, ! { 64, "BHT", "BT", "BTN", _n("Bhutan")}, ! { 74, NULL, "BV", "BVT", _n("Bouvet Island")}, ! { 72, "RB", "BW", "BWA", _n("Botswana")}, ! {112, "BY", "BY", "BLR", _n("Belarus")}, ! { 84, "BZ", "BZ", "BLZ", _n("Belize")}, ! {124, "CDN", "CA", "CAN", _n("Canada")}, ! {166, NULL, "CC", "CCK", _n("Cocos (Keeling) Islands")}, ! {180, "CGO", "CD", "COD", _n("Congo, Democratic Republic of the")}, ! {140, "RCA", "CF", "CAF", _n("Central African Republic")}, ! {178, NULL, "CG", "COG", _n("Congo")}, ! {756, "CH", "CH", "CHE", _n("Switzerland")}, ! {384, "CI", "CI", "CIV", _n("Cote d'Ivoire")}, ! {184, NULL, "CK", "COK", _n("Cook Islands")}, ! {152, "RCH", "CL", "CHL", _n("Chile")}, ! {120, "CAM", "CM", "CMR", _n("Cameroon")}, ! {156, "RC", "CN", "CHN", _n("China")}, ! {170, "CO", "CO", "COL", _n("Colombia")}, ! {188, "CR", "CR", "CRI", _n("Costa Rica")}, ! {192, "C", "CU", "CUB", _n("Cuba")}, ! {132, "CV", "CV", "CPV", _n("Cape Verde")}, ! {162, NULL, "CX", "CXR", _n("Christmas Island")}, ! {196, "CY", "CY", "CYP", _n("Cyprus")}, ! {203, "CZ", "CZ", "CZE", _n("Czech Republic")}, ! {276, "D", "DE", "DEU", _n("Germany")}, ! {262, "DJI", "DJ", "DJI", _n("Djibouti")}, ! {208, "DK", "DK", "DNK", _n("Denmark")}, ! {212, "WD", "DM", "DMA", _n("Dominica")}, ! {214, "DOM", "DO", "DOM", _n("Dominican Republic")}, ! { 12, "DZ", "DZ", "DZA", _n("Algeria")}, ! {218, "EC", "EC", "ECU", _n("Ecuador")}, ! {233, "EST", "EE", "EST", _n("Estonia")}, ! {818, "ET", "EG", "EGY", _n("Egypt")}, ! {732, "WSA", "EH", "ESH", _n("Western Sahara")}, ! {232, "ER", "ER", "ERI", _n("Eritrea")}, ! {724, "E", "ES", "ESP", _n("Spain")}, ! {231, "ETH", "ET", "ETH", _n("Ethiopia")}, ! {246, "FIN", "FI", "FIN", _n("Finland")}, ! {242, "FJI", "FJ", "FJI", _n("Fiji")}, ! {238, NULL, "FK", "FLK", _n("Falkland Islands (Malvinas)")}, ! {583, "FSM", "FM", "FSM", _n("Micronesia, Federated States of")}, ! {234, "FO", "FO", "FRO", _n("Faroe Islands")}, ! {250, "F", "FR", "FRA", _n("France")}, ! {266, "G", "GA", "GAB", _n("Gabon")}, ! {826, "GB", "GB", "GBR", _n("United Kingdom")}, ! {308, "WG", "GD", "GRD", _n("Grenada")}, ! {268, "GE", "GE", "GEO", _n("Georgia")}, ! {254, NULL, "GF", "GUF", _n("French Guiana")}, ! {831, NULL, "GG", "GGY", _n("Guernsey")}, ! {288, "GH", "GH", "GHA", _n("Ghana")}, ! {292, "GBZ", "GI", "GIB", _n("Gibraltar")}, ! {304, "KN", "GL", "GRL", _n("Greenland")}, ! {270, "WAG", "GM", "GMB", _n("Gambia")}, ! {324, "RG", "GN", "GIN", _n("Guinea")}, ! {312, NULL, "GP", "GLP", _n("Guadeloupe")}, ! {226, "GQ", "GQ", "GNQ", _n("Equatorial Guinea")}, ! {300, "GR", "GR", "GRC", _n("Greece")}, ! {239, NULL, "GS", "SGS", _n("South Georgia and the South Sandwich Islands")}, ! {320, "GCA", "GT", "GTM", _n("Guatemala")}, ! {316, NULL, "GU", "GUM", _n("Guam")}, ! {624, "GUB", "GW", "GNB", _n("Guinea-Bissau")}, ! {328, "GUY", "GY", "GUY", _n("Guyana")}, ! {344, "HK", "HK", "HKG", _n("Hong Kong")}, ! {334, NULL, "HM", "HMD", _n("Heard Island and McDonald Islands")}, ! {340, "HN", "HN", "HND", _n("Honduras")}, ! {191, "HR", "HR", "HRV", _n("Croatia")}, ! {332, "RH", "HT", "HTI", _n("Haiti")}, ! {348, "H", "HU", "HUN", _n("Hungary")}, ! {360, "RI", "ID", "IDN", _n("Indonesia")}, ! {372, "IRL", "IE", "IRL", _n("Ireland")}, ! {376, "IL", "IL", "ISR", _n("Israel")}, ! {833, NULL, "IM", "IMN", _n("Isle of Man")}, ! {356, "IND", "IN", "IND", _n("India")}, ! { 86, NULL, "IO", "IOT", _n("British Indian Ocean Territory")}, ! {368, "IRQ", "IQ", "IRQ", _n("Iraq")}, ! {364, "IR", "IR", "IRN", _n("Iran, Islamic Republic of")}, ! {352, "IS", "IS", "ISL", _n("Iceland")}, ! {380, "I", "IT", "ITA", _n("Italy")}, ! {832, NULL, "JE", "JEY", _n("Jersey")}, ! {388, "JA", "JM", "JAM", _n("Jamaica")}, ! {400, "JOR", "JO", "JOR", _n("Jordan")}, ! {392, "J", "JP", "JPN", _n("Japan")}, ! {404, "EAK", "KE", "KEN", _n("Kenya")}, ! {417, "KS", "KG", "KGZ", _n("Kyrgyzstan")}, ! {116, "K", "KH", "KHM", _n("Cambodia")}, ! {296, "KIR", "KI", "KIR", _n("Kiribati")}, ! {174, "COM", "KM", "COM", _n("Comoros")}, ! {659, "KAN", "KN", "KNA", _n("Saint Kitts and Nevis")}, ! {408, "KP", "KP", "PRK", _n("Korea, Democratic People's Republic of")}, ! {410, "ROK", "KR", "KOR", _n("Korea, Republic of")}, ! {414, "KWT", "KW", "KWT", _n("Kuwait")}, ! {136, NULL, "KY", "CYM", _n("Cayman Islands")}, ! {398, "KZ", "KZ", "KAZ", _n("Kazakhstan")}, ! {418, "LAO", "LA", "LAO", _n("Lao People's Democratic Republic")}, ! {422, "RL", "LB", "LBN", _n("Lebanon")}, ! {662, "WL", "LC", "LCA", _n("Saint Lucia")}, ! {438, "FL", "LI", "LIE", _n("Liechtenstein")}, ! {144, "CL", "LK", "LKA", _n("Sri Lanka")}, ! {430, "LB", "LR", "LBR", _n("Liberia")}, ! {426, "LS", "LS", "LSO", _n("Lesotho")}, ! {440, "LT", "LT", "LTU", _n("Lithuania")}, ! {442, "L", "LU", "LUX", _n("Luxembourg")}, ! {428, "LV", "LV", "LVA", _n("Latvia")}, ! {434, "LAR", "LY", "LBY", _n("Libyan Arab Jamahiriya")}, ! {504, "MA", "MA", "MAR", _n("Morocco")}, ! {492, "MC", "MC", "MCO", _n("Monaco")}, ! {498, "MD", "MD", "MDA", _n("Moldova, Republic of")}, ! {499, "MNE", "ME", "MNE", _n("Montenegro")}, ! {663, NULL, "MF", "MAF", _n("Saint Martin (French part)")}, ! {450, "RM", "MG", "MDG", _n("Madagascar")}, ! {584, "MH", "MH", "MHL", _n("Marshall Islands")}, ! {807, "MK", "MK", "MKD", _n("Macedonia, the former Yugoslav Republic of")}, ! {466, "RMM", "ML", "MLI", _n("Mali")}, ! {104, "MYA", "MM", "MMR", _n("Myanmar")}, ! {496, "MGL", "MN", "MNG", _n("Mongolia")}, ! {446, NULL, "MO", "MAC", _n("Macao")}, ! {580, NULL, "MP", "MNP", _n("Northern Mariana Islands")}, ! {474, NULL, "MQ", "MTQ", _n("Martinique")}, ! {478, "RIM", "MR", "MRT", _n("Mauritania")}, ! {500, NULL, "MS", "MSR", _n("Montserrat")}, ! {470, "M", "MT", "MLT", _n("Malta")}, ! {480, "MS", "MU", "MUS", _n("Mauritius")}, ! {462, "MV", "MV", "MDV", _n("Maldives")}, ! {454, "MW", "MW", "MWI", _n("Malawi")}, ! {484, "MEX", "MX", "MEX", _n("Mexico")}, ! {458, "MAL", "MY", "MYS", _n("Malaysia")}, ! {508, "MOC", "MZ", "MOZ", _n("Mozambique")}, ! {516, "NAM", "NA", "NAM", _n("Namibia")}, ! {540, "NCL", "NC", "NCL", _n("New Caledonia")}, ! {562, "RN", "NE", "NER", _n("Niger")}, ! {574, NULL, "NF", "NFK", _n("Norfolk Island")}, ! {566, "NGR", "NG", "NGA", _n("Nigeria")}, ! {558, "NIC", "NI", "NIC", _n("Nicaragua")}, ! {528, "NL", "NL", "NLD", _n("Netherlands")}, ! {578, "N", "NO", "NOR", _n("Norway")}, ! {524, "NEP", "NP", "NPL", _n("Nepal")}, ! {520, "NAU", "NR", "NRU", _n("Nauru")}, ! {570, NULL, "NU", "NIU", _n("Niue")}, ! {554, "NZ", "NZ", "NZL", _n("New Zealand")}, ! {512, "OM", "OM", "OMN", _n("Oman")}, ! {591, "PA", "PA", "PAN", _n("Panama")}, ! {604, "PE", "PE", "PER", _n("Peru")}, ! {258, NULL, "PF", "PYF", _n("French Polynesia")}, ! {598, "PNG", "PG", "PNG", _n("Papua New Guinea")}, ! {608, "RP", "PH", "PHL", _n("Philippines")}, ! {586, "PK", "PK", "PAK", _n("Pakistan")}, ! {616, "PL", "PL", "POL", _n("Poland")}, ! {666, NULL, "PM", "SPM", _n("Saint Pierre and Miquelon")}, ! {612, NULL, "PN", "PCN", _n("Pitcairn")}, ! {630, "PRI", "PR", "PRI", _n("Puerto Rico")}, ! {275, "AUT", "PS", "PSE", _n("Palestinian Territory, Occupied")}, ! {620, "P", "PT", "PRT", _n("Portugal")}, ! {585, "PAL", "PW", "PLW", _n("Palau")}, ! {600, "PY", "PY", "PRY", _n("Paraguay")}, ! {634, "Q", "QA", "QAT", _n("Qatar")}, ! {638, NULL, "RE", "REU", _n("Reunion")}, ! {642, "RO", "RO", "ROU", _n("Romania")}, ! {688, "SRB", "RS", "SRB", _n("Serbia")}, ! {643, "RUS", "RU", "RUS", _n("Russian Federation")}, ! {646, "RWA", "RW", "RWA", _n("Rwanda")}, ! {682, "KSA", "SA", "SAU", _n("Saudi Arabia")}, ! { 90, "SOL", "SB", "SLB", _n("Solomon Islands")}, ! {690, "SY", "SC", "SYC", _n("Seychelles")}, ! {736, "SUD", "SD", "SDN", _n("Sudan")}, ! {752, "S", "SE", "SWE", _n("Sweden")}, ! {702, "SGP", "SG", "SGP", _n("Singapore")}, ! {654, NULL, "SH", "SHN", _n("Saint Helena")}, ! {705, "SLO", "SI", "SVN", _n("Slovenia")}, ! {744, NULL, "SJ", "SJM", _n("Svalbard and Jan Mayen")}, ! {703, "SK", "SK", "SVK", _n("Slovakia")}, ! {694, "WAL", "SL", "SLE", _n("Sierra Leone")}, ! {674, "RSM", "SM", "SMR", _n("San Marino")}, ! {686, "SN", "SN", "SEN", _n("Senegal")}, ! {706, "SO", "SO", "SOM", _n("Somalia")}, ! {740, "SME", "SR", "SUR", _n("Suriname")}, ! {678, "STP", "ST", "STP", _n("Sao Tome and Principe")}, ! {222, "ES", "SV", "SLV", _n("El Salvador")}, ! {760, "SYR", "SY", "SYR", _n("Syrian Arab Republic")}, ! {748, "SD", "SZ", "SWZ", _n("Swaziland")}, ! {796, NULL, "TC", "TCA", _n("Turks and Caicos Islands")}, ! {148, "TD", "TD", "TCD", _n("Chad")}, ! {260, "ARK", "TF", "ATF", _n("French Southern Territories")}, ! {768, "RT", "TG", "TGO", _n("Togo")}, ! {764, "T", "TH", "THA", _n("Thailand")}, ! {762, "TJ", "TJ", "TJK", _n("Tajikistan")}, ! {772, NULL, "TK", "TKL", _n("Tokelau")}, ! {626, "TL", "TL", "TLS", _n("Timor-Leste")}, ! {795, "TM", "TM", "TKM", _n("Turkmenistan")}, ! {788, "TN", "TN", "TUN", _n("Tunisia")}, ! {776, "TON", "TO", "TON", _n("Tonga")}, ! {792, "TR", "TR", "TUR", _n("Turkey")}, ! {780, "TT", "TT", "TTO", _n("Trinidad and Tobago")}, ! {798, "TUV", "TV", "TUV", _n("Tuvalu")}, ! {158, NULL, "TW", "TWN", _n("Taiwan, Province of China")}, ! {834, "EAT", "TZ", "TZA", _n("Tanzania, United Republic of")}, ! {804, "UA", "UA", "UKR", _n("Ukraine")}, ! {800, "EAU", "UG", "UGA", _n("Uganda")}, ! {581, NULL, "UM", "UMI", _n("United States Minor Outlying Islands")}, ! {840, "USA", "US", "USA", _n("United States")}, ! {858, "ROU", "UY", "URY", _n("Uruguay")}, ! {860, "UZ", "UZ", "UZB", _n("Uzbekistan")}, ! {336, "SCV", "VA", "VAT", _n("Holy See (Vatican City State)")}, ! {670, "WV", "VC", "VCT", _n("Saint Vincent and the Grenadines")}, ! {862, "YV", "VE", "VEN", _n("Venezuela")}, ! { 92, NULL, "VG", "VGB", _n("Virgin Islands, British")}, ! {850, NULL, "VI", "VIR", _n("Virgin Islands, U.S.")}, ! {704, "VN", "VN", "VNM", _n("Viet Nam")}, ! {548, "VAN", "VU", "VUT", _n("Vanuatu")}, ! {876, NULL, "WF", "WLF", _n("Wallis and Futuna")}, ! {882, "WS", "WS", "WSM", _n("Samoa")}, ! {887, "YAR", "YE", "YEM", _n("Yemen")}, ! {175, NULL, "YT", "MYT", _n("Mayotte")}, ! {710, "ZA", "ZA", "ZAF", _n("South Africa")}, ! {894, "Z", "ZM", "ZMB", _n("Zambia")}, ! {716, "ZW", "ZW", "ZWE", _n("Zimbabwe")}, }; --- 22,271 ---- struct country country[]= { ! { 20, "AND", "AD", "AND", /* 020 */ _n("Andorra")}, ! {784, "UAE", "AE", "ARE", /* 784 */ _n("United Arab Emirates")}, ! { 4, "AFG", "AF", "AFG", /* 004 */ _n("Afghanistan")}, ! { 28, "AG", "AG", "ATG", /* 028 */ _n("Antigua and Barbuda")}, ! {660, NULL, "AI", "AIA", /* 660 */ _n("Anguilla")}, ! { 8, "AL", "AL", "ALB", /* 008 */ _n("Albania")}, ! { 51, "ARM", "AM", "ARM", /* 051 */ _n("Armenia")}, ! {530, "NA", "AN", "ANT", /* 530 */ _n("Netherlands Antilles")}, ! { 24, "ANG", "AO", "AGO", /* 024 */ _n("Angola")}, ! { 10, NULL, "AQ", "ATA", /* 010 */ _n("Antarctica")}, ! { 32, "RA", "AR", "ARG", /* 032 */ _n("Argentina")}, ! { 16, NULL, "AS", "ASM", /* 016 */ _n("American Samoa")}, ! { 40, "A", "AT", "AUT", /* 040 */ _n("Austria")}, ! { 36, "AUS", "AU", "AUS", /* 036 */ _n("Australia")}, ! {533, "ARU", "AW", "ABW", /* 533 */ _n("Aruba")}, ! {248, "AX", "AX", "ALA", /* 248 */ _n("Aland Islands")}, ! { 31, "AZ", "AZ", "AZE", /* 031 */ _n("Azerbaijan")}, ! { 70, "BiH", "BA", "BIH", /* 070 */ _n("Bosnia and Herzegovina")}, ! { 52, "BDS", "BB", "BRB", /* 052 */ _n("Barbados")}, ! { 50, "BD", "BD", "BGD", /* 050 */ _n("Bangladesh")}, ! { 56, "B", "BE", "BEL", /* 056 */ _n("Belgium")}, ! {854, "BF", "BF", "BFA", /* 854 */ _n("Burkina Faso")}, ! {100, "BG", "BG", "BGR", /* 100 */ _n("Bulgaria")}, ! { 48, "BRN", "BH", "BHR", /* 048 */ _n("Bahrain")}, ! {108, "RU", "BI", "BDI", /* 108 */ _n("Burundi")}, ! {204, "BJ", "BJ", "BEN", /* 204 */ _n("Benin")}, ! {652, NULL, "BL", "BLM", /* 652 */ _n("Saint Barthelemy")}, ! { 60, NULL, "BM", "BMU", /* 060 */ _n("Bermuda")}, ! { 96, "BRU", "BN", "BRN", /* 096 */ _n("Brunei Darussalam")}, ! { 68, "BOL", "BO", "BOL", /* 068 */ _n("Bolivia")}, ! { 76, "BR", "BR", "BRA", /* 076 */ _n("Brazil")}, ! { 44, "BS", "BS", "BHS", /* 044 */ _n("Bahamas")}, ! { 64, "BHT", "BT", "BTN", /* 064 */ _n("Bhutan")}, ! { 74, NULL, "BV", "BVT", /* 074 */ _n("Bouvet Island")}, ! { 72, "RB", "BW", "BWA", /* 072 */ _n("Botswana")}, ! {112, "BY", "BY", "BLR", /* 112 */ _n("Belarus")}, ! { 84, "BZ", "BZ", "BLZ", /* 084 */ _n("Belize")}, ! {124, "CDN", "CA", "CAN", /* 124 */ _n("Canada")}, ! {166, NULL, "CC", "CCK", /* 166 */ _n("Cocos (Keeling) Islands")}, ! {180, "CGO", "CD", "COD", /* 180 */ _n("Congo, Democratic Republic of the")}, ! {140, "RCA", "CF", "CAF", /* 140 */ _n("Central African Republic")}, ! {178, NULL, "CG", "COG", /* 178 */ _n("Congo")}, ! {756, "CH", "CH", "CHE", /* 756 */ _n("Switzerland")}, ! {384, "CI", "CI", "CIV", /* 384 */ _n("Cote d'Ivoire")}, ! {184, NULL, "CK", "COK", /* 184 */ _n("Cook Islands")}, ! {152, "RCH", "CL", "CHL", /* 152 */ _n("Chile")}, ! {120, "CAM", "CM", "CMR", /* 120 */ _n("Cameroon")}, ! {156, "RC", "CN", "CHN", /* 156 */ _n("China")}, ! {170, "CO", "CO", "COL", /* 170 */ _n("Colombia")}, ! {188, "CR", "CR", "CRI", /* 188 */ _n("Costa Rica")}, ! {192, "C", "CU", "CUB", /* 192 */ _n("Cuba")}, ! {132, "CV", "CV", "CPV", /* 132 */ _n("Cape Verde")}, ! {162, NULL, "CX", "CXR", /* 162 */ _n("Christmas Island")}, ! {196, "CY", "CY", "CYP", /* 196 */ _n("Cyprus")}, ! {203, "CZ", "CZ", "CZE", /* 203 */ _n("Czech Republic")}, ! {276, "D", "DE", "DEU", /* 276 */ _n("Germany")}, ! {262, "DJI", "DJ", "DJI", /* 262 */ _n("Djibouti")}, ! {208, "DK", "DK", "DNK", /* 208 */ _n("Denmark")}, ! {212, "WD", "DM", "DMA", /* 212 */ _n("Dominica")}, ! {214, "DOM", "DO", "DOM", /* 214 */ _n("Dominican Republic")}, ! { 12, "DZ", "DZ", "DZA", /* 012 */ _n("Algeria")}, ! {218, "EC", "EC", "ECU", /* 218 */ _n("Ecuador")}, ! {233, "EST", "EE", "EST", /* 233 */ _n("Estonia")}, ! {818, "ET", "EG", "EGY", /* 818 */ _n("Egypt")}, ! {732, "WSA", "EH", "ESH", /* 732 */ _n("Western Sahara")}, ! {232, "ER", "ER", "ERI", /* 232 */ _n("Eritrea")}, ! {724, "E", "ES", "ESP", /* 724 */ _n("Spain")}, ! {231, "ETH", "ET", "ETH", /* 231 */ _n("Ethiopia")}, ! {246, "FIN", "FI", "FIN", /* 246 */ _n("Finland")}, ! {242, "FJI", "FJ", "FJI", /* 242 */ _n("Fiji")}, ! {238, NULL, "FK", "FLK", /* 238 */ _n("Falkland Islands (Malvinas)")}, ! {583, "FSM", "FM", "FSM", /* 583 */ _n("Micronesia, Federated States of")}, ! {234, "FO", "FO", "FRO", /* 234 */ _n("Faroe Islands")}, ! {250, "F", "FR", "FRA", /* 250 */ _n("France")}, ! {266, "G", "GA", "GAB", /* 266 */ _n("Gabon")}, ! {826, "GB", "GB", "GBR", /* 826 */ _n("United Kingdom")}, ! {308, "WG", "GD", "GRD", /* 308 */ _n("Grenada")}, ! {268, "GE", "GE", "GEO", /* 268 */ _n("Georgia")}, ! {254, NULL, "GF", "GUF", /* 254 */ _n("French Guiana")}, ! {831, NULL, "GG", "GGY", /* 831 */ _n("Guernsey")}, ! {288, "GH", "GH", "GHA", /* 288 */ _n("Ghana")}, ! {292, "GBZ", "GI", "GIB", /* 292 */ _n("Gibraltar")}, ! {304, "KN", "GL", "GRL", /* 304 */ _n("Greenland")}, ! {270, "WAG", "GM", "GMB", /* 270 */ _n("Gambia")}, ! {324, "RG", "GN", "GIN", /* 324 */ _n("Guinea")}, ! {312, NULL, "GP", "GLP", /* 312 */ _n("Guadeloupe")}, ! {226, "GQ", "GQ", "GNQ", /* 226 */ _n("Equatorial Guinea")}, ! {300, "GR", "GR", "GRC", /* 300 */ _n("Greece")}, ! {239, NULL, "GS", "SGS", /* 239 */ _n("South Georgia and the South Sandwich Islands")}, ! {320, "GCA", "GT", "GTM", /* 320 */ _n("Guatemala")}, ! {316, NULL, "GU", "GUM", /* 316 */ _n("Guam")}, ! {624, "GUB", "GW", "GNB", /* 624 */ _n("Guinea-Bissau")}, ! {328, "GUY", "GY", "GUY", /* 328 */ _n("Guyana")}, ! {344, "HK", "HK", "HKG", /* 344 */ _n("Hong Kong")}, ! {334, NULL, "HM", "HMD", /* 334 */ _n("Heard Island and McDonald Islands")}, ! {340, "HN", "HN", "HND", /* 340 */ _n("Honduras")}, ! {191, "HR", "HR", "HRV", /* 191 */ _n("Croatia")}, ! {332, "RH", "HT", "HTI", /* 332 */ _n("Haiti")}, ! {348, "H", "HU", "HUN", /* 348 */ _n("Hungary")}, ! {360, "RI", "ID", "IDN", /* 360 */ _n("Indonesia")}, ! {372, "IRL", "IE", "IRL", /* 372 */ _n("Ireland")}, ! {376, "IL", "IL", "ISR", /* 376 */ _n("Israel")}, ! {833, NULL, "IM", "IMN", /* 833 */ _n("Isle of Man")}, ! {356, "IND", "IN", "IND", /* 356 */ _n("India")}, ! { 86, NULL, "IO", "IOT", /* 086 */ _n("British Indian Ocean Territory")}, ! {368, "IRQ", "IQ", "IRQ", /* 368 */ _n("Iraq")}, ! {364, "IR", "IR", "IRN", /* 364 */ _n("Iran, Islamic Republic of")}, ! {352, "IS", "IS", "ISL", /* 352 */ _n("Iceland")}, ! {380, "I", "IT", "ITA", /* 380 */ _n("Italy")}, ! {832, NULL, "JE", "JEY", /* 832 */ _n("Jersey")}, ! {388, "JA", "JM", "JAM", /* 388 */ _n("Jamaica")}, ! {400, "JOR", "JO", "JOR", /* 400 */ _n("Jordan")}, ! {392, "J", "JP", "JPN", /* 392 */ _n("Japan")}, ! {404, "EAK", "KE", "KEN", /* 404 */ _n("Kenya")}, ! {417, "KS", "KG", "KGZ", /* 417 */ _n("Kyrgyzstan")}, ! {116, "K", "KH", "KHM", /* 116 */ _n("Cambodia")}, ! {296, "KIR", "KI", "KIR", /* 296 */ _n("Kiribati")}, ! {174, "COM", "KM", "COM", /* 174 */ _n("Comoros")}, ! {659, "KAN", "KN", "KNA", /* 659 */ _n("Saint Kitts and Nevis")}, ! {408, "KP", "KP", "PRK", /* 408 */ _n("Korea, Democratic People's Republic of")}, ! {410, "ROK", "KR", "KOR", /* 410 */ _n("Korea, Republic of")}, ! {414, "KWT", "KW", "KWT", /* 414 */ _n("Kuwait")}, ! {136, NULL, "KY", "CYM", /* 136 */ _n("Cayman Islands")}, ! {398, "KZ", "KZ", "KAZ", /* 398 */ _n("Kazakhstan")}, ! {418, "LAO", "LA", "LAO", /* 418 */ _n("Lao People's Democratic Republic")}, ! {422, "RL", "LB", "LBN", /* 422 */ _n("Lebanon")}, ! {662, "WL", "LC", "LCA", /* 662 */ _n("Saint Lucia")}, ! {438, "FL", "LI", "LIE", /* 438 */ _n("Liechtenstein")}, ! {144, "CL", "LK", "LKA", /* 144 */ _n("Sri Lanka")}, ! {430, "LB", "LR", "LBR", /* 430 */ _n("Liberia")}, ! {426, "LS", "LS", "LSO", /* 426 */ _n("Lesotho")}, ! {440, "LT", "LT", "LTU", /* 440 */ _n("Lithuania")}, ! {442, "L", "LU", "LUX", /* 442 */ _n("Luxembourg")}, ! {428, "LV", "LV", "LVA", /* 428 */ _n("Latvia")}, ! {434, "LAR", "LY", "LBY", /* 434 */ _n("Libyan Arab Jamahiriya")}, ! {504, "MA", "MA", "MAR", /* 504 */ _n("Morocco")}, ! {492, "MC", "MC", "MCO", /* 492 */ _n("Monaco")}, ! {498, "MD", "MD", "MDA", /* 498 */ _n("Moldova, Republic of")}, ! {499, "MNE", "ME", "MNE", /* 499 */ _n("Montenegro")}, ! {663, NULL, "MF", "MAF", /* 663 */ _n("Saint Martin (French part)")}, ! {450, "RM", "MG", "MDG", /* 450 */ _n("Madagascar")}, ! {584, "MH", "MH", "MHL", /* 584 */ _n("Marshall Islands")}, ! {807, "MK", "MK", "MKD", /* 807 */ _n("Macedonia, the former Yugoslav Republic of")}, ! {466, "RMM", "ML", "MLI", /* 466 */ _n("Mali")}, ! {104, "MYA", "MM", "MMR", /* 104 */ _n("Myanmar")}, ! {496, "MGL", "MN", "MNG", /* 496 */ _n("Mongolia")}, ! {446, NULL, "MO", "MAC", /* 446 */ _n("Macao")}, ! {580, NULL, "MP", "MNP", /* 580 */ _n("Northern Mariana Islands")}, ! {474, NULL, "MQ", "MTQ", /* 474 */ _n("Martinique")}, ! {478, "RIM", "MR", "MRT", /* 478 */ _n("Mauritania")}, ! {500, NULL, "MS", "MSR", /* 500 */ _n("Montserrat")}, ! {470, "M", "MT", "MLT", /* 470 */ _n("Malta")}, ! {480, "MS", "MU", "MUS", /* 480 */ _n("Mauritius")}, ! {462, "MV", "MV", "MDV", /* 462 */ _n("Maldives")}, ! {454, "MW", "MW", "MWI", /* 454 */ _n("Malawi")}, ! {484, "MEX", "MX", "MEX", /* 484 */ _n("Mexico")}, ! {458, "MAL", "MY", "MYS", /* 458 */ _n("Malaysia")}, ! {508, "MOC", "MZ", "MOZ", /* 508 */ _n("Mozambique")}, ! {516, "NAM", "NA", "NAM", /* 516 */ _n("Namibia")}, ! {540, "NCL", "NC", "NCL", /* 540 */ _n("New Caledonia")}, ! {562, "RN", "NE", "NER", /* 562 */ _n("Niger")}, ! {574, NULL, "NF", "NFK", /* 574 */ _n("Norfolk Island")}, ! {566, "NGR", "NG", "NGA", /* 566 */ _n("Nigeria")}, ! {558, "NIC", "NI", "NIC", /* 558 */ _n("Nicaragua")}, ! {528, "NL", "NL", "NLD", /* 528 */ _n("Netherlands")}, ! {578, "N", "NO", "NOR", /* 578 */ _n("Norway")}, ! {524, "NEP", "NP", "NPL", /* 524 */ _n("Nepal")}, ! {520, "NAU", "NR", "NRU", /* 520 */ _n("Nauru")}, ! {570, NULL, "NU", "NIU", /* 570 */ _n("Niue")}, ! {554, "NZ", "NZ", "NZL", /* 554 */ _n("New Zealand")}, ! {512, "OM", "OM", "OMN", /* 512 */ _n("Oman")}, ! {591, "PA", "PA", "PAN", /* 591 */ _n("Panama")}, ! {604, "PE", "PE", "PER", /* 604 */ _n("Peru")}, ! {258, NULL, "PF", "PYF", /* 258 */ _n("French Polynesia")}, ! {598, "PNG", "PG", "PNG", /* 598 */ _n("Papua New Guinea")}, ! {608, "RP", "PH", "PHL", /* 608 */ _n("Philippines")}, ! {586, "PK", "PK", "PAK", /* 586 */ _n("Pakistan")}, ! {616, "PL", "PL", "POL", /* 616 */ _n("Poland")}, ! {666, NULL, "PM", "SPM", /* 666 */ _n("Saint Pierre and Miquelon")}, ! {612, NULL, "PN", "PCN", /* 612 */ _n("Pitcairn")}, ! {630, "PRI", "PR", "PRI", /* 630 */ _n("Puerto Rico")}, ! {275, "AUT", "PS", "PSE", /* 275 */ _n("Palestinian Territory, Occupied")}, ! {620, "P", "PT", "PRT", /* 620 */ _n("Portugal")}, ! {585, "PAL", "PW", "PLW", /* 585 */ _n("Palau")}, ! {600, "PY", "PY", "PRY", /* 600 */ _n("Paraguay")}, ! {634, "Q", "QA", "QAT", /* 634 */ _n("Qatar")}, ! {638, NULL, "RE", "REU", /* 638 */ _n("Reunion")}, ! {642, "RO", "RO", "ROU", /* 642 */ _n("Romania")}, ! {688, "SRB", "RS", "SRB", /* 688 */ _n("Serbia")}, ! {643, "RUS", "RU", "RUS", /* 643 */ _n("Russian Federation")}, ! {646, "RWA", "RW", "RWA", /* 646 */ _n("Rwanda")}, ! {682, "KSA", "SA", "SAU", /* 682 */ _n("Saudi Arabia")}, ! { 90, "SOL", "SB", "SLB", /* 090 */ _n("Solomon Islands")}, ! {690, "SY", "SC", "SYC", /* 690 */ _n("Seychelles")}, ! {736, "SUD", "SD", "SDN", /* 736 */ _n("Sudan")}, ! {752, "S", "SE", "SWE", /* 752 */ _n("Sweden")}, ! {702, "SGP", "SG", "SGP", /* 702 */ _n("Singapore")}, ! {654, NULL, "SH", "SHN", /* 654 */ _n("Saint Helena")}, ! {705, "SLO", "SI", "SVN", /* 705 */ _n("Slovenia")}, ! {744, NULL, "SJ", "SJM", /* 744 */ _n("Svalbard and Jan Mayen")}, ! {703, "SK", "SK", "SVK", /* 703 */ _n("Slovakia")}, ! {694, "WAL", "SL", "SLE", /* 694 */ _n("Sierra Leone")}, ! {674, "RSM", "SM", "SMR", /* 674 */ _n("San Marino")}, ! {686, "SN", "SN", "SEN", /* 686 */ _n("Senegal")}, ! {706, "SO", "SO", "SOM", /* 706 */ _n("Somalia")}, ! {740, "SME", "SR", "SUR", /* 740 */ _n("Suriname")}, ! {678, "STP", "ST", "STP", /* 678 */ _n("Sao Tome and Principe")}, ! {222, "ES", "SV", "SLV", /* 222 */ _n("El Salvador")}, ! {760, "SYR", "SY", "SYR", /* 760 */ _n("Syrian Arab Republic")}, ! {748, "SD", "SZ", "SWZ", /* 748 */ _n("Swaziland")}, ! {796, NULL, "TC", "TCA", /* 796 */ _n("Turks and Caicos Islands")}, ! {148, "TD", "TD", "TCD", /* 148 */ _n("Chad")}, ! {260, "ARK", "TF", "ATF", /* 260 */ _n("French Southern Territories")}, ! {768, "RT", "TG", "TGO", /* 768 */ _n("Togo")}, ! {764, "T", "TH", "THA", /* 764 */ _n("Thailand")}, ! {762, "TJ", "TJ", "TJK", /* 762 */ _n("Tajikistan")}, ! {772, NULL, "TK", "TKL", /* 772 */ _n("Tokelau")}, ! {626, "TL", "TL", "TLS", /* 626 */ _n("Timor-Leste")}, ! {795, "TM", "TM", "TKM", /* 795 */ _n("Turkmenistan")}, ! {788, "TN", "TN", "TUN", /* 788 */ _n("Tunisia")}, ! {776, "TON", "TO", "TON", /* 776 */ _n("Tonga")}, ! {792, "TR", "TR", "TUR", /* 792 */ _n("Turkey")}, ! {780, "TT", "TT", "TTO", /* 780 */ _n("Trinidad and Tobago")}, ! {798, "TUV", "TV", "TUV", /* 798 */ _n("Tuvalu")}, ! {158, NULL, "TW", "TWN", /* 158 */ _n("Taiwan, Province of China")}, ! {834, "EAT", "TZ", "TZA", /* 834 */ _n("Tanzania, United Republic of")}, ! {804, "UA", "UA", "UKR", /* 804 */ _n("Ukraine")}, ! {800, "EAU", "UG", "UGA", /* 800 */ _n("Uganda")}, ! {581, NULL, "UM", "UMI", /* 581 */ _n("United States Minor Outlying Islands")}, ! {840, "USA", "US", "USA", /* 840 */ _n("United States")}, ! {858, "ROU", "UY", "URY", /* 858 */ _n("Uruguay")}, ! {860, "UZ", "UZ", "UZB", /* 860 */ _n("Uzbekistan")}, ! {336, "SCV", "VA", "VAT", /* 336 */ _n("Holy See (Vatican City State)")}, ! {670, "WV", "VC", "VCT", /* 670 */ _n("Saint Vincent and the Grenadines")}, ! {862, "YV", "VE", "VEN", /* 862 */ _n("Venezuela")}, ! { 92, NULL, "VG", "VGB", /* 092 */ _n("Virgin Islands, British")}, ! {850, NULL, "VI", "VIR", /* 850 */ _n("Virgin Islands, U.S.")}, ! {704, "VN", "VN", "VNM", /* 704 */ _n("Viet Nam")}, ! {548, "VAN", "VU", "VUT", /* 548 */ _n("Vanuatu")}, ! {876, NULL, "WF", "WLF", /* 876 */ _n("Wallis and Futuna")}, ! {882, "WS", "WS", "WSM", /* 882 */ _n("Samoa")}, ! {887, "YAR", "YE", "YEM", /* 887 */ _n("Yemen")}, ! {175, NULL, "YT", "MYT", /* 175 */ _n("Mayotte")}, ! {710, "ZA", "ZA", "ZAF", /* 710 */ _n("South Africa") }, ! {894, "Z", "ZM", "ZMB", /* 894 */ _n("Zambia")}, ! {716, "ZW", "ZW", "ZWE", /* 716 */ _n("Zimbabwe")}, }; |
|
From: Martin S. <mar...@us...> - 2008-02-17 12:02:23
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1828 Modified Files: country.c Log Message: Add:Core:Added all country definitions, changed country id to ISO 3166 numeric Index: country.c =================================================================== RCS file: /cvsroot/navit/navit/src/country.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** country.c 5 Nov 2007 19:37:00 -0000 1.9 --- country.c 17 Feb 2008 12:02:23 -0000 1.10 *************** *** 22,87 **** struct country country[]= { ! { 1 ,"CZ", "CZ", "CZE", _n("Czech Republic")}, ! { 2 ,"SK", "SK", "SVK", _n("Slovakia")}, ! { 7 ,"RSM", "SM", "SMR", _n("San Marino")}, ! {11 ,"EST", "EE", "EST", _n("Estonia")}, ! {12 ,"GE", "GE", "GEO", _n("Georgia")}, ! {13 ,"LV", "LV", "LVA", _n("Latvia")}, ! {14 ,"LT", "LT", "LTU", _n("Lithuania")}, ! {15 ,"MD", "MD", "MDA", _n("Moldova")}, ! {16 ,"RUS", "RU", "RUS", _n("Russian Federation")}, ! {17 ,"UA", "UA", "UKR", _n("Ukraine")}, ! {18 ,"BY", "BY", "BLR", _n("Belarus")}, ! {20 ,"ET", "EG", "EGY", _n("Egypt")}, ! {30 ,"GR", "GR", "GRC", _n("Greece")}, ! {31 ,"NL", "NL", "NLD", _n("Netherlands")}, ! {32 ,"B", "BE", "BEL", _n("Belgium")}, ! {33 ,"F", "FR", "FRA", _n("France")}, ! {34 ,"E", "ES", "ESP", _n("Spain")}, ! {36 ,"H", "HU", "HUN", _n("Hungary")}, ! {39 ,"I", "IT", "ITA", _n("Italy")}, ! {40 ,"RO", "RO", "ROM", _n("Romania")}, ! {41 ,"CH", "CH", "CHE", _n("Switzerland")}, ! {43 ,"A", "AT", "AUT", _n("Austria")}, ! {44 ,"GB", "GB", "GBR", _n("United Kingdom")}, ! {45 ,"DK", "DK", "DNK", _n("Denmark")}, ! {46 ,"S", "SE", "SWE", _n("Sweden")}, ! {47 ,"N", "NO", "NOR", _n("Norway")}, ! {48 ,"PL", "PL", "POL", _n("Poland")}, ! {49 ,"D", "DE", "DEU", _n("Germany")}, ! {50 ,"GBZ", "GI", "GIB", _n("Gibraltar")}, ! {51 ,"P", "PT", "PRT", _n("Portugal")}, ! {52 ,"L", "LU", "LUX", _n("Luxembourg")}, ! {53 ,"IRL", "IE", "IRL", _n("Ireland")}, ! {54 ,"IS", "IS", "ISL", _n("Iceland")}, ! {55 ,"AL", "AL", "ALB", _n("Albania")}, ! {56 ,"M", "MT", "MLT", _n("Malta")}, ! {57 ,"CY", "CY", "CYP", _n("Cyprus")}, ! {58 ,"FIN", "FI", "FIN", _n("Finland")}, ! {59 ,"BG", "BG", "BGR", _n("Bulgaria")}, ! {61 ,"RL", "LB", "LBN", _n("Lebanon")}, ! {62 ,"AND", "AD", "AND", _n("Andorra")}, ! {63 ,"SYR", "SY", "SYR", _n("Syria")}, ! {66 ,"KSA", "SA", "SAU", _n("Saudi Arabia")}, ! {71 ,"LAR", "LY", "LYB", _n("Libia")}, ! {72 ,"IL", "IL", "ISR", _n("Israel")}, ! {73 ,"AUT", "PS", "PSE", _n("Palestinia")}, ! {75 ,"FL", "LI", "LIE", _n("Liechtenstein")}, ! {76 ,"MA", "MA", "MAR", _n("Morocco")}, ! {77 ,"DZ", "DZ", "DZA", _n("Algeria")}, ! {78 ,"TN", "TN", "TUN", _n("Tunisia")}, ! {81 ,"SRB", "RS", "SRB", _n("Serbia")}, ! {83 ,"HKJ", "JO", "JOR", _n("Jordan")}, ! {85 ,"NDH", "HR", "HRV", _n("Croatia")}, ! {86 ,"SLO", "SI", "SVN", _n("Slovenia")}, ! {87 ,"BIH", "BA", "BIH", _n("Bosnia and Herzegovina")}, ! {89 ,"MK", "MK", "MKD", _n("Macedonia")}, ! {90 ,"TR", "TR", "TUR", _n("Turkey")}, ! {93 ,"MC", "MC", "MCO", _n("Monaco")}, ! {94 ,"AZ", "AZ", "AZE", _n("Azerbaijan")}, ! {95 ,"ARM", "AM", "ARM", _n("Armenia")}, ! {98 ,"FO", "FO", "FRO", _n("Faroe Islands")}, ! {99 ,"WSA", "EH", "ESH", _n("Western Sahara")}, ! {336 ,NULL, "SJ", "SJM", _n("Svalbard and Jan Mayen")}, }; --- 22,271 ---- struct country country[]= { ! { 20, "AND", "AD", "AND", _n("Andorra")}, ! {784, "UAE", "AE", "ARE", _n("United Arab Emirates")}, ! { 4, "AFG", "AF", "AFG", _n("Afghanistan")}, ! { 28, "AG", "AG", "ATG", _n("Antigua and Barbuda")}, ! {660, NULL, "AI", "AIA", _n("Anguilla")}, ! { 8, "AL", "AL", "ALB", _n("Albania")}, ! { 51, "ARM", "AM", "ARM", _n("Armenia")}, ! {530, "NA", "AN", "ANT", _n("Netherlands Antilles")}, ! { 24, "ANG", "AO", "AGO", _n("Angola")}, ! { 10, NULL, "AQ", "ATA", _n("Antarctica")}, ! { 32, "RA", "AR", "ARG", _n("Argentina")}, ! { 16, NULL, "AS", "ASM", _n("American Samoa")}, ! { 40, "A", "AT", "AUT", _n("Austria")}, ! { 36, "AUS", "AU", "AUS", _n("Australia")}, ! {533, "ARU", "AW", "ABW", _n("Aruba")}, ! {248, "AX", "AX", "ALA", _n("Aland Islands")}, ! { 31, "AZ", "AZ", "AZE", _n("Azerbaijan")}, ! { 70, "BiH", "BA", "BIH", _n("Bosnia and Herzegovina")}, ! { 52, "BDS", "BB", "BRB", _n("Barbados")}, ! { 50, "BD", "BD", "BGD", _n("Bangladesh")}, ! { 56, "B", "BE", "BEL", _n("Belgium")}, ! {854, "BF", "BF", "BFA", _n("Burkina Faso")}, ! {100, "BG", "BG", "BGR", _n("Bulgaria")}, ! { 48, "BRN", "BH", "BHR", _n("Bahrain")}, ! {108, "RU", "BI", "BDI", _n("Burundi")}, ! {204, "BJ", "BJ", "BEN", _n("Benin")}, ! {652, NULL, "BL", "BLM", _n("Saint Barthelemy")}, ! { 60, NULL, "BM", "BMU", _n("Bermuda")}, ! { 96, "BRU", "BN", "BRN", _n("Brunei Darussalam")}, ! { 68, "BOL", "BO", "BOL", _n("Bolivia")}, ! { 76, "BR", "BR", "BRA", _n("Brazil")}, ! { 44, "BS", "BS", "BHS", _n("Bahamas")}, ! { 64, "BHT", "BT", "BTN", _n("Bhutan")}, ! { 74, NULL, "BV", "BVT", _n("Bouvet Island")}, ! { 72, "RB", "BW", "BWA", _n("Botswana")}, ! {112, "BY", "BY", "BLR", _n("Belarus")}, ! { 84, "BZ", "BZ", "BLZ", _n("Belize")}, ! {124, "CDN", "CA", "CAN", _n("Canada")}, ! {166, NULL, "CC", "CCK", _n("Cocos (Keeling) Islands")}, ! {180, "CGO", "CD", "COD", _n("Congo, Democratic Republic of the")}, ! {140, "RCA", "CF", "CAF", _n("Central African Republic")}, ! {178, NULL, "CG", "COG", _n("Congo")}, ! {756, "CH", "CH", "CHE", _n("Switzerland")}, ! {384, "CI", "CI", "CIV", _n("Cote d'Ivoire")}, ! {184, NULL, "CK", "COK", _n("Cook Islands")}, ! {152, "RCH", "CL", "CHL", _n("Chile")}, ! {120, "CAM", "CM", "CMR", _n("Cameroon")}, ! {156, "RC", "CN", "CHN", _n("China")}, ! {170, "CO", "CO", "COL", _n("Colombia")}, ! {188, "CR", "CR", "CRI", _n("Costa Rica")}, ! {192, "C", "CU", "CUB", _n("Cuba")}, ! {132, "CV", "CV", "CPV", _n("Cape Verde")}, ! {162, NULL, "CX", "CXR", _n("Christmas Island")}, ! {196, "CY", "CY", "CYP", _n("Cyprus")}, ! {203, "CZ", "CZ", "CZE", _n("Czech Republic")}, ! {276, "D", "DE", "DEU", _n("Germany")}, ! {262, "DJI", "DJ", "DJI", _n("Djibouti")}, ! {208, "DK", "DK", "DNK", _n("Denmark")}, ! {212, "WD", "DM", "DMA", _n("Dominica")}, ! {214, "DOM", "DO", "DOM", _n("Dominican Republic")}, ! { 12, "DZ", "DZ", "DZA", _n("Algeria")}, ! {218, "EC", "EC", "ECU", _n("Ecuador")}, ! {233, "EST", "EE", "EST", _n("Estonia")}, ! {818, "ET", "EG", "EGY", _n("Egypt")}, ! {732, "WSA", "EH", "ESH", _n("Western Sahara")}, ! {232, "ER", "ER", "ERI", _n("Eritrea")}, ! {724, "E", "ES", "ESP", _n("Spain")}, ! {231, "ETH", "ET", "ETH", _n("Ethiopia")}, ! {246, "FIN", "FI", "FIN", _n("Finland")}, ! {242, "FJI", "FJ", "FJI", _n("Fiji")}, ! {238, NULL, "FK", "FLK", _n("Falkland Islands (Malvinas)")}, ! {583, "FSM", "FM", "FSM", _n("Micronesia, Federated States of")}, ! {234, "FO", "FO", "FRO", _n("Faroe Islands")}, ! {250, "F", "FR", "FRA", _n("France")}, ! {266, "G", "GA", "GAB", _n("Gabon")}, ! {826, "GB", "GB", "GBR", _n("United Kingdom")}, ! {308, "WG", "GD", "GRD", _n("Grenada")}, ! {268, "GE", "GE", "GEO", _n("Georgia")}, ! {254, NULL, "GF", "GUF", _n("French Guiana")}, ! {831, NULL, "GG", "GGY", _n("Guernsey")}, ! {288, "GH", "GH", "GHA", _n("Ghana")}, ! {292, "GBZ", "GI", "GIB", _n("Gibraltar")}, ! {304, "KN", "GL", "GRL", _n("Greenland")}, ! {270, "WAG", "GM", "GMB", _n("Gambia")}, ! {324, "RG", "GN", "GIN", _n("Guinea")}, ! {312, NULL, "GP", "GLP", _n("Guadeloupe")}, ! {226, "GQ", "GQ", "GNQ", _n("Equatorial Guinea")}, ! {300, "GR", "GR", "GRC", _n("Greece")}, ! {239, NULL, "GS", "SGS", _n("South Georgia and the South Sandwich Islands")}, ! {320, "GCA", "GT", "GTM", _n("Guatemala")}, ! {316, NULL, "GU", "GUM", _n("Guam")}, ! {624, "GUB", "GW", "GNB", _n("Guinea-Bissau")}, ! {328, "GUY", "GY", "GUY", _n("Guyana")}, ! {344, "HK", "HK", "HKG", _n("Hong Kong")}, ! {334, NULL, "HM", "HMD", _n("Heard Island and McDonald Islands")}, ! {340, "HN", "HN", "HND", _n("Honduras")}, ! {191, "HR", "HR", "HRV", _n("Croatia")}, ! {332, "RH", "HT", "HTI", _n("Haiti")}, ! {348, "H", "HU", "HUN", _n("Hungary")}, ! {360, "RI", "ID", "IDN", _n("Indonesia")}, ! {372, "IRL", "IE", "IRL", _n("Ireland")}, ! {376, "IL", "IL", "ISR", _n("Israel")}, ! {833, NULL, "IM", "IMN", _n("Isle of Man")}, ! {356, "IND", "IN", "IND", _n("India")}, ! { 86, NULL, "IO", "IOT", _n("British Indian Ocean Territory")}, ! {368, "IRQ", "IQ", "IRQ", _n("Iraq")}, ! {364, "IR", "IR", "IRN", _n("Iran, Islamic Republic of")}, ! {352, "IS", "IS", "ISL", _n("Iceland")}, ! {380, "I", "IT", "ITA", _n("Italy")}, ! {832, NULL, "JE", "JEY", _n("Jersey")}, ! {388, "JA", "JM", "JAM", _n("Jamaica")}, ! {400, "JOR", "JO", "JOR", _n("Jordan")}, ! {392, "J", "JP", "JPN", _n("Japan")}, ! {404, "EAK", "KE", "KEN", _n("Kenya")}, ! {417, "KS", "KG", "KGZ", _n("Kyrgyzstan")}, ! {116, "K", "KH", "KHM", _n("Cambodia")}, ! {296, "KIR", "KI", "KIR", _n("Kiribati")}, ! {174, "COM", "KM", "COM", _n("Comoros")}, ! {659, "KAN", "KN", "KNA", _n("Saint Kitts and Nevis")}, ! {408, "KP", "KP", "PRK", _n("Korea, Democratic People's Republic of")}, ! {410, "ROK", "KR", "KOR", _n("Korea, Republic of")}, ! {414, "KWT", "KW", "KWT", _n("Kuwait")}, ! {136, NULL, "KY", "CYM", _n("Cayman Islands")}, ! {398, "KZ", "KZ", "KAZ", _n("Kazakhstan")}, ! {418, "LAO", "LA", "LAO", _n("Lao People's Democratic Republic")}, ! {422, "RL", "LB", "LBN", _n("Lebanon")}, ! {662, "WL", "LC", "LCA", _n("Saint Lucia")}, ! {438, "FL", "LI", "LIE", _n("Liechtenstein")}, ! {144, "CL", "LK", "LKA", _n("Sri Lanka")}, ! {430, "LB", "LR", "LBR", _n("Liberia")}, ! {426, "LS", "LS", "LSO", _n("Lesotho")}, ! {440, "LT", "LT", "LTU", _n("Lithuania")}, ! {442, "L", "LU", "LUX", _n("Luxembourg")}, ! {428, "LV", "LV", "LVA", _n("Latvia")}, ! {434, "LAR", "LY", "LBY", _n("Libyan Arab Jamahiriya")}, ! {504, "MA", "MA", "MAR", _n("Morocco")}, ! {492, "MC", "MC", "MCO", _n("Monaco")}, ! {498, "MD", "MD", "MDA", _n("Moldova, Republic of")}, ! {499, "MNE", "ME", "MNE", _n("Montenegro")}, ! {663, NULL, "MF", "MAF", _n("Saint Martin (French part)")}, ! {450, "RM", "MG", "MDG", _n("Madagascar")}, ! {584, "MH", "MH", "MHL", _n("Marshall Islands")}, ! {807, "MK", "MK", "MKD", _n("Macedonia, the former Yugoslav Republic of")}, ! {466, "RMM", "ML", "MLI", _n("Mali")}, ! {104, "MYA", "MM", "MMR", _n("Myanmar")}, ! {496, "MGL", "MN", "MNG", _n("Mongolia")}, ! {446, NULL, "MO", "MAC", _n("Macao")}, ! {580, NULL, "MP", "MNP", _n("Northern Mariana Islands")}, ! {474, NULL, "MQ", "MTQ", _n("Martinique")}, ! {478, "RIM", "MR", "MRT", _n("Mauritania")}, ! {500, NULL, "MS", "MSR", _n("Montserrat")}, ! {470, "M", "MT", "MLT", _n("Malta")}, ! {480, "MS", "MU", "MUS", _n("Mauritius")}, ! {462, "MV", "MV", "MDV", _n("Maldives")}, ! {454, "MW", "MW", "MWI", _n("Malawi")}, ! {484, "MEX", "MX", "MEX", _n("Mexico")}, ! {458, "MAL", "MY", "MYS", _n("Malaysia")}, ! {508, "MOC", "MZ", "MOZ", _n("Mozambique")}, ! {516, "NAM", "NA", "NAM", _n("Namibia")}, ! {540, "NCL", "NC", "NCL", _n("New Caledonia")}, ! {562, "RN", "NE", "NER", _n("Niger")}, ! {574, NULL, "NF", "NFK", _n("Norfolk Island")}, ! {566, "NGR", "NG", "NGA", _n("Nigeria")}, ! {558, "NIC", "NI", "NIC", _n("Nicaragua")}, ! {528, "NL", "NL", "NLD", _n("Netherlands")}, ! {578, "N", "NO", "NOR", _n("Norway")}, ! {524, "NEP", "NP", "NPL", _n("Nepal")}, ! {520, "NAU", "NR", "NRU", _n("Nauru")}, ! {570, NULL, "NU", "NIU", _n("Niue")}, ! {554, "NZ", "NZ", "NZL", _n("New Zealand")}, ! {512, "OM", "OM", "OMN", _n("Oman")}, ! {591, "PA", "PA", "PAN", _n("Panama")}, ! {604, "PE", "PE", "PER", _n("Peru")}, ! {258, NULL, "PF", "PYF", _n("French Polynesia")}, ! {598, "PNG", "PG", "PNG", _n("Papua New Guinea")}, ! {608, "RP", "PH", "PHL", _n("Philippines")}, ! {586, "PK", "PK", "PAK", _n("Pakistan")}, ! {616, "PL", "PL", "POL", _n("Poland")}, ! {666, NULL, "PM", "SPM", _n("Saint Pierre and Miquelon")}, ! {612, NULL, "PN", "PCN", _n("Pitcairn")}, ! {630, "PRI", "PR", "PRI", _n("Puerto Rico")}, ! {275, "AUT", "PS", "PSE", _n("Palestinian Territory, Occupied")}, ! {620, "P", "PT", "PRT", _n("Portugal")}, ! {585, "PAL", "PW", "PLW", _n("Palau")}, ! {600, "PY", "PY", "PRY", _n("Paraguay")}, ! {634, "Q", "QA", "QAT", _n("Qatar")}, ! {638, NULL, "RE", "REU", _n("Reunion")}, ! {642, "RO", "RO", "ROU", _n("Romania")}, ! {688, "SRB", "RS", "SRB", _n("Serbia")}, ! {643, "RUS", "RU", "RUS", _n("Russian Federation")}, ! {646, "RWA", "RW", "RWA", _n("Rwanda")}, ! {682, "KSA", "SA", "SAU", _n("Saudi Arabia")}, ! { 90, "SOL", "SB", "SLB", _n("Solomon Islands")}, ! {690, "SY", "SC", "SYC", _n("Seychelles")}, ! {736, "SUD", "SD", "SDN", _n("Sudan")}, ! {752, "S", "SE", "SWE", _n("Sweden")}, ! {702, "SGP", "SG", "SGP", _n("Singapore")}, ! {654, NULL, "SH", "SHN", _n("Saint Helena")}, ! {705, "SLO", "SI", "SVN", _n("Slovenia")}, ! {744, NULL, "SJ", "SJM", _n("Svalbard and Jan Mayen")}, ! {703, "SK", "SK", "SVK", _n("Slovakia")}, ! {694, "WAL", "SL", "SLE", _n("Sierra Leone")}, ! {674, "RSM", "SM", "SMR", _n("San Marino")}, ! {686, "SN", "SN", "SEN", _n("Senegal")}, ! {706, "SO", "SO", "SOM", _n("Somalia")}, ! {740, "SME", "SR", "SUR", _n("Suriname")}, ! {678, "STP", "ST", "STP", _n("Sao Tome and Principe")}, ! {222, "ES", "SV", "SLV", _n("El Salvador")}, ! {760, "SYR", "SY", "SYR", _n("Syrian Arab Republic")}, ! {748, "SD", "SZ", "SWZ", _n("Swaziland")}, ! {796, NULL, "TC", "TCA", _n("Turks and Caicos Islands")}, ! {148, "TD", "TD", "TCD", _n("Chad")}, ! {260, "ARK", "TF", "ATF", _n("French Southern Territories")}, ! {768, "RT", "TG", "TGO", _n("Togo")}, ! {764, "T", "TH", "THA", _n("Thailand")}, ! {762, "TJ", "TJ", "TJK", _n("Tajikistan")}, ! {772, NULL, "TK", "TKL", _n("Tokelau")}, ! {626, "TL", "TL", "TLS", _n("Timor-Leste")}, ! {795, "TM", "TM", "TKM", _n("Turkmenistan")}, ! {788, "TN", "TN", "TUN", _n("Tunisia")}, ! {776, "TON", "TO", "TON", _n("Tonga")}, ! {792, "TR", "TR", "TUR", _n("Turkey")}, ! {780, "TT", "TT", "TTO", _n("Trinidad and Tobago")}, ! {798, "TUV", "TV", "TUV", _n("Tuvalu")}, ! {158, NULL, "TW", "TWN", _n("Taiwan, Province of China")}, ! {834, "EAT", "TZ", "TZA", _n("Tanzania, United Republic of")}, ! {804, "UA", "UA", "UKR", _n("Ukraine")}, ! {800, "EAU", "UG", "UGA", _n("Uganda")}, ! {581, NULL, "UM", "UMI", _n("United States Minor Outlying Islands")}, ! {840, "USA", "US", "USA", _n("United States")}, ! {858, "ROU", "UY", "URY", _n("Uruguay")}, ! {860, "UZ", "UZ", "UZB", _n("Uzbekistan")}, ! {336, "SCV", "VA", "VAT", _n("Holy See (Vatican City State)")}, ! {670, "WV", "VC", "VCT", _n("Saint Vincent and the Grenadines")}, ! {862, "YV", "VE", "VEN", _n("Venezuela")}, ! { 92, NULL, "VG", "VGB", _n("Virgin Islands, British")}, ! {850, NULL, "VI", "VIR", _n("Virgin Islands, U.S.")}, ! {704, "VN", "VN", "VNM", _n("Viet Nam")}, ! {548, "VAN", "VU", "VUT", _n("Vanuatu")}, ! {876, NULL, "WF", "WLF", _n("Wallis and Futuna")}, ! {882, "WS", "WS", "WSM", _n("Samoa")}, ! {887, "YAR", "YE", "YEM", _n("Yemen")}, ! {175, NULL, "YT", "MYT", _n("Mayotte")}, ! {710, "ZA", "ZA", "ZAF", _n("South Africa")}, ! {894, "Z", "ZM", "ZMB", _n("Zambia")}, ! {716, "ZW", "ZW", "ZWE", _n("Zimbabwe")}, }; |
|
From: Martin S. <mar...@us...> - 2008-02-17 12:02:23
|
Update of /cvsroot/navit/navit/src/data/mg In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1828/data/mg Modified Files: map.c mg.h street.c Log Message: Add:Core:Added all country definitions, changed country id to ISO 3166 numeric Index: street.c =================================================================== RCS file: /cvsroot/navit/navit/src/data/mg/street.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** street.c 2 Dec 2007 16:29:01 -0000 1.12 --- street.c 17 Feb 2008 12:02:24 -0000 1.13 *************** *** 270,274 **** if (! street->name.len) street_name_get_by_id(&street->name,street->name_file,nameid); ! attr->u.num=street->name.country; return 1; case attr_debug: --- 270,274 ---- if (! street->name.len) street_name_get_by_id(&street->name,street->name_file,nameid); ! attr->u.num=mg_country_to_isonum(street->name.country); return 1; case attr_debug: Index: map.c =================================================================== RCS file: /cvsroot/navit/navit/src/data/mg/map.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** map.c 3 Jan 2008 11:13:34 -0000 1.9 --- map.c 17 Feb 2008 12:02:24 -0000 1.10 *************** *** 8,11 **** --- 8,79 ---- + struct country_isonum { + int country; + int isonum; + } country_isonums[]={ + { 1,203}, + { 2,703}, + { 7,674}, + { 11,233}, + { 12,268}, + { 13,428}, + { 14,440}, + { 15,498}, + { 16,643}, + { 17,804}, + { 18,112}, + { 20,818}, + { 30,300}, + { 31,528}, + { 32, 56}, + { 33,250}, + { 34,724}, + { 36,348}, + { 39,380}, + { 40,642}, + { 41,756}, + { 43, 40}, + { 44,826}, + { 45,208}, + { 46,752}, + { 47,578}, + { 48,616}, + { 49,276}, + { 50,292}, + { 51,620}, + { 52,442}, + { 53,372}, + { 54,352}, + { 55, 8}, + { 56,470}, + { 57,196}, + { 58,246}, + { 59,100}, + { 61,422}, + { 62, 20}, + { 63,760}, + { 66,682}, + { 71,434}, + { 72,376}, + { 73,275}, + { 75,438}, + { 76,504}, + { 77, 12}, + { 78,788}, + { 81,688}, + { 83,400}, + { 85,191}, + { 86,705}, + { 87, 70}, + { 89,807}, + { 90,792}, + { 93,492}, + { 94, 31}, + { 95, 51}, + { 98,234}, + { 99,732}, + {336,774}, + }; + struct map_priv * map_new_mg(struct map_methods *meth, struct attr **attrs); *************** *** 32,35 **** --- 100,120 ---- }; + int mg_country_from_isonum(int isonum) + { + int i; + for (i = 0 ; i < sizeof(country_isonums)/sizeof(struct country_isonum) ; i++) + if (country_isonums[i].isonum == isonum) + return country_isonums[i].country; + return 0; + } + + int mg_country_to_isonum(int country) + { + int i; + for (i = 0 ; i < sizeof(country_isonums)/sizeof(struct country_isonum) ; i++) + if (country_isonums[i].country == country) + return country_isonums[i].isonum; + return 0; + } static int *************** *** 243,246 **** --- 328,332 ---- mr->current_file=file_town_twn; mr->search_str=map_search_mg_convert_special(search->u.str); + mr->search_country=mg_country_from_isonum(item->id_lo); break; case attr_street_name: *************** *** 258,262 **** } mr->search_item=*item; - mr->search_country=item->id_lo; mr->search_partial=partial; mr->file=mr->m->file[mr->current_file]; --- 344,347 ---- Index: mg.h =================================================================== RCS file: /cvsroot/navit/navit/src/data/mg/mg.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mg.h 2 Dec 2007 16:29:01 -0000 1.7 --- mg.h 17 Feb 2008 12:02:24 -0000 1.8 *************** *** 271,274 **** --- 271,277 ---- }; + int mg_country_from_isonum(int isonum); + int mg_country_to_isonum(int country); + int block_init(struct map_rect_priv *mr); int block_next(struct map_rect_priv *mr); |
|
From: Martin S. <mar...@us...> - 2008-02-15 11:05:46
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2544 Modified Files: map.c Log Message: Fix:Core:Don't do any conversion if the map is already in utf-8 Index: map.c =================================================================== RCS file: /cvsroot/navit/navit/src/map.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** map.c 23 Jan 2008 19:27:10 -0000 1.13 --- map.c 15 Feb 2008 11:05:48 -0000 1.14 *************** *** 77,81 **** map_requires_conversion(struct map *this_) { ! return (this_->meth.charset != NULL); } --- 77,81 ---- map_requires_conversion(struct map *this_) { ! return (this_->meth.charset != NULL && strcmp(this_->meth.charset, "utf-8")); } |
|
From: Alexander A. <za...@us...> - 2008-02-15 10:27:28
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17785 Modified Files: navit.xml Log Message: Add roundabouts to layout Index: navit.xml =================================================================== RCS file: /cvsroot/navit/navit/src/navit.xml,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** navit.xml 10 Feb 2008 21:00:48 -0000 1.38 --- navit.xml 15 Feb 2008 10:27:31 -0000 1.39 *************** *** 325,369 **** <polyline color="#ffff00" width="138" /> </item> ! <item type="street_3_city,street_3_land,ramp" order="7-8"> <polyline color="#a0a0a0" width="3" /> <polyline color="#ffff00" width="1" /> </item> ! <item type="street_3_city,street_3_land,ramp" order="9"> <polyline color="#a0a0a0" width="5" /> <polyline color="#ffff00" width="3" /> </item> ! <item type="street_3_city,street_3_land,ramp" order="10"> <polyline color="#a0a0a0" width="8" /> <polyline color="#ffff00" width="6" /> </item> ! <item type="street_3_city,street_3_land,ramp" order="11"> <polyline color="#a0a0a0" width="9" /> <polyline color="#ffff00" width="7" /> </item> ! <item type="street_3_city,street_3_land,ramp" order="12"> <polyline color="#a0a0a0" width="13" /> <polyline color="#ffff00" width="9" /> </item> ! <item type="street_3_city,street_3_land,ramp" order="13"> <polyline color="#a0a0a0" width="18" /> <polyline color="#ffff00" width="14" /> </item> ! <item type="street_3_city,street_3_land,ramp" order="14"> <polyline color="#a0a0a0" width="21" /> <polyline color="#ffff00" width="17" /> </item> ! <item type="street_3_city,street_3_land,ramp" order="15"> <polyline color="#a0a0a0" width="25" /> <polyline color="#ffff00" width="21" /> </item> ! <item type="street_3_city,street_3_land,ramp" order="16"> <polyline color="#a0a0a0" width="40" /> <polyline color="#ffff00" width="34" /> </item> ! <item type="street_3_city,street_3_land,ramp" order="17"> <polyline color="#a0a0a0" width="79" /> <polyline color="#ffff00" width="73" /> </item> ! <item type="street_3_city,street_3_land,ramp" order="18"> <polyline color="#a0a0a0" width="156" /> <polyline color="#ffff00" width="150" /> --- 325,369 ---- <polyline color="#ffff00" width="138" /> </item> ! <item type="street_3_city,street_3_land,ramp,roundabout" order="7-8"> <polyline color="#a0a0a0" width="3" /> <polyline color="#ffff00" width="1" /> </item> ! <item type="street_3_city,street_3_land,ramp,roundabout" order="9"> <polyline color="#a0a0a0" width="5" /> <polyline color="#ffff00" width="3" /> </item> ! <item type="street_3_city,street_3_land,ramp,roundabout" order="10"> <polyline color="#a0a0a0" width="8" /> <polyline color="#ffff00" width="6" /> </item> ! <item type="street_3_city,street_3_land,ramp,roundabout" order="11"> <polyline color="#a0a0a0" width="9" /> <polyline color="#ffff00" width="7" /> </item> ! <item type="street_3_city,street_3_land,ramp,roundabout" order="12"> <polyline color="#a0a0a0" width="13" /> <polyline color="#ffff00" width="9" /> </item> ! <item type="street_3_city,street_3_land,ramp,roundabout" order="13"> <polyline color="#a0a0a0" width="18" /> <polyline color="#ffff00" width="14" /> </item> ! <item type="street_3_city,street_3_land,ramp,roundabout" order="14"> <polyline color="#a0a0a0" width="21" /> <polyline color="#ffff00" width="17" /> </item> ! <item type="street_3_city,street_3_land,ramp,roundabout" order="15"> <polyline color="#a0a0a0" width="25" /> <polyline color="#ffff00" width="21" /> </item> ! <item type="street_3_city,street_3_land,ramp,roundabout" order="16"> <polyline color="#a0a0a0" width="40" /> <polyline color="#ffff00" width="34" /> </item> ! <item type="street_3_city,street_3_land,ramp,roundabout" order="17"> <polyline color="#a0a0a0" width="79" /> <polyline color="#ffff00" width="73" /> </item> ! <item type="street_3_city,street_3_land,ramp,roundabout" order="18"> <polyline color="#a0a0a0" width="156" /> <polyline color="#ffff00" width="150" /> |
Update of /cvsroot/navit/navit/po In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6019/po Modified Files: cs.po da.po de.po es.po fi.po fr.po it.po nl.po no.po pl.po ru.po Log Message: Moved version number to 0.1.0 Index: it.po =================================================================== RCS file: /cvsroot/navit/navit/po/it.po,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** it.po 24 Jan 2008 18:07:37 -0000 1.14 --- it.po 14 Feb 2008 20:16:25 -0000 1.15 *************** *** 6,12 **** msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-01-24 10:49+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Andrea GHENSI <and...@gm...>\n" --- 6,12 ---- msgid "" msgstr "" ! "Project-Id-Version: Navit 0.1.0\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-02-14 21:09+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Andrea GHENSI <and...@gm...>\n" *************** *** 143,200 **** msgstr "Hai raggiunto la destinazione %s" ! #: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Layout" ! #: ../src/navit.c:670 msgid "Projection" msgstr "Proiezione" ! #: ../src/navit.c:725 #, fuzzy msgid "Former Destinations" msgstr "Destinazione" ! #: ../src/navit.c:735 msgid "Bookmarks" msgstr "" ! #: ../src/navit.c:773 msgid "Vehicle" msgstr "" ! #: ../src/navit.c:823 #, fuzzy msgid "Command" msgstr "Polonia" ! #: ../src/navit.c:828 msgid "Length" msgstr "" ! #: ../src/navit.c:834 msgid "Time" msgstr "" ! #: ../src/navit.c:839 #, fuzzy msgid "Destination Length" msgstr "Destinazione" ! #: ../src/navit.c:845 #, fuzzy msgid "Destination Time" msgstr "Destinazione" ! #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "Quaderno di viaggio" ! #: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Mappa" ! #: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Percorso" --- 143,208 ---- msgstr "Hai raggiunto la destinazione %s" ! #: ../src/navit.c:675 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Layout" ! #: ../src/navit.c:691 msgid "Projection" msgstr "Proiezione" ! #: ../src/navit.c:746 #, fuzzy msgid "Former Destinations" msgstr "Destinazione" ! #: ../src/navit.c:756 msgid "Bookmarks" msgstr "" ! #: ../src/navit.c:794 msgid "Vehicle" msgstr "" ! #: ../src/navit.c:863 #, fuzzy msgid "Command" msgstr "Polonia" ! #: ../src/navit.c:868 msgid "Length" msgstr "" ! #: ../src/navit.c:872 ../src/navit.c:897 ! msgid "km" ! msgstr "" ! ! #: ../src/navit.c:876 ../src/navit.c:901 ! msgid "m" ! msgstr "" ! ! #: ../src/navit.c:882 msgid "Time" msgstr "" ! #: ../src/navit.c:894 #, fuzzy msgid "Destination Length" msgstr "Destinazione" ! #: ../src/navit.c:907 #, fuzzy msgid "Destination Time" msgstr "Destinazione" ! #: ../src/navit.c:936 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "Quaderno di viaggio" ! #: ../src/navit.c:1169 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Mappa" ! #: ../src/navit.c:1176 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Percorso" *************** *** 207,211 **** #: ../src/popup.c:230 #, c-format ! msgid "Screen %d %d" msgstr "" --- 215,219 ---- #: ../src/popup.c:230 #, c-format ! msgid "Screen coord : %d %d" msgstr "" Index: da.po =================================================================== RCS file: /cvsroot/navit/navit/po/da.po,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** da.po 24 Jan 2008 18:07:37 -0000 1.2 --- da.po 14 Feb 2008 20:16:25 -0000 1.3 *************** *** 6,12 **** msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-01-24 10:49+0100\n" "PO-Revision-Date: 2008-01-15 22:20+0100\n" "Last-Translator: Glenn Sommer <gl...@gm...>>\n" --- 6,12 ---- msgid "" msgstr "" ! "Project-Id-Version: Navit 0.1.0\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-02-14 21:09+0100\n" "PO-Revision-Date: 2008-01-15 22:20+0100\n" "Last-Translator: Glenn Sommer <gl...@gm...>>\n" *************** *** 142,195 **** msgstr "Du er fremme ved destinationen %s" ! #: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Layout" ! #: ../src/navit.c:670 msgid "Projection" msgstr "Visning" ! #: ../src/navit.c:725 msgid "Former Destinations" msgstr "Tidligere destinationer" ! #: ../src/navit.c:735 msgid "Bookmarks" msgstr "Bogmærker" ! #: ../src/navit.c:773 msgid "Vehicle" msgstr "Køretøj" ! #: ../src/navit.c:823 msgid "Command" msgstr "Kommando" ! #: ../src/navit.c:828 msgid "Length" msgstr "Længde" ! #: ../src/navit.c:834 msgid "Time" msgstr "Tid" ! #: ../src/navit.c:839 msgid "Destination Length" msgstr "Længde til destinationen" ! #: ../src/navit.c:845 msgid "Destination Time" msgstr "Tid til destinationen" ! #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "Vejbog" ! #: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Kort" ! #: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Rute" --- 142,203 ---- msgstr "Du er fremme ved destinationen %s" ! #: ../src/navit.c:675 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Layout" ! #: ../src/navit.c:691 msgid "Projection" msgstr "Visning" ! #: ../src/navit.c:746 msgid "Former Destinations" msgstr "Tidligere destinationer" ! #: ../src/navit.c:756 msgid "Bookmarks" msgstr "Bogmærker" ! #: ../src/navit.c:794 msgid "Vehicle" msgstr "Køretøj" ! #: ../src/navit.c:863 msgid "Command" msgstr "Kommando" ! #: ../src/navit.c:868 msgid "Length" msgstr "Længde" ! #: ../src/navit.c:872 ../src/navit.c:897 ! msgid "km" ! msgstr "" ! ! #: ../src/navit.c:876 ../src/navit.c:901 ! msgid "m" ! msgstr "" ! ! #: ../src/navit.c:882 msgid "Time" msgstr "Tid" ! #: ../src/navit.c:894 msgid "Destination Length" msgstr "Længde til destinationen" ! #: ../src/navit.c:907 msgid "Destination Time" msgstr "Tid til destinationen" ! #: ../src/navit.c:936 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "Vejbog" ! #: ../src/navit.c:1169 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Kort" ! #: ../src/navit.c:1176 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Rute" *************** *** 201,206 **** #: ../src/popup.c:230 ! #, c-format ! msgid "Screen %d %d" msgstr "Skærm %d %d" --- 209,214 ---- #: ../src/popup.c:230 ! #, fuzzy, c-format ! msgid "Screen coord : %d %d" msgstr "Skærm %d %d" Index: fr.po =================================================================== RCS file: /cvsroot/navit/navit/po/fr.po,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** fr.po 24 Jan 2008 18:07:37 -0000 1.37 --- fr.po 14 Feb 2008 20:16:25 -0000 1.38 *************** *** 6,12 **** msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-01-24 10:49+0100\n" "PO-Revision-Date: 2007-12-17 11:36+0100\n" "Last-Translator: KaZeR <ka...@al...>\n" --- 6,12 ---- msgid "" msgstr "" ! "Project-Id-Version: Navit 0.1.0\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-02-14 21:09+0100\n" "PO-Revision-Date: 2007-12-17 11:36+0100\n" "Last-Translator: KaZeR <ka...@al...>\n" *************** *** 143,199 **** msgstr "Vous êtes arrivé à votre destination %s" ! #: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Calques" ! #: ../src/navit.c:670 msgid "Projection" msgstr "Projection" ! #: ../src/navit.c:725 msgid "Former Destinations" msgstr "Destinations précédentes" ! #: ../src/navit.c:735 msgid "Bookmarks" msgstr "" ! #: ../src/navit.c:773 msgid "Vehicle" msgstr "" ! #: ../src/navit.c:823 #, fuzzy msgid "Command" msgstr "Pologne" ! #: ../src/navit.c:828 msgid "Length" msgstr "" ! #: ../src/navit.c:834 msgid "Time" msgstr "" ! #: ../src/navit.c:839 #, fuzzy msgid "Destination Length" msgstr "Destination" ! #: ../src/navit.c:845 #, fuzzy msgid "Destination Time" msgstr "Destination" ! #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "Carnet de route" ! #: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Carte" ! #: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Route" --- 143,207 ---- msgstr "Vous êtes arrivé à votre destination %s" ! #: ../src/navit.c:675 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Calques" ! #: ../src/navit.c:691 msgid "Projection" msgstr "Projection" ! #: ../src/navit.c:746 msgid "Former Destinations" msgstr "Destinations précédentes" ! #: ../src/navit.c:756 msgid "Bookmarks" msgstr "" ! #: ../src/navit.c:794 msgid "Vehicle" msgstr "" ! #: ../src/navit.c:863 #, fuzzy msgid "Command" msgstr "Pologne" ! #: ../src/navit.c:868 msgid "Length" msgstr "" ! #: ../src/navit.c:872 ../src/navit.c:897 ! msgid "km" ! msgstr "" ! ! #: ../src/navit.c:876 ../src/navit.c:901 ! msgid "m" ! msgstr "" ! ! #: ../src/navit.c:882 msgid "Time" msgstr "" ! #: ../src/navit.c:894 #, fuzzy msgid "Destination Length" msgstr "Destination" ! #: ../src/navit.c:907 #, fuzzy msgid "Destination Time" msgstr "Destination" ! #: ../src/navit.c:936 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "Carnet de route" ! #: ../src/navit.c:1169 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Carte" ! #: ../src/navit.c:1176 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Route" *************** *** 206,210 **** #: ../src/popup.c:230 #, c-format ! msgid "Screen %d %d" msgstr "" --- 214,218 ---- #: ../src/popup.c:230 #, c-format ! msgid "Screen coord : %d %d" msgstr "" Index: ru.po =================================================================== RCS file: /cvsroot/navit/navit/po/ru.po,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ru.po 30 Jan 2008 09:48:22 -0000 1.1 --- ru.po 14 Feb 2008 20:16:26 -0000 1.2 *************** *** 6,12 **** msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-01-30 10:48+0100\n" "PO-Revision-Date: 2008-01-24 15:46+0300\n" "Last-Translator: Rustam T. Usmanov\n" --- 6,12 ---- msgid "" msgstr "" ! "Project-Id-Version: Navit 0.1.0\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-02-14 21:09+0100\n" "PO-Revision-Date: 2008-01-24 15:46+0300\n" "Last-Translator: Rustam T. Usmanov\n" *************** *** 146,199 **** msgstr "ÐÑ Ð¿ÑибÑли в пÑÐ½ÐºÑ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ %s" ! #: ../src/navit.c:659 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Ð¡Ñ ÐµÐ¼Ð°" ! #: ../src/navit.c:675 msgid "Projection" msgstr "ÐÑоекÑиÑ" ! #: ../src/navit.c:730 msgid "Former Destinations" msgstr "ÐÑоÑлÑе пÑнкÑÑ Ð½Ð°Ð·Ð½Ð°ÑениÑ" ! #: ../src/navit.c:740 msgid "Bookmarks" msgstr "Ðакладки" ! #: ../src/navit.c:778 msgid "Vehicle" msgstr "Т/Ñ" ! #: ../src/navit.c:828 msgid "Command" msgstr "Ðоманда" ! #: ../src/navit.c:833 msgid "Length" msgstr "Ðлина" ! #: ../src/navit.c:839 msgid "Time" msgstr "ÐÑемÑ" ! #: ../src/navit.c:844 msgid "Destination Length" msgstr "" ! #: ../src/navit.c:850 msgid "Destination Time" msgstr "" ! #: ../src/navit.c:873 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "ÐоÑожнÑй ÑпÑавоÑник" ! #: ../src/navit.c:1106 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "ÐаÑÑа" ! #: ../src/navit.c:1113 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "ÐаÑÑÑÑÑ" --- 146,207 ---- msgstr "ÐÑ Ð¿ÑибÑли в пÑÐ½ÐºÑ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ %s" ! #: ../src/navit.c:675 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Ð¡Ñ ÐµÐ¼Ð°" ! #: ../src/navit.c:691 msgid "Projection" msgstr "ÐÑоекÑиÑ" ! #: ../src/navit.c:746 msgid "Former Destinations" msgstr "ÐÑоÑлÑе пÑнкÑÑ Ð½Ð°Ð·Ð½Ð°ÑениÑ" ! #: ../src/navit.c:756 msgid "Bookmarks" msgstr "Ðакладки" ! #: ../src/navit.c:794 msgid "Vehicle" msgstr "Т/Ñ" ! #: ../src/navit.c:863 msgid "Command" msgstr "Ðоманда" ! #: ../src/navit.c:868 msgid "Length" msgstr "Ðлина" ! #: ../src/navit.c:872 ../src/navit.c:897 ! msgid "km" ! msgstr "" ! ! #: ../src/navit.c:876 ../src/navit.c:901 ! msgid "m" ! msgstr "" ! ! #: ../src/navit.c:882 msgid "Time" msgstr "ÐÑемÑ" ! #: ../src/navit.c:894 msgid "Destination Length" msgstr "" ! #: ../src/navit.c:907 msgid "Destination Time" msgstr "" ! #: ../src/navit.c:936 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "ÐоÑожнÑй ÑпÑавоÑник" ! #: ../src/navit.c:1169 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "ÐаÑÑа" ! #: ../src/navit.c:1176 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "ÐаÑÑÑÑÑ" Index: nl.po =================================================================== RCS file: /cvsroot/navit/navit/po/nl.po,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** nl.po 24 Jan 2008 18:07:37 -0000 1.4 --- nl.po 14 Feb 2008 20:16:25 -0000 1.5 *************** *** 6,12 **** msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-01-24 10:49+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: afaber <afaber_at_sourceforge_dot._net>\n" --- 6,12 ---- msgid "" msgstr "" ! "Project-Id-Version: Navit 0.1.0\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-02-14 21:09+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: afaber <afaber_at_sourceforge_dot._net>\n" *************** *** 145,198 **** msgstr "%s bestemming bereikt" ! #: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Layout" ! #: ../src/navit.c:670 msgid "Projection" msgstr "Projectie" ! #: ../src/navit.c:725 msgid "Former Destinations" msgstr "Vorige bestemmingen" ! #: ../src/navit.c:735 msgid "Bookmarks" msgstr "Bookmarks" ! #: ../src/navit.c:773 msgid "Vehicle" msgstr "Voertuig" ! #: ../src/navit.c:823 msgid "Command" msgstr "Opdracht" ! #: ../src/navit.c:828 msgid "Length" msgstr "Lengte" ! #: ../src/navit.c:834 msgid "Time" msgstr "Tijd" ! #: ../src/navit.c:839 msgid "Destination Length" msgstr "Afstand" ! #: ../src/navit.c:845 msgid "Destination Time" msgstr "Aankomsttijd" ! #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "Route" ! #: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Kaart" ! #: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Route" --- 145,206 ---- msgstr "%s bestemming bereikt" ! #: ../src/navit.c:675 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Layout" ! #: ../src/navit.c:691 msgid "Projection" msgstr "Projectie" ! #: ../src/navit.c:746 msgid "Former Destinations" msgstr "Vorige bestemmingen" ! #: ../src/navit.c:756 msgid "Bookmarks" msgstr "Bookmarks" ! #: ../src/navit.c:794 msgid "Vehicle" msgstr "Voertuig" ! #: ../src/navit.c:863 msgid "Command" msgstr "Opdracht" ! #: ../src/navit.c:868 msgid "Length" msgstr "Lengte" ! #: ../src/navit.c:872 ../src/navit.c:897 ! msgid "km" ! msgstr "" ! ! #: ../src/navit.c:876 ../src/navit.c:901 ! msgid "m" ! msgstr "" ! ! #: ../src/navit.c:882 msgid "Time" msgstr "Tijd" ! #: ../src/navit.c:894 msgid "Destination Length" msgstr "Afstand" ! #: ../src/navit.c:907 msgid "Destination Time" msgstr "Aankomsttijd" ! #: ../src/navit.c:936 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "Route" ! #: ../src/navit.c:1169 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Kaart" ! #: ../src/navit.c:1176 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Route" *************** *** 204,209 **** #: ../src/popup.c:230 ! #, c-format ! msgid "Screen %d %d" msgstr "Scherm %d %d" --- 212,217 ---- #: ../src/popup.c:230 ! #, fuzzy, c-format ! msgid "Screen coord : %d %d" msgstr "Scherm %d %d" Index: de.po =================================================================== RCS file: /cvsroot/navit/navit/po/de.po,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** de.po 24 Jan 2008 18:07:37 -0000 1.23 --- de.po 14 Feb 2008 20:16:25 -0000 1.24 *************** *** 6,12 **** msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-01-24 10:49+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Martin Schaller <mar...@so...>\n" --- 6,12 ---- msgid "" msgstr "" ! "Project-Id-Version: Navit 0.1.0\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-02-14 21:09+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Martin Schaller <mar...@so...>\n" *************** *** 144,197 **** msgstr "%s haben Sie ihr Ziel erreicht" ! #: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Layout" ! #: ../src/navit.c:670 msgid "Projection" msgstr "Projektion" ! #: ../src/navit.c:725 msgid "Former Destinations" msgstr "Frühere Ziele" ! #: ../src/navit.c:735 msgid "Bookmarks" msgstr "Lesezeichen" ! #: ../src/navit.c:773 msgid "Vehicle" msgstr "Fahrzeug" ! #: ../src/navit.c:823 msgid "Command" msgstr "Kommando" ! #: ../src/navit.c:828 msgid "Length" msgstr "Länge" ! #: ../src/navit.c:834 msgid "Time" msgstr "Zeit" ! #: ../src/navit.c:839 msgid "Destination Length" msgstr "Länge Ziel" ! #: ../src/navit.c:845 msgid "Destination Time" msgstr "Zeit Ziel" ! #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "StraÃenliste" ! #: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Karte" ! #: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Route" --- 144,205 ---- msgstr "%s haben Sie ihr Ziel erreicht" ! #: ../src/navit.c:675 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Layout" ! #: ../src/navit.c:691 msgid "Projection" msgstr "Projektion" ! #: ../src/navit.c:746 msgid "Former Destinations" msgstr "Frühere Ziele" ! #: ../src/navit.c:756 msgid "Bookmarks" msgstr "Lesezeichen" ! #: ../src/navit.c:794 msgid "Vehicle" msgstr "Fahrzeug" ! #: ../src/navit.c:863 msgid "Command" msgstr "Kommando" ! #: ../src/navit.c:868 msgid "Length" msgstr "Länge" ! #: ../src/navit.c:872 ../src/navit.c:897 ! msgid "km" ! msgstr "" ! ! #: ../src/navit.c:876 ../src/navit.c:901 ! msgid "m" ! msgstr "" ! ! #: ../src/navit.c:882 msgid "Time" msgstr "Zeit" ! #: ../src/navit.c:894 msgid "Destination Length" msgstr "Länge Ziel" ! #: ../src/navit.c:907 msgid "Destination Time" msgstr "Zeit Ziel" ! #: ../src/navit.c:936 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "StraÃenliste" ! #: ../src/navit.c:1169 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Karte" ! #: ../src/navit.c:1176 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Route" *************** *** 203,208 **** #: ../src/popup.c:230 ! #, c-format ! msgid "Screen %d %d" msgstr "Bildschirm %d %d" --- 211,216 ---- #: ../src/popup.c:230 ! #, fuzzy, c-format ! msgid "Screen coord : %d %d" msgstr "Bildschirm %d %d" Index: es.po =================================================================== RCS file: /cvsroot/navit/navit/po/es.po,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** es.po 24 Jan 2008 18:07:37 -0000 1.13 --- es.po 14 Feb 2008 20:16:25 -0000 1.14 *************** *** 6,12 **** msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-01-24 10:49+0100\n" "PO-Revision-Date: 2007-07-15 20:44-0600\n" "Last-Translator: Esteban Dauksis <eda...@gm...>\n" --- 6,12 ---- msgid "" msgstr "" ! "Project-Id-Version: Navit 0.1.0\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-02-14 21:09+0100\n" "PO-Revision-Date: 2007-07-15 20:44-0600\n" "Last-Translator: Esteban Dauksis <eda...@gm...>\n" *************** *** 144,201 **** msgstr "Ha llegado a su destino %s" ! #: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Diseño" ! #: ../src/navit.c:670 msgid "Projection" msgstr "Proyección" ! #: ../src/navit.c:725 #, fuzzy msgid "Former Destinations" msgstr "Destino" ! #: ../src/navit.c:735 msgid "Bookmarks" msgstr "" ! #: ../src/navit.c:773 msgid "Vehicle" msgstr "" ! #: ../src/navit.c:823 #, fuzzy msgid "Command" msgstr "Polonia" ! #: ../src/navit.c:828 msgid "Length" msgstr "" ! #: ../src/navit.c:834 msgid "Time" msgstr "" ! #: ../src/navit.c:839 #, fuzzy msgid "Destination Length" msgstr "Destino" ! #: ../src/navit.c:845 #, fuzzy msgid "Destination Time" msgstr "Destino" ! #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "GuÃa" ! #: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Mapa" ! #: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Ruta" --- 144,209 ---- msgstr "Ha llegado a su destino %s" ! #: ../src/navit.c:675 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Diseño" ! #: ../src/navit.c:691 msgid "Projection" msgstr "Proyección" ! #: ../src/navit.c:746 #, fuzzy msgid "Former Destinations" msgstr "Destino" ! #: ../src/navit.c:756 msgid "Bookmarks" msgstr "" ! #: ../src/navit.c:794 msgid "Vehicle" msgstr "" ! #: ../src/navit.c:863 #, fuzzy msgid "Command" msgstr "Polonia" ! #: ../src/navit.c:868 msgid "Length" msgstr "" ! #: ../src/navit.c:872 ../src/navit.c:897 ! msgid "km" ! msgstr "" ! ! #: ../src/navit.c:876 ../src/navit.c:901 ! msgid "m" ! msgstr "" ! ! #: ../src/navit.c:882 msgid "Time" msgstr "" ! #: ../src/navit.c:894 #, fuzzy msgid "Destination Length" msgstr "Destino" ! #: ../src/navit.c:907 #, fuzzy msgid "Destination Time" msgstr "Destino" ! #: ../src/navit.c:936 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "GuÃa" ! #: ../src/navit.c:1169 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Mapa" ! #: ../src/navit.c:1176 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Ruta" *************** *** 208,212 **** #: ../src/popup.c:230 #, c-format ! msgid "Screen %d %d" msgstr "" --- 216,220 ---- #: ../src/popup.c:230 #, c-format ! msgid "Screen coord : %d %d" msgstr "" Index: fi.po =================================================================== RCS file: /cvsroot/navit/navit/po/fi.po,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** fi.po 24 Jan 2008 18:07:37 -0000 1.6 --- fi.po 14 Feb 2008 20:16:25 -0000 1.7 *************** *** 6,12 **** msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-01-24 10:49+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Ossi Berg <o....@ma...>\n" --- 6,12 ---- msgid "" msgstr "" ! "Project-Id-Version: Navit 0.1.0\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-02-14 21:09+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Ossi Berg <o....@ma...>\n" *************** *** 144,200 **** msgstr "Olet saavuttanut kohteesi %s" ! #: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Pohja" ! #: ../src/navit.c:670 msgid "Projection" msgstr "Projektio" ! #: ../src/navit.c:725 msgid "Former Destinations" msgstr "Aiemmat kohteet" ! #: ../src/navit.c:735 msgid "Bookmarks" msgstr "Kirjanmerkit" ! #: ../src/navit.c:773 msgid "Vehicle" msgstr "Kulkuneuvo" ! #: ../src/navit.c:823 #, fuzzy msgid "Command" msgstr "Puola" ! #: ../src/navit.c:828 msgid "Length" msgstr "" ! #: ../src/navit.c:834 msgid "Time" msgstr "" ! #: ../src/navit.c:839 #, fuzzy msgid "Destination Length" msgstr "Kohde" ! #: ../src/navit.c:845 #, fuzzy msgid "Destination Time" msgstr "Kohde" ! #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "Ohjeistaja" ! #: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Kartta" ! #: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Reitti" --- 144,208 ---- msgstr "Olet saavuttanut kohteesi %s" ! #: ../src/navit.c:675 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Pohja" ! #: ../src/navit.c:691 msgid "Projection" msgstr "Projektio" ! #: ../src/navit.c:746 msgid "Former Destinations" msgstr "Aiemmat kohteet" ! #: ../src/navit.c:756 msgid "Bookmarks" msgstr "Kirjanmerkit" ! #: ../src/navit.c:794 msgid "Vehicle" msgstr "Kulkuneuvo" ! #: ../src/navit.c:863 #, fuzzy msgid "Command" msgstr "Puola" ! #: ../src/navit.c:868 msgid "Length" msgstr "" ! #: ../src/navit.c:872 ../src/navit.c:897 ! msgid "km" ! msgstr "" ! ! #: ../src/navit.c:876 ../src/navit.c:901 ! msgid "m" ! msgstr "" ! ! #: ../src/navit.c:882 msgid "Time" msgstr "" ! #: ../src/navit.c:894 #, fuzzy msgid "Destination Length" msgstr "Kohde" ! #: ../src/navit.c:907 #, fuzzy msgid "Destination Time" msgstr "Kohde" ! #: ../src/navit.c:936 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "Ohjeistaja" ! #: ../src/navit.c:1169 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Kartta" ! #: ../src/navit.c:1176 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Reitti" *************** *** 206,211 **** #: ../src/popup.c:230 ! #, c-format ! msgid "Screen %d %d" msgstr "Ruutu %d %d" --- 214,219 ---- #: ../src/popup.c:230 ! #, fuzzy, c-format ! msgid "Screen coord : %d %d" msgstr "Ruutu %d %d" Index: pl.po =================================================================== RCS file: /cvsroot/navit/navit/po/pl.po,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** pl.po 24 Jan 2008 18:07:37 -0000 1.13 --- pl.po 14 Feb 2008 20:16:25 -0000 1.14 *************** *** 6,12 **** msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-01-24 10:49+0100\n" "PO-Revision-Date: 2007-07-12 20:12+0100\n" "Last-Translator: Michal Madej <mi...@qu...>\n" --- 6,12 ---- msgid "" msgstr "" ! "Project-Id-Version: Navit 0.1.0\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-02-14 21:09+0100\n" "PO-Revision-Date: 2007-07-12 20:12+0100\n" "Last-Translator: Michal Madej <mi...@qu...>\n" *************** *** 145,202 **** msgstr "DotarÅeÅ do celu %s" ! #: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "UkÅad kolorów" ! #: ../src/navit.c:670 msgid "Projection" msgstr "Odwzorowanie" ! #: ../src/navit.c:725 #, fuzzy msgid "Former Destinations" msgstr "Cel" ! #: ../src/navit.c:735 msgid "Bookmarks" msgstr "" ! #: ../src/navit.c:773 msgid "Vehicle" msgstr "" ! #: ../src/navit.c:823 #, fuzzy msgid "Command" msgstr "Polska" ! #: ../src/navit.c:828 msgid "Length" msgstr "" ! #: ../src/navit.c:834 msgid "Time" msgstr "" ! #: ../src/navit.c:839 #, fuzzy msgid "Destination Length" msgstr "Cel" ! #: ../src/navit.c:845 #, fuzzy msgid "Destination Time" msgstr "Cel" ! #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "" ! #: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Mapa" ! #: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Trasa" --- 145,210 ---- msgstr "DotarÅeÅ do celu %s" ! #: ../src/navit.c:675 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "UkÅad kolorów" ! #: ../src/navit.c:691 msgid "Projection" msgstr "Odwzorowanie" ! #: ../src/navit.c:746 #, fuzzy msgid "Former Destinations" msgstr "Cel" ! #: ../src/navit.c:756 msgid "Bookmarks" msgstr "" ! #: ../src/navit.c:794 msgid "Vehicle" msgstr "" ! #: ../src/navit.c:863 #, fuzzy msgid "Command" msgstr "Polska" ! #: ../src/navit.c:868 msgid "Length" msgstr "" ! #: ../src/navit.c:872 ../src/navit.c:897 ! msgid "km" ! msgstr "" ! ! #: ../src/navit.c:876 ../src/navit.c:901 ! msgid "m" ! msgstr "" ! ! #: ../src/navit.c:882 msgid "Time" msgstr "" ! #: ../src/navit.c:894 #, fuzzy msgid "Destination Length" msgstr "Cel" ! #: ../src/navit.c:907 #, fuzzy msgid "Destination Time" msgstr "Cel" ! #: ../src/navit.c:936 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "" ! #: ../src/navit.c:1169 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Mapa" ! #: ../src/navit.c:1176 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Trasa" *************** *** 209,213 **** #: ../src/popup.c:230 #, c-format ! msgid "Screen %d %d" msgstr "" --- 217,221 ---- #: ../src/popup.c:230 #, c-format ! msgid "Screen coord : %d %d" msgstr "" Index: no.po =================================================================== RCS file: /cvsroot/navit/navit/po/no.po,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** no.po 25 Jan 2008 13:33:33 -0000 1.16 --- no.po 14 Feb 2008 20:16:25 -0000 1.17 *************** *** 7,13 **** msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-01-25 14:33+0100\n" "PO-Revision-Date: 2008-01-11 09:52+0100\n" "Last-Translator: Bendik Brenne <be...@xp...>\n" --- 7,13 ---- msgid "" msgstr "" ! "Project-Id-Version: Navit 0.1.0\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-02-14 21:09+0100\n" "PO-Revision-Date: 2008-01-11 09:52+0100\n" "Last-Translator: Bendik Brenne <be...@xp...>\n" *************** *** 144,197 **** msgstr "Du har nÃ¥dd ditt reisemÃ¥l %s" ! #: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Layout" ! #: ../src/navit.c:670 msgid "Projection" msgstr "Projeksjon" ! #: ../src/navit.c:725 msgid "Former Destinations" msgstr "Tidligere reisemÃ¥l" ! #: ../src/navit.c:735 msgid "Bookmarks" msgstr "Bokmerker" ! #: ../src/navit.c:773 msgid "Vehicle" msgstr "Kjøretøy" ! #: ../src/navit.c:823 msgid "Command" msgstr "Instruks" ! #: ../src/navit.c:828 msgid "Length" msgstr "Avstand" ! #: ../src/navit.c:834 msgid "Time" msgstr "Tid" ! #: ../src/navit.c:839 msgid "Destination Length" msgstr "Avstand til mÃ¥let" ! #: ../src/navit.c:845 msgid "Destination Time" msgstr "Tid til mÃ¥let" ! #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "Kjørebok" ! #: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Kart" ! #: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Rute" --- 144,205 ---- msgstr "Du har nÃ¥dd ditt reisemÃ¥l %s" ! #: ../src/navit.c:675 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "Layout" ! #: ../src/navit.c:691 msgid "Projection" msgstr "Projeksjon" ! #: ../src/navit.c:746 msgid "Former Destinations" msgstr "Tidligere reisemÃ¥l" ! #: ../src/navit.c:756 msgid "Bookmarks" msgstr "Bokmerker" ! #: ../src/navit.c:794 msgid "Vehicle" msgstr "Kjøretøy" ! #: ../src/navit.c:863 msgid "Command" msgstr "Instruks" ! #: ../src/navit.c:868 msgid "Length" msgstr "Avstand" ! #: ../src/navit.c:872 ../src/navit.c:897 ! msgid "km" ! msgstr "" ! ! #: ../src/navit.c:876 ../src/navit.c:901 ! msgid "m" ! msgstr "" ! ! #: ../src/navit.c:882 msgid "Time" msgstr "Tid" ! #: ../src/navit.c:894 msgid "Destination Length" msgstr "Avstand til mÃ¥let" ! #: ../src/navit.c:907 msgid "Destination Time" msgstr "Tid til mÃ¥let" ! #: ../src/navit.c:936 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "Kjørebok" ! #: ../src/navit.c:1169 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Kart" ! #: ../src/navit.c:1176 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Rute" *************** *** 204,208 **** #: ../src/popup.c:230 #, c-format ! msgid "Screen %d %d" msgstr "" --- 212,216 ---- #: ../src/popup.c:230 #, c-format ! msgid "Screen coord : %d %d" msgstr "" Index: cs.po =================================================================== RCS file: /cvsroot/navit/navit/po/cs.po,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** cs.po 24 Jan 2008 18:07:36 -0000 1.8 --- cs.po 14 Feb 2008 20:16:25 -0000 1.9 *************** *** 6,12 **** msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-01-24 10:49+0100\n" "PO-Revision-Date: 2007-09-22 10:34+0200\n" "Last-Translator: Vaclav Cerny <va...@se...>\n" --- 6,12 ---- msgid "" msgstr "" ! "Project-Id-Version: Navit 0.1.0\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-02-14 21:09+0100\n" "PO-Revision-Date: 2007-09-22 10:34+0200\n" "Last-Translator: Vaclav Cerny <va...@se...>\n" *************** *** 146,203 **** msgstr "Dorazili jste do cÃle %s" ! #: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "RozvrženÃ" ! #: ../src/navit.c:670 msgid "Projection" msgstr "Projekce" ! #: ../src/navit.c:725 #, fuzzy msgid "Former Destinations" msgstr "CÃl" ! #: ../src/navit.c:735 msgid "Bookmarks" msgstr "" ! #: ../src/navit.c:773 msgid "Vehicle" msgstr "" ! #: ../src/navit.c:823 #, fuzzy msgid "Command" msgstr "Polsko" ! #: ../src/navit.c:828 msgid "Length" msgstr "" ! #: ../src/navit.c:834 msgid "Time" msgstr "" ! #: ../src/navit.c:839 #, fuzzy msgid "Destination Length" msgstr "CÃl" ! #: ../src/navit.c:845 #, fuzzy msgid "Destination Time" msgstr "CÃl" ! #: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "ItineráÅ" ! #: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Mapa" ! #: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Trasa" --- 146,211 ---- msgstr "Dorazili jste do cÃle %s" ! #: ../src/navit.c:675 ../src/gui/gtk/gui_gtk_action.c:198 msgid "Layout" msgstr "RozvrženÃ" ! #: ../src/navit.c:691 msgid "Projection" msgstr "Projekce" ! #: ../src/navit.c:746 #, fuzzy msgid "Former Destinations" msgstr "CÃl" ! #: ../src/navit.c:756 msgid "Bookmarks" msgstr "" ! #: ../src/navit.c:794 msgid "Vehicle" msgstr "" ! #: ../src/navit.c:863 #, fuzzy msgid "Command" msgstr "Polsko" ! #: ../src/navit.c:868 msgid "Length" msgstr "" ! #: ../src/navit.c:872 ../src/navit.c:897 ! msgid "km" ! msgstr "" ! ! #: ../src/navit.c:876 ../src/navit.c:901 ! msgid "m" ! msgstr "" ! ! #: ../src/navit.c:882 msgid "Time" msgstr "" ! #: ../src/navit.c:894 #, fuzzy msgid "Destination Length" msgstr "CÃl" ! #: ../src/navit.c:907 #, fuzzy msgid "Destination Time" msgstr "CÃl" ! #: ../src/navit.c:936 ../src/gui/gtk/gui_gtk_action.c:202 msgid "Roadbook" msgstr "ItineráÅ" ! #: ../src/navit.c:1169 ../src/gui/gtk/destination.c:368 #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Map" msgstr "Mapa" ! #: ../src/navit.c:1176 ../src/gui/gtk/gui_gtk_action.c:196 msgid "Route" msgstr "Trasa" *************** *** 210,214 **** #: ../src/popup.c:230 #, c-format ! msgid "Screen %d %d" msgstr "" --- 218,222 ---- #: ../src/popup.c:230 #, c-format ! msgid "Screen coord : %d %d" msgstr "" |
|
From: Martin S. <mar...@us...> - 2008-02-14 20:16:22
|
Update of /cvsroot/navit/navit In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6019 Modified Files: configure.in Log Message: Moved version number to 0.1.0 Index: configure.in =================================================================== RCS file: /cvsroot/navit/navit/configure.in,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** configure.in 13 Feb 2008 16:01:10 -0000 1.74 --- configure.in 14 Feb 2008 20:16:25 -0000 1.75 *************** *** 1,3 **** ! AC_INIT(navit, 0.0.4) AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) --- 1,3 ---- ! AC_INIT(navit, 0.1.0) AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) |
|
From: Albert L F. <af...@us...> - 2008-02-14 20:11:48
|
Update of /cvsroot/navit/navit/projs/CodeBlocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2580 Modified Files: Navit.workspace Osm2Navit.cbp navit.xml.distr Log Message: Fix:projs/CodeBlocks:update project files, more work on native win32 gui/graphics Index: Osm2Navit.cbp =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Osm2Navit.cbp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Osm2Navit.cbp 24 Jan 2008 20:45:22 -0000 1.4 --- Osm2Navit.cbp 14 Feb 2008 20:11:49 -0000 1.5 *************** *** 14,18 **** <Option compiler="gcc" /> <Option use_console_runner="0" /> ! <Option parameters="--input-file=d:\josm\nld_zuid.osm --attr-debug-level=0 -k ehv3.bin" /> <Compiler> <Add option="-g" /> --- 14,18 ---- <Option compiler="gcc" /> <Option use_console_runner="0" /> ! <Option parameters="--input-file=d:\europe.osm --attr-debug-level=5 europa.bin" /> <Compiler> <Add option="-g" /> Index: Navit.workspace =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Navit.workspace,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Navit.workspace 4 Feb 2008 00:44:00 -0000 1.10 --- Navit.workspace 14 Feb 2008 20:11:49 -0000 1.11 *************** *** 22,26 **** </Project> <Project filename="data_mg.cbp" /> ! <Project filename="Navit_win32.cbp" active="1"> <Depends filename="NavitCore.cbp" /> <Depends filename="win32_gui.cbp" /> --- 22,26 ---- </Project> <Project filename="data_mg.cbp" /> ! <Project filename="Navit_win32.cbp"> <Depends filename="NavitCore.cbp" /> <Depends filename="win32_gui.cbp" /> *************** *** 41,45 **** <Depends filename="data_mg.cbp" /> </Project> ! <Project filename="Navit_gtk.cbp"> <Depends filename="NavitCore.cbp" /> <Depends filename="win32_gui.cbp" /> --- 41,45 ---- <Depends filename="data_mg.cbp" /> </Project> ! <Project filename="Navit_gtk.cbp" active="1"> <Depends filename="NavitCore.cbp" /> <Depends filename="win32_gui.cbp" /> Index: navit.xml.distr =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/navit.xml.distr,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** navit.xml.distr 6 Feb 2008 13:27:37 -0000 1.3 --- navit.xml.distr 14 Feb 2008 20:11:49 -0000 1.4 *************** *** 97,103 **** <polygon color="#4af04f" /> </item> ! <item type="poly_industry,poly_building,poly_place" order="0-"> <polygon color="#e6e6e6" /> </item> <item type="water_line" order="0-"> <polyline color="#5096b8" width="1" /> --- 97,106 ---- <polygon color="#4af04f" /> </item> ! <item type="poly_industry,poly_place" order="0-"> <polygon color="#e6e6e6" /> </item> + <item type="poly_building" order="0-"> + <polygon color="#b6a6a6" /> + </item> <item type="water_line" order="0-"> <polyline color="#5096b8" width="1" /> *************** *** 110,113 **** --- 113,122 ---- <polygon color="#e3c6a6" /> </item> + <item type="poly_cemetery" order="1-"> + <polygon color="#bde3cb" /> + </item> + <item type="poly_car_parking" order="1-"> + <polygon color="#e7cf87" /> + </item> <item type="rail" order="6-"> <polyline color="#808080" width="3" /> *************** *** 170,173 **** --- 179,218 ---- <polyline color="#000000" width="1" /> </item> + <item type="street_pedestrian" order="10"> + <polyline color="#d2d2d2" width="3" /> + <polyline color="#dddddd" width="1" /> + </item> + <item type="street_pedestrian" order="11"> + <polyline color="#d2d2d2" width="5" /> + <polyline color="#dddddd" width="3" /> + </item> + <item type="street_pedestrian" order="12"> + <polyline color="#d2d2d2" width="8" /> + <polyline color="#dddddd" width="6" /> + </item> + <item type="street_pedestrian" order="13"> + <polyline color="#d2d2d2" width="9" /> + <polyline color="#dddddd" width="7" /> + </item> + <item type="street_pedestrian" order="14"> + <polyline color="#d2d2d2" width="13" /> + <polyline color="#dddddd" width="9" /> + </item> + <item type="street_pedestrian" order="15"> + <polyline color="#d2d2d2" width="18" /> + <polyline color="#dddddd" width="14" /> + </item> + <item type="street_pedestrian" order="16"> + <polyline color="#d2d2d2" width="21" /> + <polyline color="#dddddd" width="17" /> + </item> + <item type="street_pedestrian" order="17"> + <polyline color="#d2d2d2" width="25" /> + <polyline color="#dddddd" width="21" /> + </item> + <item type="street_pedestrian" order="18"> + <polyline color="#d2d2d2" width="40" /> + <polyline color="#dddddd" width="34" /> + </item> <item type="street_service" order="11"> <polyline color="#d2d2d2" width="4" /> *************** *** 647,655 **** <icon src="bowling.xpm" /> </item> ! <item type="poi_bus_station" order="0-"> ! <icon src="bus_station.xpm" /> </item> ! <item type="poi_bus_stop" order="0-"> ! <icon src="bus_stop.xpm" /> </item> <item type="poi_bussines_service" order="0-"> --- 692,700 ---- <icon src="bowling.xpm" /> </item> ! <item type="poi_bus_station" order="12-"> ! <icon src="bus.xpm" /> </item> ! <item type="poi_bus_stop" order="12-"> ! <icon src="bus.xpm" /> </item> <item type="poi_bussines_service" order="0-"> |
|
From: Albert L F. <af...@us...> - 2008-02-14 20:11:48
|
Update of /cvsroot/navit/navit/projs/CodeBlocks/win32gui In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2580/win32gui Modified Files: xpm2bmp.c Log Message: Fix:projs/CodeBlocks:update project files, more work on native win32 gui/graphics Index: xpm2bmp.c =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/win32gui/xpm2bmp.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xpm2bmp.c 1 Feb 2008 22:42:08 -0000 1.1 --- xpm2bmp.c 14 Feb 2008 20:11:50 -0000 1.2 *************** *** 5,9 **** #include "Xpm2bmp.h" ! // #define _DBG // function prototypes --- 5,9 ---- #include "Xpm2bmp.h" ! #define _DBG // function prototypes *************** *** 335,343 **** { int return_value = 0; - char* cq = strchr( line, '"' ); ! char* cchar = strchr( cq+pXpm2bmp->chars_per_pixel, 'c' ); ! char* chash = strchr( cq+pXpm2bmp->chars_per_pixel, '#' ); ! char* qe = strchr( cq+pXpm2bmp->chars_per_pixel, '"' ); cq++; --- 335,342 ---- { int return_value = 0; char* cq = strchr( line, '"' ); ! char* cchar = strchr( cq+pXpm2bmp->chars_per_pixel+1, 'c' ); ! char* chash = strchr( cq+pXpm2bmp->chars_per_pixel+1, '#' ); ! char* qe = strchr( cq+pXpm2bmp->chars_per_pixel+1, '"' ); cq++; *************** *** 359,368 **** pXpm2bmp->color_entires[ pXpm2bmp->color_entires_size].b = string2hex16( &chash[len * 2 / 3] ); #ifdef _DBG ! printf( "adding color %s => %d RGB %x %x %x \n", line, pXpm2bmp->color_entires_size, pXpm2bmp->color_entires[ pXpm2bmp->color_entires_size].r, pXpm2bmp->color_entires[ pXpm2bmp->color_entires_size].g, ! pXpm2bmp->color_entires[ pXpm2bmp->color_entires_size].b ); #endif } --- 358,368 ---- pXpm2bmp->color_entires[ pXpm2bmp->color_entires_size].b = string2hex16( &chash[len * 2 / 3] ); #ifdef _DBG ! printf( "adding color %s => %d RGB %x %x %x to index %d\n", line, pXpm2bmp->color_entires_size, pXpm2bmp->color_entires[ pXpm2bmp->color_entires_size].r, pXpm2bmp->color_entires[ pXpm2bmp->color_entires_size].g, ! pXpm2bmp->color_entires[ pXpm2bmp->color_entires_size].b, ! pXpm2bmp->color_entires_size ); #endif } |
|
From: KaZeR <ka...@us...> - 2008-02-14 18:26:34
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1618/gui/sdl Modified Files: gui_sdl_window.cpp Log Message: Add:cegui:Reduced verbosity Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** gui_sdl_window.cpp 13 Feb 2008 16:01:10 -0000 1.50 --- gui_sdl_window.cpp 14 Feb 2008 18:26:35 -0000 1.51 *************** *** 497,501 **** CEGUI::Scrollbar * sb = static_cast<const CEGUI::Scrollbar *>(CEGUI::WindowManager::getSingleton().getWindow("OSD/Scrollbar1")); - dbg(0,"moving : %f\n",sb->getScrollPosition()); eyeZ=-sb->getScrollPosition(); if (eyeZ>-100){ --- 497,500 ---- |
|
From: Martin S. <mar...@us...> - 2008-02-14 18:09:39
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26632 Modified Files: navit.c xmlconfig.c Log Message: Add:Core:Added a debug map Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** navit.c 13 Feb 2008 23:38:12 -0000 1.80 --- navit.c 14 Feb 2008 18:09:41 -0000 1.81 *************** *** 33,36 **** --- 33,37 ---- #include "color.h" #include "layout.h" + #include "log.h" #define _(STRING) gettext(STRING) *************** *** 98,101 **** --- 99,103 ---- int button_pressed,moved,popped; guint button_timeout, motion_timeout; + struct log *textfile_debug_log; }; *************** *** 795,798 **** --- 797,817 ---- void + navit_textfile_debug_log(struct navit *this_, const char *fmt, ...) + { + va_list ap; + char *str1,*str2; + va_start(ap, fmt); + if (this_->textfile_debug_log && this_->vehicle) { + str1=g_strdup_vprintf(fmt, ap); + str2=g_strdup_printf("0x%x 0x%x%s%s\n", this_->vehicle->coord.x, this_->vehicle->coord.y, strlen(str1) ? " " : "", str1); + log_write(this_->textfile_debug_log, str2, strlen(str2)); + g_free(str2); + g_free(str1); + } + va_end(ap); + } + + + void navit_speak(struct navit *this_) { *************** *** 809,814 **** if (mr) { item=map_rect_get_item(mr); ! if (item && item_attr_get(item, attr_navigation_speech, &attr)) speech_say(this_->speech, attr.u.str); map_rect_destroy(mr); } --- 828,835 ---- if (mr) { item=map_rect_get_item(mr); ! if (item && item_attr_get(item, attr_navigation_speech, &attr)) { speech_say(this_->speech, attr.u.str); + navit_textfile_debug_log(this_, "item=point_debug debug=\"speech_say('%s')\"", attr.u.str); + } map_rect_destroy(mr); } *************** *** 1318,1321 **** --- 1339,1372 ---- } + static int + navit_add_log(struct navit *this_, struct log *log, + struct attr **attrs) + { + struct attr *type; + type = attr_search(attrs, NULL, attr_type); + if (!type) + return 1; + if (!strcmp(type->u.str, "textfile_debug")) { + if (this_->textfile_debug_log) + return 1; + this_->textfile_debug_log=log; + return 0; + } + return 1; + } + + int + navit_add_attr(struct navit *this_, struct attr *attr, + struct attr **attrs) + { + switch (attr->type) { + case attr_log: + return navit_add_log(this_, attr->u.log, attrs); + default: + return 0; + } + return 1; + } + void navit_add_attr_cb(struct navit *this_, struct callback *cb) Index: xmlconfig.c =================================================================== RCS file: /cvsroot/navit/navit/src/xmlconfig.c,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** xmlconfig.c 10 Feb 2008 21:03:48 -0000 1.29 --- xmlconfig.c 14 Feb 2008 18:09:41 -0000 1.30 *************** *** 148,152 **** xmlconfig_config(struct xmlstate *state) { ! state->element_object = 1; return 1; } --- 148,152 ---- xmlconfig_config(struct xmlstate *state) { ! state->element_object = (void *)1; return 1; } *************** *** 263,267 **** static int ! xmlconfig_log(struct xmlstate *state) { struct attr attr; --- 263,267 ---- static int ! xmlconfig_log_vehicle(struct xmlstate *state) { struct attr attr; *************** *** 278,281 **** --- 278,297 ---- } + static int + xmlconfig_log_navit(struct xmlstate *state) + { + struct attr attr; + struct attr **attrs; + attrs=convert_to_attrs(state); + state->element_object = log_new(attrs); + if (! state->element_object) + return 0; + attr.type=attr_log; + attr.u.log=state->element_object; + if (navit_add_attr(state->parent->element_object, &attr, attrs)) + return 0; + return 1; + } + static int *************** *** 628,632 **** { "speed", "route", xmlconfig_speed}, { "vehicle", "navit", xmlconfig_vehicle}, ! { "log", "vehicle", xmlconfig_log}, { "window_items", "navit", xmlconfig_window_items}, { "plugins", "config", xmlconfig_plugins}, --- 644,649 ---- { "speed", "route", xmlconfig_speed}, { "vehicle", "navit", xmlconfig_vehicle}, ! { "log", "vehicle", xmlconfig_log_vehicle}, ! { "log", "navit", xmlconfig_log_navit}, { "window_items", "navit", xmlconfig_window_items}, { "plugins", "config", xmlconfig_plugins}, *************** *** 645,670 **** struct xmlstate *new=NULL, **parent = user_data; struct element_func *e=elements,*func=NULL; const char *parent_name=NULL; dbg(2,"name='%s'\n", element_name); while (e->name) { if (!g_ascii_strcasecmp(element_name, e->name)) { ! func=e; } e++; } ! if (! func) { g_set_error(error,G_MARKUP_ERROR,G_MARKUP_ERROR_UNKNOWN_ELEMENT, "Unknown element '%s'", element_name); return; } ! if (*parent) ! parent_name=(*parent)->element; ! if ((parent_name && func->parent && g_ascii_strcasecmp(parent_name, func->parent)) || ! (!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; } new=g_new(struct xmlstate, 1); --- 662,698 ---- struct xmlstate *new=NULL, **parent = user_data; struct element_func *e=elements,*func=NULL; + int found=0; const char *parent_name=NULL; + char *s,*sep="",*possible_parents=g_strdup(""); dbg(2,"name='%s'\n", element_name); + if (*parent) + parent_name=(*parent)->element; while (e->name) { if (!g_ascii_strcasecmp(element_name, e->name)) { ! found=1; ! s=g_strconcat(possible_parents,sep,e->parent,NULL); ! g_free(possible_parents); ! possible_parents=s; ! sep=","; ! if ((parent_name && e->parent && !g_ascii_strcasecmp(parent_name, e->parent)) || ! (!parent_name && !e->parent)) ! func=e; } e++; } ! if (! found) { g_set_error(error,G_MARKUP_ERROR,G_MARKUP_ERROR_UNKNOWN_ELEMENT, "Unknown element '%s'", element_name); + g_free(possible_parents); return; } ! if (! func) { 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, possible_parents, ! strcmp(possible_parents, "config") ? "\nPlease add <config> </config> tags at the beginning/end of your navit.xml": ""); ! g_free(possible_parents); return; } + g_free(possible_parents); new=g_new(struct xmlstate, 1); |
|
From: Martin S. <mar...@us...> - 2008-02-14 18:07:43
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25776 Modified Files: osm2navit.c Log Message: Fix:Tools:Increased buffer size Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** osm2navit.c 13 Feb 2008 19:56:16 -0000 1.53 --- osm2navit.c 14 Feb 2008 18:07:40 -0000 1.54 *************** *** 876,880 **** } ! static char buffer[131072]; int bytes_read=0; --- 876,880 ---- } ! static char buffer[150000]; int bytes_read=0; *************** *** 889,892 **** --- 889,893 ---- return NULL; bytes_read+=r; + assert((ib->len+1) < sizeof(buffer)); s=(ib->len+1)*4-sizeof(*ib); r=fread(ib+1, s, 1, in); |
|
From: Martin S. <mar...@us...> - 2008-02-14 11:45:50
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21144 Modified Files: attr_def.h vehicle.c Log Message: Fix:Core:Fixed nmea logging (at least for vehicle_file) Index: vehicle.c =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle.c,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** vehicle.c 25 Dec 2007 18:46:23 -0000 1.31 --- vehicle.c 14 Feb 2008 11:45:49 -0000 1.32 *************** *** 21,24 **** --- 21,30 ---- vehicle_log_nmea(struct vehicle *this_, struct log *log) { + struct attr pos_attr; + if (!this_->meth.position_attr_get) + return; + if (!this_->meth.position_attr_get(this_->priv, attr_position_nmea, &pos_attr)) + return; + log_write(log, pos_attr.u.str, strlen(pos_attr.u.str)); } Index: attr_def.h =================================================================== RCS file: /cvsroot/navit/navit/src/attr_def.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** attr_def.h 13 Feb 2008 16:01:10 -0000 1.29 --- attr_def.h 14 Feb 2008 11:45:49 -0000 1.30 *************** *** 90,93 **** --- 90,94 ---- ATTR(gc_type) ATTR(layout) + ATTR(position_nmea) ATTR2(0x0003ffff,type_string_end) ATTR(order_limit) |
|
From: Martin S. <mar...@us...> - 2008-02-14 11:45:50
|
Update of /cvsroot/navit/navit/src/vehicle/file In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21144/vehicle/file Modified Files: vehicle_file.c Log Message: Fix:Core:Fixed nmea logging (at least for vehicle_file) Index: vehicle_file.c =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle/file/vehicle_file.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** vehicle_file.c 16 Jan 2008 21:10:12 -0000 1.9 --- vehicle_file.c 14 Feb 2008 11:45:49 -0000 1.10 *************** *** 42,45 **** --- 42,47 ---- char *buffer; int buffer_pos; + char *nmea_data; + char *nmea_data_buf; struct coord_geo geo; *************** *** 202,206 **** vehicle_file_parse(struct vehicle_priv *priv, char *buffer) { ! char *p, *item[16]; double lat, lng; int i, bcsum; --- 204,208 ---- vehicle_file_parse(struct vehicle_priv *priv, char *buffer) { ! char *nmea_data_buf, *p, *item[16]; double lat, lng; int i, bcsum; *************** *** 211,215 **** for (;;) { if (len < 4) { ! dbg(0, "too short\n"); return; } --- 213,217 ---- for (;;) { if (len < 4) { ! dbg(0, "'%s' too short\n", buffer); return; } *************** *** 220,228 **** } if (buffer[0] != '$') { ! dbg(0, "no leading $\n"); return; } if (buffer[len - 3] != '*') { ! dbg(0, "no *XX\n"); return; } --- 222,230 ---- } if (buffer[0] != '$') { ! dbg(0, "no leading $ in '%s'\n", buffer); return; } if (buffer[len - 3] != '*') { ! dbg(0, "no *XX in '%s'\n", buffer); return; } *************** *** 231,242 **** } if (!sscanf(buffer + len - 2, "%x", &bcsum)) { ! dbg(0, "no checksum\n"); return; } if (bcsum != csum) { ! dbg(0, "wrong checksum\n"); return; } i = 0; p = buffer; --- 233,251 ---- } if (!sscanf(buffer + len - 2, "%x", &bcsum)) { ! dbg(0, "no checksum in '%s'\n", buffer); return; } if (bcsum != csum) { ! dbg(0, "wrong checksum in '%s'\n", buffer); return; } + if (!priv->nmea_data_buf || strlen(priv->nmea_data_buf) < 65536) { + nmea_data_buf=g_strconcat(priv->nmea_data_buf ? priv->nmea_data_buf : "", buffer, "\n", NULL); + g_free(priv->nmea_data_buf); + priv->nmea_data_buf=nmea_data_buf; + } else { + dbg(0, "nmea buffer overflow, discarding '%s'\n", buffer); + } i = 0; p = buffer; *************** *** 276,279 **** --- 285,291 ---- sscanf(item[7], "%d", &priv->sats_used); priv->height = g_ascii_strtod(item[9], NULL); + g_free(priv->nmea_data); + priv->nmea_data=priv->nmea_data_buf; + priv->nmea_data_buf=NULL; callback_list_call_0(priv->cbl); *************** *** 411,414 **** --- 423,431 ---- attr->u.coord_geo = &priv->geo; break; + case attr_position_nmea: + attr->u.str=priv->nmea_data; + if (! attr->u.str) + return 0; + break; default: return 0; |
|
From: Albert L F. <af...@us...> - 2008-02-13 23:38:14
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28244 Modified Files: navit.c Log Message: Fix:graphics/gtk:improve layout datawindow Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** navit.c 12 Feb 2008 22:28:12 -0000 1.79 --- navit.c 13 Feb 2008 23:38:12 -0000 1.80 *************** *** 157,161 **** navit_draw_displaylist(struct navit *this_) { ! if (this_->ready) graphics_displaylist_draw(this_->gra, this_->displaylist, this_->trans, this_->layout_current); } --- 157,161 ---- navit_draw_displaylist(struct navit *this_) { ! if (this_->ready) graphics_displaylist_draw(this_->gra, this_->displaylist, this_->trans, this_->layout_current); } *************** *** 209,220 **** this_->button_pressed=0; if (this_->button_timeout) { ! g_source_remove(this_->button_timeout); this_->button_timeout=0; if (! this_->moved && ! transform_within_border(this_->trans, p, border)) navit_set_center_screen(this_, p); ! } if (this_->motion_timeout) { ! g_source_remove(this_->motion_timeout); this_->motion_timeout=0; } --- 209,220 ---- this_->button_pressed=0; if (this_->button_timeout) { ! g_source_remove(this_->button_timeout); this_->button_timeout=0; if (! this_->moved && ! transform_within_border(this_->trans, p, border)) navit_set_center_screen(this_, p); ! } if (this_->motion_timeout) { ! g_source_remove(this_->motion_timeout); this_->motion_timeout=0; } *************** *** 261,265 **** if (dx < -8 || dx > 8 || dy < -8 || dy > 8) { if (this_->button_timeout) { ! g_source_remove(this_->button_timeout); this_->button_timeout=0; } --- 261,265 ---- if (dx < -8 || dx > 8 || dy < -8 || dy > 8) { if (this_->button_timeout) { ! g_source_remove(this_->button_timeout); this_->button_timeout=0; } *************** *** 521,525 **** if (!pos) return -2; ! if (!cp[pos] || cp[pos] == '\n') return -1; cp[strlen(cp)-1]='\0'; --- 521,525 ---- if (!pos) return -2; ! if (!cp[pos] || cp[pos] == '\n') return -1; cp[strlen(cp)-1]='\0'; *************** *** 530,534 **** s=i+1; i=strchr(s, '"'); ! if (i) *i='\0'; } --- 530,534 ---- s=i+1; i=strchr(s, '"'); ! if (i) *i='\0'; } *************** *** 548,552 **** char *name, *description, buffer[2048]; struct pcoord c; ! f=fopen(file, "r"); if (! f) --- 548,552 ---- char *name, *description, buffer[2048]; struct pcoord c; ! f=fopen(file, "r"); if (! f) *************** *** 559,563 **** navit_set_destination(this_, &c, description); g_free(description); ! } else navit_set_destination(this_, &c, name); } --- 559,563 ---- navit_set_destination(this_, &c, description); g_free(description); ! } else navit_set_destination(this_, &c, name); } *************** *** 720,724 **** int offset=0; struct callback *cb; ! f=fopen(file, "r"); if (f) { --- 720,724 ---- int offset=0; struct callback *cb; ! f=fopen(file, "r"); if (f) { *************** *** 762,770 **** { if (menu_get_toggle(nv->menu)) { ! if (this_->vehicle && this_->vehicle != nv) menu_set_toggle(this_->vehicle->menu, 0); this_->vehicle=nv; } else { ! if (this_->vehicle == nv) this_->vehicle=NULL; } --- 762,770 ---- { if (menu_get_toggle(nv->menu)) { ! if (this_->vehicle && this_->vehicle != nv) menu_set_toggle(this_->vehicle->menu, 0); this_->vehicle=nv; } else { ! if (this_->vehicle == nv) this_->vehicle=NULL; } *************** *** 809,813 **** if (mr) { item=map_rect_get_item(mr); ! if (item && item_attr_get(item, attr_navigation_speech, &attr)) speech_say(this_->speech, attr.u.str); map_rect_destroy(mr); --- 809,813 ---- if (mr) { item=map_rect_get_item(mr); ! if (item && item_attr_get(item, attr_navigation_speech, &attr)) speech_say(this_->speech, attr.u.str); map_rect_destroy(mr); *************** *** 846,850 **** dbg(2, "Length=%d\n", attr.u.num); param[1].name=_("Length"); ! param[1].value=g_strdup_printf("%d m",attr.u.num); item_attr_get(item, attr_time, &attr); --- 846,858 ---- dbg(2, "Length=%d\n", attr.u.num); param[1].name=_("Length"); ! ! if ( attr.u.num >= 2000 ) ! { ! param[1].value=g_strdup_printf("%5.1f %s",(float)attr.u.num / 1000, _("km") ); ! } ! else ! { ! param[1].value=g_strdup_printf("%7d %s",attr.u.num, _("m")); ! } item_attr_get(item, attr_time, &attr); *************** *** 852,861 **** secs=attr.u.num/10; param[2].name=_("Time"); ! param[2].value=g_strdup_printf("%d:%d",secs / 60, secs % 60); item_attr_get(item, attr_destination_length, &attr); dbg(2, "Destlength=%d\n", attr.u.num); param[3].name=_("Destination Length"); ! param[3].value=g_strdup_printf("%d m",attr.u.num); item_attr_get(item, attr_destination_time, &attr); --- 860,883 ---- secs=attr.u.num/10; param[2].name=_("Time"); ! if ( secs >= 3600 ) ! { ! param[2].value=g_strdup_printf("%d:%02d:%02d",secs / 60, ( secs / 60 ) % 60 , secs % 60); ! } ! else ! { ! param[2].value=g_strdup_printf("%d:%02d",secs / 60, secs % 60); ! } item_attr_get(item, attr_destination_length, &attr); dbg(2, "Destlength=%d\n", attr.u.num); param[3].name=_("Destination Length"); ! if ( attr.u.num >= 2000 ) ! { ! param[3].value=g_strdup_printf("%5.1f %s",(float)attr.u.num / 1000, _("km") ); ! } ! else ! { ! param[3].value=g_strdup_printf("%d %s",attr.u.num, _("m")); ! } item_attr_get(item, attr_destination_time, &attr); *************** *** 863,868 **** secs=attr.u.num/10; param[4].name=_("Destination Time"); ! param[4].value=g_strdup_printf("%d:%d",secs / 60, secs % 60); ! datawindow_add(this_->roadbook_window, param, 5); } --- 885,896 ---- secs=attr.u.num/10; param[4].name=_("Destination Time"); ! if ( secs >= 3600 ) ! { ! param[4].value=g_strdup_printf("%d:%02d:%02d",secs / 3600, (secs / 60 ) % 60 , secs % 60); ! } ! else ! { ! param[4].value=g_strdup_printf("%d:%02d",secs / 60, secs % 60); ! } datawindow_add(this_->roadbook_window, param, 5); } *************** *** 905,909 **** *buffer++='E'; if (angle > 202 && angle < 338) ! *buffer++='W'; *buffer++='\0'; break; --- 933,937 ---- *buffer++='E'; if (angle > 202 && angle < 338) ! *buffer++='W'; *buffer++='\0'; break; *************** *** 957,963 **** char dirbuf[32]; char coordbuf[64]; ! dbg(0, "distance=%d\n", nwi->distance); ! if (nwi->distance == -1) dist=40000000; else --- 985,991 ---- char dirbuf[32]; char coordbuf[64]; ! dbg(0, "distance=%d\n", nwi->distance); ! if (nwi->distance == -1) dist=40000000; else *************** *** 994,1003 **** if (item_coord_get(item, &c, 1)) { if (coord_rect_contains(&sel.u.c_rect, &c) && g_hash_table_lookup(nwi->hash, &item->type)) { ! if (! item_attr_get(item, attr_label, &attr)) attr.u.str=""; idist=transform_distance(map_projection(item->map), center, &c); if (idist < dist) { get_direction(dirbuf, transform_get_angle_delta(center, &c, 0), 1); ! param[0].value=distbuf; param[1].value=dirbuf; param[2].value=item_to_name(item->type); --- 1022,1031 ---- if (item_coord_get(item, &c, 1)) { if (coord_rect_contains(&sel.u.c_rect, &c) && g_hash_table_lookup(nwi->hash, &item->type)) { ! if (! item_attr_get(item, attr_label, &attr)) attr.u.str=""; idist=transform_distance(map_projection(item->map), center, &c); if (idist < dist) { get_direction(dirbuf, transform_get_angle_delta(center, &c, 0), 1); ! param[0].value=distbuf; param[1].value=dirbuf; param[2].value=item_to_name(item->type); *************** *** 1010,1018 **** /* printf("gefunden %s %s %d\n",item_to_name(item->type), attr.u.str, idist/1000); */ } ! if (item->type >= type_line) while (item_coord_get(item, &c, 1)); } } ! map_rect_destroy(mr); } mapset_close(h); --- 1038,1046 ---- /* printf("gefunden %s %s %d\n",item_to_name(item->type), attr.u.str, idist/1000); */ } ! if (item->type >= type_line) while (item_coord_get(item, &c, 1)); } } ! map_rect_destroy(mr); } mapset_close(h); *************** *** 1314,1318 **** struct point pnt2; enum projection pro; ! if (pnt) pnt2=*pnt; else { --- 1342,1346 ---- struct point pnt2; enum projection pro; ! if (pnt) pnt2=*pnt; else { *************** *** 1356,1360 **** if (this_->tracking && this_->tracking_flag) { if (tracking_update(this_->tracking, &nv->coord, nv->dir)) { ! if (this_->route && nv->update_curr == 1) route_set_position_from_tracking(this_->route, this_->tracking); } --- 1384,1388 ---- if (this_->tracking && this_->tracking_flag) { if (tracking_update(this_->tracking, &nv->coord, nv->dir)) { ! if (this_->route && nv->update_curr == 1) route_set_position_from_tracking(this_->route, this_->tracking); } *************** *** 1390,1394 **** pnt=NULL; } ! if (pnt && this_->route && !route_path_set && route_get_path_set(this_->route)) navit_draw(this_); if (nv->follow_curr > 1) --- 1418,1422 ---- pnt=NULL; } ! if (pnt && this_->route && !route_path_set && route_get_path_set(this_->route)) navit_draw(this_); if (nv->follow_curr > 1) *************** *** 1401,1405 **** nv->update_curr=nv->update; callback_list_call_2(this_->vehicle_cbl, this_, nv->vehicle); ! if (pnt) navit_vehicle_draw(this_, nv, pnt); } --- 1429,1433 ---- nv->update_curr=nv->update; callback_list_call_2(this_->vehicle_cbl, this_, nv->vehicle); ! if (pnt) navit_vehicle_draw(this_, nv, pnt); } *************** *** 1451,1460 **** if ((follow=attr_search(attrs, NULL, attr_follow))) nv->follow=nv->follow=follow->u.num; ! if ((color=attr_search(attrs, NULL, attr_color))) nv->c=*(color->u.color); nv->update_curr=nv->update; nv->follow_curr=nv->follow; this_->vehicles=g_list_append(this_->vehicles, nv); ! if ((active=attr_search(attrs, NULL, attr_active)) && active->u.num) navit_set_vehicle(this_, nv); --- 1479,1488 ---- if ((follow=attr_search(attrs, NULL, attr_follow))) nv->follow=nv->follow=follow->u.num; ! if ((color=attr_search(attrs, NULL, attr_color))) nv->c=*(color->u.color); nv->update_curr=nv->update; nv->follow_curr=nv->follow; this_->vehicles=g_list_append(this_->vehicles, nv); ! if ((active=attr_search(attrs, NULL, attr_active)) && active->u.num) navit_set_vehicle(this_, nv); |
|
From: Albert L F. <af...@us...> - 2008-02-13 23:38:14
|
Update of /cvsroot/navit/navit/src/gui/gtk In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28244/gui/gtk Modified Files: datawindow.c Log Message: Fix:graphics/gtk:improve layout datawindow Index: datawindow.c =================================================================== RCS file: /cvsroot/navit/navit/src/gui/gtk/datawindow.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** datawindow.c 4 Jan 2008 22:10:11 -0000 1.7 --- datawindow.c 13 Feb 2008 23:38:12 -0000 1.8 *************** *** 34,38 **** int i; ! dbg(0,"win=%p\n", win); model=gtk_tree_view_get_model(tree); --- 34,38 ---- int i; ! dbg(0,"win=%p\n", win); model=gtk_tree_view_get_model(tree); *************** *** 55,59 **** GtkTreeIter iter; GType types[count]; - gchar *utf8; if (! win->treeview) { --- 55,58 ---- *************** *** 63,67 **** gtk_widget_show_all(GTK_WIDGET(win->window)); gtk_widget_grab_focus(GTK_WIDGET(win->treeview)); ! /* add column names to treeview */ for(i=0;i<count;i++) { --- 62,66 ---- gtk_widget_show_all(GTK_WIDGET(win->window)); gtk_widget_grab_focus(GTK_WIDGET(win->treeview)); ! /* add column names to treeview */ for(i=0;i<count;i++) { *************** *** 81,85 **** if (gtk_tree_view_get_model(GTK_TREE_VIEW (win->treeview)) == NULL) { for(i=0;i<count;i++) { ! if (param[i].name && !strcmp(param[i].name, "Distance")) types[i]=G_TYPE_INT; else --- 80,84 ---- if (gtk_tree_view_get_model(GTK_TREE_VIEW (win->treeview)) == NULL) { for(i=0;i<count;i++) { ! if (param[i].name && !strcmp(param[i].name, "Distance")) types[i]=G_TYPE_INT; else *************** *** 91,95 **** gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (win->sortmodel), 0, GTK_SORT_ASCENDING); gtk_tree_view_set_model (GTK_TREE_VIEW (win->treeview), GTK_TREE_MODEL(win->sortmodel)); ! } else gtk_tree_view_set_model (GTK_TREE_VIEW (win->treeview), GTK_TREE_MODEL(win->liststore)); } --- 90,94 ---- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (win->sortmodel), 0, GTK_SORT_ASCENDING); gtk_tree_view_set_model (GTK_TREE_VIEW (win->treeview), GTK_TREE_MODEL(win->sortmodel)); ! } else gtk_tree_view_set_model (GTK_TREE_VIEW (win->treeview), GTK_TREE_MODEL(win->liststore)); } *************** *** 102,107 **** gtk_list_store_set(win->liststore,&iter,i,atoi(param[i].value),-1); } else { ! utf8=g_locale_to_utf8(param[i].value,-1,NULL,NULL,NULL); ! gtk_list_store_set(win->liststore,&iter,i,utf8,-1); } } --- 101,105 ---- gtk_list_store_set(win->liststore,&iter,i,atoi(param[i].value),-1); } else { ! gtk_list_store_set(win->liststore,&iter,i,param[i].value,-1); } } *************** *** 164,168 **** win->click=click; win->close=close; ! if (gui) gtk_window_set_transient_for(GTK_WINDOW((GtkWidget *)(win->window)), GTK_WINDOW(gui->win)); g_signal_connect(G_OBJECT(win->window), "delete-event", G_CALLBACK(gui_gtk_datawindow_delete), win); --- 162,166 ---- win->click=click; win->close=close; ! if (gui) gtk_window_set_transient_for(GTK_WINDOW((GtkWidget *)(win->window)), GTK_WINDOW(gui->win)); g_signal_connect(G_OBJECT(win->window), "delete-event", G_CALLBACK(gui_gtk_datawindow_delete), win); |
|
From: Albert L F. <af...@us...> - 2008-02-13 19:56:14
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27156 Modified Files: osm2navit.c Log Message: Fix:tools/osm2navit: avoid buffer overflow when attrib debug string gets too long Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** osm2navit.c 9 Feb 2008 09:39:20 -0000 1.52 --- osm2navit.c 13 Feb 2008 19:56:16 -0000 1.53 *************** *** 411,416 **** } if (attr_debug_level >= level) { ! sprintf(debug_attr_buffer+strlen(debug_attr_buffer), " %s=%s", k, v); ! node_is_tagged=1; } if (level < 6) --- 411,421 ---- } if (attr_debug_level >= level) { ! int bytes_left = sizeof( debug_attr_buffer ) - strlen(debug_attr_buffer) - 1; ! if ( bytes_left > 0 ) ! { ! snprintf(debug_attr_buffer+strlen(debug_attr_buffer), bytes_left, " %s=%s", k, v); ! debug_attr_buffer[ sizeof( debug_attr_buffer ) - 1 ] = '\0'; ! node_is_tagged=1; ! } } if (level < 6) *************** *** 1226,1230 **** 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 --- 1231,1235 ---- 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 |
|
From: KaZeR <ka...@us...> - 2008-02-13 16:01:11
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23035/src/gui/sdl Modified Files: gui_sdl_window.cpp Log Message: Fix:SDL:Fixes image codec problems, thanks Matt Callow for the patch Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** gui_sdl_window.cpp 7 Feb 2008 15:58:59 -0000 1.49 --- gui_sdl_window.cpp 13 Feb 2008 16:01:10 -0000 1.50 *************** *** 506,510 **** ! static void init_sdlgui(char * skin_layout,int fullscreen,int tilt) { SDL_Surface * screen; --- 506,510 ---- ! static void init_sdlgui(char * skin_layout,int fullscreen,int tilt, char *image_codec_name) { SDL_Surface * screen; *************** *** 561,573 **** try { ! dbg(0, "Forcing silly image codec\n"); ! CEGUI::OpenGLRenderer::setDefaultImageCodecName("SILLYImageCodec"); CEGUI::System::setDefaultXMLParserName(CEGUI::String("TinyXMLParser")); dbg(0, "Using %s as the default CEGUI XML Parser\n", CEGUI::System::getDefaultXMLParserName().c_str()); renderer = new CEGUI::OpenGLRenderer(0,XRES,YRES); new CEGUI::System(renderer); ! ! using namespace CEGUI; ! SDL_ShowCursor(SDL_ENABLE); SDL_EnableUNICODE(1); --- 561,587 ---- try { ! using namespace CEGUI; ! if (image_codec_name) { ! dbg(0, "Using image codec: %s from config\n", image_codec_name); ! } else { ! #if defined (HAVE_LIBCEGUISILLYIMAGECODEC) ! image_codec_name = "SILLYImageCodec"; ! #elif defined(HAVE_LIBCEGUIDEVILIMAGECODEC) ! image_codec_name = "DevILImageCodec"; ! #elif defined (HAVE_LIBCEGUITGAIMAGECODEC) ! image_codec_name = "TGAImageCodec"; ! #else ! fprintf (stderr, "No default image codec available. Try setting image_codec in your config\n"); ! exit (1); ! #endif ! dbg(0, "Using default image codec: %s\n", image_codec_name); ! } ! CEGUI::OpenGLRenderer::setDefaultImageCodecName(image_codec_name); ! CEGUI::System::setDefaultXMLParserName(CEGUI::String("TinyXMLParser")); dbg(0, "Using %s as the default CEGUI XML Parser\n", CEGUI::System::getDefaultXMLParserName().c_str()); renderer = new CEGUI::OpenGLRenderer(0,XRES,YRES); new CEGUI::System(renderer); ! SDL_ShowCursor(SDL_ENABLE); SDL_EnableUNICODE(1); *************** *** 869,878 **** } struct attr *skin_setting=attr_search(attrs, NULL, attr_skin); if(skin_setting){ ! init_sdlgui(skin_setting->u.str,fullscreen,tilt); } else { g_warning("Warning, no skin set for <sdl> in navit.xml. Using default one"); ! init_sdlgui("TaharezLook",fullscreen,tilt); } --- 883,896 ---- } + struct attr *image_codec_setting=attr_search(attrs, NULL, attr_image_codec); + char *image_codec_name=NULL; + if (image_codec_setting) + image_codec_name=image_codec_setting->u.str; struct attr *skin_setting=attr_search(attrs, NULL, attr_skin); if(skin_setting){ ! init_sdlgui(skin_setting->u.str,fullscreen,tilt, image_codec_name); } else { g_warning("Warning, no skin set for <sdl> in navit.xml. Using default one"); ! init_sdlgui("TaharezLook",fullscreen,tilt, image_codec_name); } |
|
From: KaZeR <ka...@us...> - 2008-02-13 16:01:11
|
Update of /cvsroot/navit/navit In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23035 Modified Files: configure.in Log Message: Fix:SDL:Fixes image codec problems, thanks Matt Callow for the patch Index: configure.in =================================================================== RCS file: /cvsroot/navit/navit/configure.in,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** configure.in 8 Feb 2008 15:24:54 -0000 1.73 --- configure.in 13 Feb 2008 16:01:10 -0000 1.74 *************** *** 247,258 **** CEGUI_LIBS="-lCEGUIBase -lCEGUIOpenGLRenderer -lCEGUIFalagardWRBase" ! # The following are optionnal, but we need to link against them if cegui was built with them ! libssilly="$OPENGL_LIBS -lpng" ! AC_CHECK_LIB(CEGUISILLYImageCodec, createImageCodec, ! [CEGUI_LIBS="$CEGUI_LIBS -lCEGUISILLYImageCodec"], ! [echo "CEGUISILLYImageCodec not found/not working, disabled."], ! $libssilly ! ) ! AC_CHECK_LIB(CEGUIXercesParser, main, [CEGUI_LIBS="$CEGUI_LIBS -lCEGUIXercesParser"], --- 247,251 ---- CEGUI_LIBS="-lCEGUIBase -lCEGUIOpenGLRenderer -lCEGUIFalagardWRBase" ! # The following are optional, but we need to link against them if cegui was built with them AC_CHECK_LIB(CEGUIXercesParser, main, [CEGUI_LIBS="$CEGUI_LIBS -lCEGUIXercesParser"], *************** *** 280,284 **** AC_CHECK_LIB(CEGUIDevILImageCodec, main, ! [CEGUI_LIBS="$CEGUI_LIBS -lCEGUIDevILImageCodec"], [echo "CEGUIDevILImageCodec not found/not working, disabled."], $OPENGL_LIBS --- 273,280 ---- AC_CHECK_LIB(CEGUIDevILImageCodec, main, ! [ ! CEGUI_LIBS="$CEGUI_LIBS -lCEGUIDevILImageCodec" ! AC_DEFINE([HAVE_LIBCEGUIDEVILIMAGECODEC],[1],Define to 1 to use DevIL codec) ! ], [echo "CEGUIDevILImageCodec not found/not working, disabled."], $OPENGL_LIBS *************** *** 286,296 **** AC_CHECK_LIB(CEGUITGAImageCodec, createImageCodec, ! [CEGUI_LIBS="$CEGUI_LIBS -lCEGUITGAImageCodec"], [echo "GUITGAImageCodec not found/not working, disabled."], $OPENGL_LIBS ) LIBS="$libstemp" ! echo "LIBS : $CEGUI_LIBS" fi --- 282,305 ---- AC_CHECK_LIB(CEGUITGAImageCodec, createImageCodec, ! [ ! CEGUI_LIBS="$CEGUI_LIBS -lCEGUITGAImageCodec" ! AC_DEFINE(HAVE_LIBCEGUITGAIMAGECODEC,[1],Define to 1 to use the TGA codec) ! ], [echo "GUITGAImageCodec not found/not working, disabled."], $OPENGL_LIBS ) + libssilly="$OPENGL_LIBS -lpng" + AC_CHECK_LIB(CEGUISILLYImageCodec, createImageCodec, + [ + CEGUI_LIBS="$CEGUI_LIBS -lCEGUISILLYImageCodec" + AC_DEFINE([HAVE_LIBCEGUISILLYIMAGECODEC],[1],Define to 1 to use SILLY codec) + ], + [echo "CEGUISILLYImageCodec not found/not working, disabled."], + $libssilly + ) + # Restore the libs LIBS="$libstemp" ! echo "CEGUI_LIBS : $CEGUI_LIBS" fi |
|
From: KaZeR <ka...@us...> - 2008-02-13 16:01:11
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23035/src Modified Files: attr_def.h Log Message: Fix:SDL:Fixes image codec problems, thanks Matt Callow for the patch Index: attr_def.h =================================================================== RCS file: /cvsroot/navit/navit/src/attr_def.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** attr_def.h 12 Feb 2008 14:32:14 -0000 1.28 --- attr_def.h 13 Feb 2008 16:01:10 -0000 1.29 *************** *** 75,78 **** --- 75,79 ---- ATTR(media_window_title) ATTR(media_cmd) + ATTR(image_codec) /* poi */ ATTR(icon) |
|
From: Michael F. <ho...@us...> - 2008-02-12 22:28:09
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4531 Modified Files: navit.c Log Message: Core:Add:Add callback to laymout menu. Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** navit.c 12 Feb 2008 14:32:14 -0000 1.78 --- navit.c 12 Feb 2008 22:28:12 -0000 1.79 *************** *** 657,665 **** GList *layouts; struct layout *l; layouts = this_->layouts; while (layouts) { l=layouts->data; ! menu_add(men, l->name, menu_type_menu, NULL); layouts=g_list_next(layouts); } --- 657,667 ---- GList *layouts; struct layout *l; + struct callback *cb; layouts = this_->layouts; while (layouts) { l=layouts->data; ! cb=callback_new_2(callback_cast(navit_set_attr), this_, attr_new_from_text("layout",l->name)); ! menu_add(men, l->name, menu_type_menu, cb); layouts=g_list_next(layouts); } *************** *** 1245,1248 **** --- 1247,1251 ---- if(!strcmp(attr->u.str,l->name) && this_->layout_current!=l) { this_->layout_current=l; + navit_draw(this_); attr_updated=1; } *************** *** 1277,1280 **** --- 1280,1286 ---- attr->u.num=this_->orient_north_flag; break; + case attr_layout: + attr->u.str=g_strdup(this_->layout_current->name); + break; default: return 0; |
|
From: Michael F. <ho...@us...> - 2008-02-12 14:32:14
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18424 Modified Files: attr_def.h graphics.c graphics.h navit.c Log Message: Core:Fix:Make use of layout_current and add layouts from xml to the menu Index: graphics.c =================================================================== RCS file: /cvsroot/navit/navit/src/graphics.c,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** graphics.c 10 Feb 2008 21:00:48 -0000 1.28 --- graphics.c 12 Feb 2008 14:32:14 -0000 1.29 *************** *** 429,433 **** static void ! xdisplay_draw_layout(GHashTable *display_list, struct graphics *gra, struct layout *l, int order) { GList *lays; --- 429,433 ---- static void ! xdisplay_draw(GHashTable *display_list, struct graphics *gra, struct layout *l, int order) { GList *lays; *************** *** 442,458 **** } - static void - xdisplay_draw(GHashTable *display_list, struct graphics *gra, GList *layouts, int order) - { - struct layout *l; - - while (layouts) { - l=layouts->data; - xdisplay_draw_layout(display_list, gra, l, order); - return; - layouts=g_list_next(layouts); - } - } - extern void *route_selection; --- 442,445 ---- *************** *** 546,558 **** void ! graphics_displaylist_draw(struct graphics *gra, struct displaylist *displaylist, struct transformation *trans, GList *layouts) { int order=transform_get_order(trans); // FIXME find a better place to set the background color ! graphics_gc_set_background(gra->gc[0], ((struct layout *)layouts->data)->color); ! graphics_gc_set_foreground(gra->gc[0], ((struct layout *)layouts->data)->color); gra->meth.background_gc(gra->priv, gra->gc[0]->priv); gra->meth.draw_mode(gra->priv, draw_mode_begin); ! xdisplay_draw(displaylist->dl, gra, layouts, order); gra->meth.draw_mode(gra->priv, draw_mode_end); } --- 533,545 ---- void ! graphics_displaylist_draw(struct graphics *gra, struct displaylist *displaylist, struct transformation *trans, struct layout *l) { int order=transform_get_order(trans); // FIXME find a better place to set the background color ! graphics_gc_set_background(gra->gc[0], l->color); ! graphics_gc_set_foreground(gra->gc[0], l->color); gra->meth.background_gc(gra->priv, gra->gc[0]->priv); gra->meth.draw_mode(gra->priv, draw_mode_begin); ! xdisplay_draw(displaylist->dl, gra, l, order); gra->meth.draw_mode(gra->priv, draw_mode_end); } *************** *** 577,581 **** void ! graphics_draw(struct graphics *gra, struct displaylist *displaylist, GList *mapsets, struct transformation *trans, GList *layouts) { int order=transform_get_order(trans); --- 564,568 ---- void ! graphics_draw(struct graphics *gra, struct displaylist *displaylist, GList *mapsets, struct transformation *trans, struct layout *l) { int order=transform_get_order(trans); *************** *** 599,603 **** do_draw(displaylist, trans, mapsets, order); profile(1,"do_draw"); ! graphics_displaylist_draw(gra, displaylist, trans, layouts); profile(1,"xdisplay_draw"); profile(0,"end"); --- 586,590 ---- do_draw(displaylist, trans, mapsets, order); profile(1,"do_draw"); ! graphics_displaylist_draw(gra, displaylist, trans, l); profile(1,"xdisplay_draw"); profile(0,"end"); Index: graphics.h =================================================================== RCS file: /cvsroot/navit/navit/src/graphics.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** graphics.h 28 Dec 2007 10:04:38 -0000 1.12 --- graphics.h 12 Feb 2008 14:32:14 -0000 1.13 *************** *** 97,100 **** --- 97,101 ---- struct item; struct point; + struct layout; struct graphics *graphics_new(const char *type, struct attr **attrs); struct graphics *graphics_overlay_new(struct graphics *parent, struct point *p, int w, int h); *************** *** 118,124 **** void display_add(struct displaylist *displaylist, struct item *item, int count, struct point *pnt, char *label); int graphics_ready(struct graphics *this_); ! void graphics_displaylist_draw(struct graphics *gra, struct displaylist *displaylist, struct transformation *trans, GList *layouts); void graphics_displaylist_move(struct displaylist *displaylist, int dx, int dy); ! void graphics_draw(struct graphics *gra, struct displaylist *displaylist, GList *mapsets, struct transformation *trans, GList *layouts); struct displaylist_handle *graphics_displaylist_open(struct displaylist *displaylist); struct displayitem *graphics_displaylist_next(struct displaylist_handle *dlh); --- 119,125 ---- void display_add(struct displaylist *displaylist, struct item *item, int count, struct point *pnt, char *label); int graphics_ready(struct graphics *this_); ! void graphics_displaylist_draw(struct graphics *gra, struct displaylist *displaylist, struct transformation *trans, struct layout *l); void graphics_displaylist_move(struct displaylist *displaylist, int dx, int dy); ! void graphics_draw(struct graphics *gra, struct displaylist *displaylist, GList *mapsets, struct transformation *trans, struct layout *l); struct displaylist_handle *graphics_displaylist_open(struct displaylist *displaylist); struct displayitem *graphics_displaylist_next(struct displaylist_handle *dlh); Index: attr_def.h =================================================================== RCS file: /cvsroot/navit/navit/src/attr_def.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** attr_def.h 31 Jan 2008 09:19:41 -0000 1.27 --- attr_def.h 12 Feb 2008 14:32:14 -0000 1.28 *************** *** 88,91 **** --- 88,92 ---- ATTR(description) ATTR(gc_type) + ATTR(layout) ATTR2(0x0003ffff,type_string_end) ATTR(order_limit) Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** navit.c 29 Jan 2008 16:52:14 -0000 1.77 --- navit.c 12 Feb 2008 14:32:14 -0000 1.78 *************** *** 32,35 **** --- 32,36 ---- #include "vehicle.h" #include "color.h" + #include "layout.h" #define _(STRING) gettext(STRING) *************** *** 131,134 **** --- 132,138 ---- { this_->layouts = g_list_append(this_->layouts, lay); + if(!this_->layout_current) { + this_->layout_current=lay; + } } *************** *** 140,144 **** transform_setup_source_rect(this_->trans); ! graphics_draw(this_->gra, this_->displaylist, this_->mapsets, this_->trans, this_->layouts); l=this_->vehicles; while (l) { --- 144,148 ---- transform_setup_source_rect(this_->trans); ! graphics_draw(this_->gra, this_->displaylist, this_->mapsets, this_->trans, this_->layout_current); l=this_->vehicles; while (l) { *************** *** 154,158 **** { if (this_->ready) ! graphics_displaylist_draw(this_->gra, this_->displaylist, this_->trans, this_->layouts); } --- 158,162 ---- { if (this_->ready) ! graphics_displaylist_draw(this_->gra, this_->displaylist, this_->trans, this_->layout_current); } *************** *** 239,243 **** this_->last=this_->current; graphics_displaylist_move(this_->displaylist, dx, dy); ! graphics_displaylist_draw(this_->gra, this_->displaylist, this_->trans, this_->layouts); this_->moved=1; } --- 243,247 ---- this_->last=this_->current; graphics_displaylist_move(this_->displaylist, dx, dy); ! graphics_displaylist_draw(this_->gra, this_->displaylist, this_->trans, this_->layout_current); this_->moved=1; } *************** *** 651,655 **** navit_add_menu_layouts(struct navit *this_, struct menu *men) { ! menu_add(men, "Test", menu_type_menu, NULL); } --- 655,667 ---- navit_add_menu_layouts(struct navit *this_, struct menu *men) { ! GList *layouts; ! struct layout *l; ! ! layouts = this_->layouts; ! while (layouts) { ! l=layouts->data; ! menu_add(men, l->name, menu_type_menu, NULL); ! layouts=g_list_next(layouts); ! } } *************** *** 1194,1197 **** --- 1206,1211 ---- navit_set_attr(struct navit *this_, struct attr *attr) { + GList *layouts; + struct layout *l; int dir=0, orient_old=0, attr_updated=0; *************** *** 1225,1228 **** --- 1239,1253 ---- } break; + case attr_layout: + layouts = this_->layouts; + while (layouts) { + l=layouts->data; + if(!strcmp(attr->u.str,l->name) && this_->layout_current!=l) { + this_->layout_current=l; + attr_updated=1; + } + layouts=g_list_next(layouts); + } + break; default: return 0; |
|
From: Martin S. <mar...@us...> - 2008-02-11 09:17:03
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1771 Modified Files: item_def.h Log Message: Fix:Core:Moved new definitions to the right position Index: item_def.h =================================================================== RCS file: /cvsroot/navit/navit/src/item_def.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** item_def.h 8 Feb 2008 08:48:24 -0000 1.23 --- item_def.h 11 Feb 2008 09:17:01 -0000 1.24 *************** *** 87,91 **** ITEM(poi_water_feature) ITEM(poi_bar) - ITEM(poi_cafe) ITEM(poi_picnic) ITEM(poi_hospital) --- 87,90 ---- *************** *** 207,210 **** --- 206,210 ---- ITEM(poi_gc_reference) ITEM(poi_gc_webcam) + ITEM(poi_cafe) /* Line */ ITEM2(0x80000000,line) *************** *** 250,253 **** --- 250,254 ---- ITEM(street_service) ITEM(coverage) + ITEM(street_pedestrian) /* Area */ ITEM2(0xc0000000,area) *************** *** 286,288 **** ITEM(poly_apron) ITEM(poly_terminal) - ITEM(street_pedestrian) --- 287,288 ---- |
|
From: Michael F. <ho...@us...> - 2008-02-10 21:03:46
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1079 Modified Files: xmlconfig.c Log Message: Core:Fix:Don't make the color attribute of layouts mandatory. Index: xmlconfig.c =================================================================== RCS file: /cvsroot/navit/navit/src/xmlconfig.c,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** xmlconfig.c 10 Feb 2008 21:00:48 -0000 1.28 --- xmlconfig.c 10 Feb 2008 21:03:48 -0000 1.29 *************** *** 442,446 **** if (! name) return 0; ! find_color(state, 1, &color); state->element_object = layout_new(name, &color); if (! state->element_object) --- 442,446 ---- if (! name) return 0; ! find_color(state, 0, &color); state->element_object = layout_new(name, &color); if (! state->element_object) |
|
From: Michael F. <ho...@us...> - 2008-02-10 21:00:50
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32257 Modified Files: xmlconfig.c navit.xml navit.dtd layout.h layout.c graphics.c Log Message: Core:Add:Add support for customizable background color to xmlconfig. Index: navit.xml =================================================================== RCS file: /cvsroot/navit/navit/src/navit.xml,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** navit.xml 9 Feb 2008 09:33:30 -0000 1.37 --- navit.xml 10 Feb 2008 21:00:48 -0000 1.38 *************** *** 71,75 **** </mapset> ! <layout name="Tag"> <layer name="sea" details="0"> <item type="poly_wood" order="0-"> --- 71,75 ---- </mapset> ! <layout name="Tag" color= "#ffefb7"> <layer name="sea" details="0"> <item type="poly_wood" order="0-"> *************** *** 999,1003 **** </layer> </layout> ! <layout name="Nacht"> </layout> </navit> --- 999,1003 ---- </layer> </layout> ! <layout name="Nacht" color="#ffefb7"> </layout> </navit> Index: navit.dtd =================================================================== RCS file: /cvsroot/navit/navit/src/navit.dtd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** navit.dtd 31 Jan 2008 10:47:35 -0000 1.3 --- navit.dtd 10 Feb 2008 21:00:48 -0000 1.4 *************** *** 55,58 **** --- 55,59 ---- <!ELEMENT layout (layer*)> <!ATTLIST layout name CDATA #REQUIRED> + <!ATTLIST layout color CDATA #IMPLIED> <!ELEMENT layer (item+)> <!ATTLIST layer name CDATA #REQUIRED> Index: graphics.c =================================================================== RCS file: /cvsroot/navit/navit/src/graphics.c,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** graphics.c 28 Dec 2007 10:04:38 -0000 1.27 --- graphics.c 10 Feb 2008 21:00:48 -0000 1.28 *************** *** 549,552 **** --- 549,556 ---- { int order=transform_get_order(trans); + // FIXME find a better place to set the background color + graphics_gc_set_background(gra->gc[0], ((struct layout *)layouts->data)->color); + graphics_gc_set_foreground(gra->gc[0], ((struct layout *)layouts->data)->color); + gra->meth.background_gc(gra->priv, gra->gc[0]->priv); gra->meth.draw_mode(gra->priv, draw_mode_begin); xdisplay_draw(displaylist->dl, gra, layouts, order); Index: layout.c =================================================================== RCS file: /cvsroot/navit/navit/src/layout.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** layout.c 5 Jan 2008 22:46:19 -0000 1.4 --- layout.c 10 Feb 2008 21:00:48 -0000 1.5 *************** *** 3,7 **** #include "layout.h" ! struct layout * layout_new(const char *name) { struct layout *l; --- 3,7 ---- #include "layout.h" ! struct layout * layout_new(const char *name, struct color *color) { struct layout *l; *************** *** 9,12 **** --- 9,14 ---- l = g_new0(struct layout, 1); l->name = g_strdup(name); + l->color = g_new0(struct color,1); + *(l->color) = *color; return l; } Index: xmlconfig.c =================================================================== RCS file: /cvsroot/navit/navit/src/xmlconfig.c,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** xmlconfig.c 22 Jan 2008 08:45:16 -0000 1.27 --- xmlconfig.c 10 Feb 2008 21:00:48 -0000 1.28 *************** *** 438,445 **** { const char *name=find_attribute(state, "name", 1); if (! name) return 0; ! state->element_object = layout_new(name); if (! state->element_object) return 0; --- 438,447 ---- { const char *name=find_attribute(state, "name", 1); + struct color color = {0xffff, 0xefef, 0xb7b7, 0xffff}; if (! name) return 0; ! find_color(state, 1, &color); ! state->element_object = layout_new(name, &color); if (! state->element_object) return 0; Index: layout.h =================================================================== RCS file: /cvsroot/navit/navit/src/layout.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** layout.h 5 Jan 2008 22:46:19 -0000 1.5 --- layout.h 10 Feb 2008 21:00:48 -0000 1.6 *************** *** 38,53 **** }; struct layer { char *name; int details; GList *itemtypes; }; ! struct layout { char *name; GList *layers; }; /* prototypes */ enum item_type; - struct color; struct element; struct itemtype; struct layer; struct layout; ! struct layout *layout_new(const char *name); struct layer *layer_new(const char *name, int details); void layout_add_layer(struct layout *layout, struct layer *layer); --- 38,54 ---- }; + struct color; + struct layer { char *name; int details; GList *itemtypes; }; ! struct layout { char *name; struct color *color; GList *layers; }; /* prototypes */ enum item_type; struct element; struct itemtype; struct layer; struct layout; ! struct layout *layout_new(const char *name, struct color *color); struct layer *layer_new(const char *name, int details); void layout_add_layer(struct layout *layout, struct layer *layer); |
13 messages has been excluded from this view by a project administrator.
