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: <md...@us...> - 2015-03-30 21:40:42
|
Revision: 6036 http://sourceforge.net/p/navit/code/6036 Author: mdankov Date: 2015-03-30 21:40:40 +0000 (Mon, 30 Mar 2015) Log Message: ----------- Fix:port_android:Increase limit of downloadable maps to 3.8Gb. Related to #1289. Modified Paths: -------------- trunk/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java =================================================================== --- trunk/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java 2015-03-29 18:28:02 UTC (rev 6035) +++ trunk/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java 2015-03-30 21:40:40 UTC (rev 6036) @@ -178,9 +178,9 @@ String map_index = child.get("map_index"); if (map_index != null) { int mi=Integer.parseInt(map_index); - if(NavitMapDownloader.osm_maps[mi].est_size_bytes/1024/1024/900>=2) { + if(NavitMapDownloader.osm_maps[mi].est_size_bytes/1024/1024/950>=4) { NavitDialogs.sendDialogMessage(NavitDialogs.MSG_TOAST_LONG, null, - Navit._("Sorry, we currently do not support maps above 1.8G on Android, please select a smaller one."), + Navit._("Sorry, we currently do not support maps above 3.8G on Android, please select a smaller one."), -1, 0, 0); return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <md...@us...> - 2015-03-29 18:28:05
|
Revision: 6035 http://sourceforge.net/p/navit/code/6035 Author: mdankov Date: 2015-03-29 18:28:02 +0000 (Sun, 29 Mar 2015) Log Message: ----------- Fix:port_android:Do not allow to download maps above 1.8G, as android build is currently unable to process them. Modified Paths: -------------- trunk/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java =================================================================== --- trunk/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java 2015-03-29 18:25:30 UTC (rev 6034) +++ trunk/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java 2015-03-29 18:28:02 UTC (rev 6035) @@ -177,8 +177,15 @@ String map_index = child.get("map_index"); if (map_index != null) { + int mi=Integer.parseInt(map_index); + if(NavitMapDownloader.osm_maps[mi].est_size_bytes/1024/1024/900>=2) { + NavitDialogs.sendDialogMessage(NavitDialogs.MSG_TOAST_LONG, null, + Navit._("Sorry, we currently do not support maps above 1.8G on Android, please select a smaller one."), + -1, 0, 0); + return true; + } Intent resultIntent = new Intent(); - resultIntent.putExtra("map_index", Integer.parseInt(map_index)); + resultIntent.putExtra("map_index", mi); setResult(Activity.RESULT_OK, resultIntent); finish(); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <md...@us...> - 2015-03-29 18:25:32
|
Revision: 6034 http://sourceforge.net/p/navit/code/6034 Author: mdankov Date: 2015-03-29 18:25:30 +0000 (Sun, 29 Mar 2015) Log Message: ----------- Fix:port_android:Adjust map sizes reported in Map Download menu to reflect current planet.bin contents. Modified Paths: -------------- trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java =================================================================== --- trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java 2015-03-29 11:38:32 UTC (rev 6033) +++ trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java 2015-03-29 18:25:30 UTC (rev 6034) @@ -94,208 +94,208 @@ // define the maps here // public static final osm_map_values[] osm_maps = { - new osm_map_values(Navit._("Whole Planet"),"-180","-90","180","90", 7449814676L, 0), - new osm_map_values(Navit._("Africa"),"-30.89","-36.17","61.68","38.40", 280880799L, 0), - new osm_map_values(Navit._("Angola"),"11.4","-18.1","24.2","-5.3", 55850695L, 1), - new osm_map_values(Navit._("Burundi"),"28.9","-4.5","30.9","-2.2", 60694550L, 1), - new osm_map_values(Navit._("Canary Islands"),"-18.69","26.52","-12.79","29.99", 58904212L, 1), - new osm_map_values(Navit._("Congo, Democratic Republic of the"),"11.7","-13.6","31.5","5.7", 70168822L, 1), - new osm_map_values(Navit._("Ethiopia"),"32.89","3.33","48.07","14.97", 68113437L, 1), - new osm_map_values(Navit._("Guinea"),"-15.47","7.12","-7.58","12.74", 57466702L, 1), - new osm_map_values(Navit._("Cote d'Ivoire"),"-8.72","4.09","-2.43","10.80", 62652062L, 1), - new osm_map_values(Navit._("Kenya"),"33.8","-5.2","42.4","4.9", 64420106L, 1), - new osm_map_values(Navit._("Lesotho"),"26.9","-30.7","29.6","-28.4", 55533656L, 1), - new osm_map_values(Navit._("Liberia"),"-15.00","-0.73","-7.20","8.65", 55963569L, 1), - new osm_map_values(Navit._("Libya"),"9.32","19.40","25.54","33.63", 63127225L, 1), - new osm_map_values(Navit._("Madagascar"),"42.25","-26.63","51.20","-11.31", 56681202L, 1), - new osm_map_values(Navit._("Namibia")+"+"+Navit._("Botswana"),"11.4","-29.1","29.5","-16.9", 64357926L, 1), - new osm_map_values(Navit._("Reunion"),"55.2","-21.4","55.9","-20.9", 59487456L, 1), - new osm_map_values(Navit._("Rwanda"),"28.8","-2.9","30.9","-1.0", 60654274L, 1), - new osm_map_values(Navit._("South Africa")+"+"+Navit._("Lesotho"),"15.93","-36.36","33.65","-22.08", 79904318L, 1), - new osm_map_values(Navit._("Tanzania, United Republic of"),"29.19","-11.87","40.74","-0.88", 65380211L, 1), - new osm_map_values(Navit._("Uganda"),"29.3","-1.6","35.1","4.3", 61521337L, 1), - new osm_map_values(Navit._("Asia"),"23.8","0.1","195.0","82.4", 1185692230L, 0), - new osm_map_values(Navit._("Azerbaijan"),"44.74","38.34","51.69","42.37", 64563990L, 1), - new osm_map_values(Navit._("China"),"67.3","5.3","135.0","54.5", 354889731L, 1), - new osm_map_values(Navit._("Cyprus"),"32.0","34.5","34.9","35.8", 62657503L, 1), - new osm_map_values(Navit._("India")+"+"+Navit._("Nepal"),"67.9","5.5","89.6","36.0", 96930647L, 1), - new osm_map_values(Navit._("Indonesia"),"93.7","-17.3","155.5","7.6", 81860551L, 1), - new osm_map_values(Navit._("Iran, Islamic Republic of"),"43.5","24.4","63.6","40.4", 79782055L, 1), - new osm_map_values(Navit._("Iraq"),"38.7","28.5","49.2","37.4", 64053119L, 1), - new osm_map_values(Navit._("Israel"),"33.99","29.8","35.95","33.4", 73981247L, 1), - new osm_map_values(Navit._("Japan")+"+"+Navit._("Korea")+"+"+Navit._("Taiwan"),"117.6","20.5","151.3","47.1", 451295345L, 1), - new osm_map_values(Navit._("Kazakhstan"),"46.44","40.89","87.36","55.45", 114949353L, 1), - new osm_map_values(Navit._("Kyrgyzstan"),"69.23","39.13","80.33","43.29", 62425757L, 1), - new osm_map_values(Navit._("Malaysia")+"+"+Navit._("Singapore"),"94.3","-5.9","108.6","6.8", 61142116L, 1), - new osm_map_values(Navit._("Mongolia"),"87.5","41.4","120.3","52.7", 66228736L, 1), - new osm_map_values(Navit._("Pakistan"),"60.83","23.28","77.89","37.15", 74060802L, 1), - new osm_map_values(Navit._("Philippines"),"115.58","4.47","127.85","21.60", 71601316L, 1), - new osm_map_values(Navit._("Saudi Arabia"),"33.2","16.1","55.9","33.5", 100651634L, 1), - new osm_map_values(Navit._("Thailand"),"97.5","5.7","105.2","19.7", 68260330L, 1), - new osm_map_values(Navit._("Turkey"),"25.1","35.8","46.4","42.8", 105200911L, 1), - new osm_map_values(Navit._("Turkmenistan"),"51.78","35.07","66.76","42.91", 62188003L, 1), - new osm_map_values(Navit._("UAE+Other"),"51.5","22.6","56.7","26.5", 61873090L, 1), - new osm_map_values(Navit._("Australia")+"+"+Navit._("Oceania"),"89.84","-57.39","179.79","7.26", 185657003L, 0), - new osm_map_values(Navit._("Australia"),"110.5","-44.2","154.9","-9.2", 138812990L, 0), - new osm_map_values(Navit._("Tasmania"),"144.0","-45.1","155.3","-24.8", 109169592L, 1), - new osm_map_values(Navit._("Victoria")+"+"+Navit._("New South Wales"),"140.7","-39.4","153.7","-26.9", 104820309L, 1), - new osm_map_values(Navit._("New Caledonia"),"157.85","-25.05","174.15","-16.85", 54512722L, 1), - new osm_map_values(Navit._("New Zealand"),"165.2","-47.6","179.1","-33.7", 68221081L, 1), - new osm_map_values(Navit._("Europe"),"-12.97","33.59","34.15","72.10", 3570653608L, 0), - new osm_map_values(Navit._("Western Europe"),"-17.6","34.5","42.9","70.9", 3700019849L, 1), - new osm_map_values(Navit._("Austria"),"9.4","46.32","17.21","49.1", 289080462L, 1), - new osm_map_values(Navit._("Azores"),"-31.62","36.63","-24.67","40.13", 54507108L, 1), - new osm_map_values(Navit._("BeNeLux"),"2.08","48.87","7.78","54.52", 656716695L, 1), - new osm_map_values(Navit._("Netherlands"),"3.07","50.75","7.23","53.73", 525336576L, 1), - new osm_map_values(Navit._("Denmark"),"7.65","54.32","15.58","58.07", 154275079L, 1), - new osm_map_values(Navit._("Faroe Islands"),"-7.8","61.3","-6.1","62.5", 54931474L, 1), - new osm_map_values(Navit._("France"),"-5.45","42.00","8.44","51.68", 1468741961L, 1), - new osm_map_values(Navit._("Alsace"),"6.79","47.27","8.48","49.17", 144023488L, 2), - new osm_map_values(Navit._("Aquitaine"),"-2.27","42.44","1.50","45.76", 186786072L, 2), - new osm_map_values(Navit._("Auvergne"),"2.01","44.57","4.54","46.85", 118942252L, 2), - new osm_map_values(Navit._("Basse-Normandie"),"-2.09","48.13","1.03","49.98", 111940365L, 2), - new osm_map_values(Navit._("Bourgogne"),"2.80","46.11","5.58","48.45", 114109115L, 2), - new osm_map_values(Navit._("Bretagne"),"-5.58","46.95","-0.96","48.99", 188689862L, 2), - new osm_map_values(Navit._("Centre"),"0.01","46.29","3.18","48.99", 208870488L, 2), - new osm_map_values(Navit._("Champagne-Ardenne"),"3.34","47.53","5.94","50.28", 112266252L, 2), - new osm_map_values(Navit._("Corse"),"8.12","41.32","9.95","43.28", 67997394L, 2), - new osm_map_values(Navit._("Franche-Comte"),"5.20","46.21","7.83","48.07", 131236689L, 2), - new osm_map_values(Navit._("Haute-Normandie"),"-0.15","48.62","1.85","50.18", 90484736L, 2), - new osm_map_values(Navit._("Ile-de-France"),"1.40","48.07","3.61","49.29", 152890366L, 2), - new osm_map_values(Navit._("Languedoc-Roussillon"),"1.53","42.25","4.89","45.02", 168413195L, 2), - new osm_map_values(Navit._("Limousin"),"0.58","44.87","2.66","46.50", 98422724L, 2), - new osm_map_values(Navit._("Lorraine"),"4.84","47.77","7.72","49.73", 137538540L, 2), - new osm_map_values(Navit._("Midi-Pyrenees"),"-0.37","42.18","3.50","45.10", 186740619L, 2), - new osm_map_values(Navit._("Nord-pas-de-Calais"),"1.42","49.92","4.49","51.31", 145320230L, 2), - new osm_map_values(Navit._("Pays-de-la-Loire"),"-2.88","46.20","0.97","48.62", 243736184L, 2), - new osm_map_values(Navit._("Picardie"),"1.25","48.79","4.31","50.43", 163238861L, 2), - new osm_map_values(Navit._("Poitou-Charentes"),"-1.69","45.04","1.26","47.23", 197886714L, 2), - new osm_map_values(Navit._("Provence-Alpes-Cote-d-Azur"),"4.21","42.91","7.99","45.18", 179863755L, 2), - new osm_map_values(Navit._("Rhone-Alpes"),"3.65","44.07","7.88","46.64", 201452039L, 2), - new osm_map_values(Navit._("Germany"),"5.18","46.84","15.47","55.64", 1187298374L, 1), - new osm_map_values(Navit._("Baden-Wuerttemberg"),"7.32","47.14","10.57","49.85", 247149038L, 2), - new osm_map_values(Navit._("Bayern"),"8.92","47.22","13.90","50.62", 306577202L, 2), - new osm_map_values(Navit._("Mittelfranken"),"9.86","48.78","11.65","49.84", 95916401L, 2), - new osm_map_values(Navit._("Niederbayern"),"11.55","47.75","14.12","49.42", 119427776L, 2), - new osm_map_values(Navit._("Oberbayern"),"10.67","47.05","13.57","49.14", 147630851L, 2), - new osm_map_values(Navit._("Oberfranken"),"10.31","49.54","12.49","50.95", 104963024L, 2), - new osm_map_values(Navit._("Oberpfalz"),"11.14","48.71","13.47","50.43", 112413336L, 2), - new osm_map_values(Navit._("Schwaben"),"9.27","47.10","11.36","49.09", 126836560L, 2), - new osm_map_values(Navit._("Unterfranken"),"8.59","49.16","10.93","50.67", 124601596L, 2), - new osm_map_values(Navit._("Berlin"),"13.03","52.28","13.81","52.73", 78189548L, 2), - new osm_map_values(Navit._("Brandenburg"),"11.17","51.30","14.83","53.63", 126821283L, 2), - new osm_map_values(Navit._("Bremen"),"8.43","52.96","9.04","53.66", 69427370L, 2), - new osm_map_values(Navit._("Hamburg"),"9.56","53.34","10.39","53.80", 76388380L, 2), - new osm_map_values(Navit._("Hessen"),"7.72","49.34","10.29","51.71", 155980870L, 2), - new osm_map_values(Navit._("Mecklenburg-Vorpommern"),"10.54","53.05","14.48","55.05", 92107050L, 2), - new osm_map_values(Navit._("Niedersachsen"),"6.40","51.24","11.69","54.22", 288712601L, 2), - new osm_map_values(Navit._("Nordrhein-westfalen"),"5.46","50.26","9.52","52.59", 335383638L, 2), - new osm_map_values(Navit._("Rheinland-Pfalz"),"6.06","48.91","8.56","51.00", 157909942L, 2), - new osm_map_values(Navit._("Saarland"),"6.30","49.06","7.46","49.69", 78579241L, 2), - new osm_map_values(Navit._("Sachsen-Anhalt"),"10.50","50.88","13.26","53.11", 115314663L, 2), - new osm_map_values(Navit._("Sachsen"),"11.82","50.11","15.10","51.73", 134182818L, 2), - new osm_map_values(Navit._("Schleswig-Holstein"),"7.41","53.30","11.98","55.20", 114865543L, 2), - new osm_map_values(Navit._("Thueringen"),"9.81","50.15","12.72","51.70", 112896293L, 2), - new osm_map_values(Navit._("Germany")+"+"+Navit._("Austria")+"+"+Navit._("Switzerland"),"3.4","44.5","18.6","55.1", 1763000779L, 1), - new osm_map_values(Navit._("Iceland"),"-25.3","62.8","-11.4","67.5", 58803839L, 1), - new osm_map_values(Navit._("Ireland"),"-11.17","51.25","-5.23","55.9", 74456575L, 1), - new osm_map_values(Navit._("Italy"),"6.52","36.38","18.96","47.19", 373215809L, 1), - new osm_map_values(Navit._("Spain")+"+"+Navit._("Portugal"),"-11.04","34.87","4.62","44.41", 354839261L, 1), - new osm_map_values(Navit._("Mallorca"),"2.2","38.8","4.7","40.2", 66781797L, 2), - new osm_map_values(Navit._("Galicia"),"-10.0","41.7","-6.3","44.1", 69081612L, 2), - new osm_map_values(Navit._("Scandinavia"),"4.0","54.4","32.1","71.5", 386082513L, 1), - new osm_map_values(Navit._("Finland"),"18.6","59.2","32.3","70.3", 167464389L, 1), - new osm_map_values(Navit._("Denmark"),"7.49","54.33","13.05","57.88", 142017133L, 1), - new osm_map_values(Navit._("Switzerland"),"5.79","45.74","10.59","47.84", 197612725L, 1), - new osm_map_values(Navit._("United Kingdom"),"-9.7","49.6","2.2","61.2", 308044592L, 1), - new osm_map_values(Navit._("England"),"-7.80","48.93","2.41","56.14", 331085897L, 1), - new osm_map_values(Navit._("Buckinghamshire"),"-1.19","51.44","-0.43","52.25", 74619627L, 2), - new osm_map_values(Navit._("Cambridgeshire"),"-0.55","51.96","0.56","52.79", 71849188L, 2), - new osm_map_values(Navit._("Cumbria"),"-3.96","53.85","-2.11","55.24", 71699620L, 2), - new osm_map_values(Navit._("East yorkshire with hull"),"-1.16","53.50","0.54","54.26", 68241870L, 2), - new osm_map_values(Navit._("Essex"),"-0.07","51.40","1.36","52.14", 82991499L, 2), - new osm_map_values(Navit._("Herefordshire"),"-3.19","51.78","-2.29","52.45", 66471962L, 2), - new osm_map_values(Navit._("Kent"),"-0.02","50.81","1.65","51.53", 75449128L, 2), - new osm_map_values(Navit._("Lancashire"),"-3.20","53.43","-2.00","54.29", 75096621L, 2), - new osm_map_values(Navit._("Leicestershire"),"-1.65","52.34","-0.61","53.03", 75492394L, 2), - new osm_map_values(Navit._("Norfolk"),"0.10","52.30","2.04","53.41", 71556838L, 2), - new osm_map_values(Navit._("Nottinghamshire"),"-1.39","52.73","-0.62","53.55", 72979826L, 2), - new osm_map_values(Navit._("Oxfordshire"),"-1.77","51.41","-0.82","52.22", 73351886L, 2), - new osm_map_values(Navit._("Shropshire"),"-3.29","52.26","-2.18","53.05", 69144272L, 2), - new osm_map_values(Navit._("Somerset"),"-3.89","50.77","-2.20","51.40", 72098176L, 2), - new osm_map_values(Navit._("South yorkshire"),"-1.88","53.25","-0.80","53.71", 72594920L, 2), - new osm_map_values(Navit._("Suffolk"),"0.29","51.88","1.81","52.60", 72985880L, 2), - new osm_map_values(Navit._("Surrey"),"-0.90","51.02","0.10","51.52", 79850137L, 2), - new osm_map_values(Navit._("Wiltshire"),"-2.41","50.90","-1.44","51.76", 71244578L, 2), - new osm_map_values(Navit._("Scotland"),"-8.13","54.49","-0.15","61.40", 102111248L, 2), - new osm_map_values(Navit._("Wales"),"-5.56","51.28","-2.60","53.60", 84860075L, 2), - new osm_map_values(Navit._("Albania"),"19.09","39.55","21.12","42.72", 71097966L, 1), - new osm_map_values(Navit._("Belarus"),"23.12","51.21","32.87","56.23", 100471644L, 1), - new osm_map_values(Navit._("Russian Federation"),"27.9","41.5","190.4", "77.6", 508559360L, 1), - new osm_map_values(Navit._("Bulgaria"),"24.7","42.1","24.8","42.1", 62211433L, 1), - new osm_map_values(Navit._("Bosnia and Herzegovina"),"15.69","42.52","19.67","45.32", 75756822L, 1), - new osm_map_values(Navit._("Czech Republic"),"11.91","48.48","19.02","51.17", 288911729L, 1), - new osm_map_values(Navit._("Croatia"),"13.4","42.1","19.4","46.9", 118479986L, 1), - new osm_map_values(Navit._("Estonia"),"21.5","57.5","28.2","59.6", 86149958L, 1), - new osm_map_values(Navit._("Greece"),"28.9","37.8","29.0","37.8", 59191120L, 1), - new osm_map_values(Navit._("Crete"),"23.3","34.5","26.8","36.0", 61121443L, 1), - new osm_map_values(Navit._("Hungary"),"16.08","45.57","23.03","48.39", 129046944L, 1), - new osm_map_values(Navit._("Latvia"),"20.7","55.6","28.3","58.1", 81683354L, 1), - new osm_map_values(Navit._("Lithuania"),"20.9","53.8","26.9","56.5", 77228922L, 1), - new osm_map_values(Navit._("Poland"),"13.6","48.8","24.5","55.0", 331299544L, 1), - new osm_map_values(Navit._("Romania"),"20.3","43.5","29.9","48.4", 150011857L, 1), - new osm_map_values(Navit._("Ukraine"),"22.0","44.3","40.4","52.4", 372000000L, 1), - new osm_map_values(Navit._("North America"),"-178.1","6.5","-10.4","84.0", 2738147321L, 0), - new osm_map_values(Navit._("Alaska"),"-179.5","49.5","-129","71.6", 72413728L, 1), - new osm_map_values(Navit._("Canada"),"-141.3","41.5","-52.2","70.2", 1125713287L, 1), - new osm_map_values(Navit._("Hawaii"),"-161.07","18.49","-154.45","22.85", 57463829L, 1), - new osm_map_values(Navit._("USA")+Navit._(" (except Alaska and Hawaii)"),"-125.4","24.3","-66.5","49.3", 2356238167L, 1), - new osm_map_values(Navit._("Midwest"),"-104.11","35.92","-80.46","49.46", 663062321L, 2), - new osm_map_values(Navit._("Michigan"),"-90.47","41.64","-79.00","49.37", 207416918L, 2), - new osm_map_values(Navit._("Ohio"),"-84.87","38.05","-79.85","43.53", 143571732L, 2), - new osm_map_values(Navit._("Northeast"),"-80.58","38.72","-66.83","47.53", 517925445L, 2), - new osm_map_values(Navit._("Massachusetts"),"-73.56","40.78","-68.67","42.94", 159493455L, 2), - new osm_map_values(Navit._("Vermont"),"-73.49","42.68","-71.41","45.07", 74308439L, 2), - new osm_map_values(Navit._("Pacific"),"-180.05","15.87","-129.75","73.04", 78496182L, 2), - new osm_map_values(Navit._("South"),"-106.70","23.98","-71.46","40.70", 1135650708L, 2), - new osm_map_values(Navit._("Arkansas"),"-94.67","32.95","-89.59","36.60", 89637645L, 2), - new osm_map_values(Navit._("District of Columbia"),"-77.17","38.74","-76.86","39.05", 64042148L, 2), - new osm_map_values(Navit._("Florida"),"-88.75","23.63","-77.67","31.05", 118647388L, 2), - new osm_map_values(Navit._("Louisiana"),"-94.09","28.09","-88.62","33.07", 136435773L, 2), - new osm_map_values(Navit._("Maryland"),"-79.54","37.83","-74.99","40.22", 134152161L, 2), - new osm_map_values(Navit._("Mississippi"),"-91.71","29.99","-88.04","35.05", 100291749L, 2), - new osm_map_values(Navit._("Oklahoma"),"-103.41","33.56","-94.38","37.38", 106601625L, 2), - new osm_map_values(Navit._("Texas"),"-106.96","25.62","-92.97","36.58", 220587321L, 2), - new osm_map_values(Navit._("Virginia"),"-83.73","36.49","-74.25","39.52", 218627122L, 2), - new osm_map_values(Navit._("West Virginia"),"-82.70","37.15","-77.66","40.97", 133830267L, 2), - new osm_map_values(Navit._("West"),"-133.11","31.28","-101.99","49.51", 616041200L, 2), - new osm_map_values(Navit._("Arizona"),"-114.88","30.01","-108.99","37.06", 89434673L, 2), - new osm_map_values(Navit._("California"),"-125.94","32.43","-114.08","42.07", 303663259L, 2), - new osm_map_values(Navit._("Colorado"),"-109.11","36.52","-100.41","41.05", 132835514L, 2), - new osm_map_values(Navit._("Idaho"),"-117.30","41.93","-110.99","49.18", 97305030L, 2), - new osm_map_values(Navit._("Montana"),"-116.10","44.31","-102.64","49.74", 93935496L, 2), - new osm_map_values(Navit._("New Mexico"),"-109.10","26.98","-96.07","37.05", 185648327L, 2), - new osm_map_values(Navit._("Nevada"),"-120.2","35.0","-113.8","42.1", 138055868L, 2), - new osm_map_values(Navit._("Oregon"),"-124.8","41.8","-116.3","46.3", 103551459L, 2), - new osm_map_values(Navit._("Utah"),"-114.11","36.95","-108.99","42.05", 78249845L, 2), - new osm_map_values(Navit._("Washington State"),"-125.0","45.5","-116.9","49.0", 100601625L, 2), - new osm_map_values(Navit._("South+Middle America"),"-83.5","-56.3","-30.8","13.7", 204217202L, 0), - new osm_map_values(Navit._("Argentina"),"-73.9","-57.3","-51.6","-21.0", 105910515L, 1), - new osm_map_values(Navit._("Argentina")+"+"+Navit._("Chile"),"-77.2","-56.3","-52.7","-16.1", 111585063L, 1), - new osm_map_values(Navit._("Bolivia"),"-70.5","-23.1","-57.3","-9.3", 59215113L, 1), - new osm_map_values(Navit._("Brazil"),"-71.4","-34.7","-32.8","5.4", 127279780L, 1), - new osm_map_values(Navit._("Chile"),"-81.77","-58.50","-65.46","-17.41", 84808355L, 1), - new osm_map_values(Navit._("Cuba"),"-85.3","19.6","-74.0","23.6", 57704852L, 1), - new osm_map_values(Navit._("Colombia"),"-79.1","-4.0","-66.7","12.6", 85701114L, 1), - new osm_map_values(Navit._("Ecuador"),"-82.6","-5.4","-74.4","2.3", 63453353L, 1), - new osm_map_values(Navit._("Guyana")+"+"+Navit._("Suriname")+"+"+Navit._("Guyane Francaise"),"-62.0","1.0","-51.2","8.9", 57226004L, 1), - new osm_map_values(Navit._("Haiti")+"+"+Navit._("Dominican Republic"),"-74.8","17.3","-68.2","20.1", 63826780L, 1), - new osm_map_values(Navit._("Jamaica"),"-78.6","17.4","-75.9","18.9", 53888545L, 1), - new osm_map_values(Navit._("Mexico"),"-117.6","14.1","-86.4","32.8", 258877491L, 1), - new osm_map_values(Navit._("Paraguay"),"-63.8","-28.1","-53.6","-18.8", 60539032L, 1), - new osm_map_values(Navit._("Peru"),"-82.4","-18.1","-67.5","0.4", 71286591L, 1), - new osm_map_values(Navit._("Uruguay"),"-59.2","-36.5","-51.7","-29.7", 64850903L, 1), - new osm_map_values(Navit._("Venezuela"),"-73.6","0.4","-59.7","12.8", 74521456L, 1) + new osm_map_values(Navit._("Whole Planet"), "-180", "-90", "180", "90", 17142215673L, 0), + new osm_map_values(Navit._("Africa"), "-30.89", "-36.17", "61.68", "38.40", 978759015L, 0), + new osm_map_values(Navit._("Angola"), "11.4", "-18.1", "24.2", "-5.3", 91248521L, 1), + new osm_map_values(Navit._("Burundi"), "28.9", "-4.5", "30.9", "-2.2", 90190335L, 1), + new osm_map_values(Navit._("Canary Islands"), "-18.69", "26.52", "-12.79", "29.99", 98499593L, 1), + new osm_map_values(Navit._("Congo, Democratic Republic of the"), "11.7", "-13.6", "31.5", "5.7", 142546118L, 1), + new osm_map_values(Navit._("Ethiopia"), "32.89", "3.33", "48.07", "14.97", 104750098L, 1), + new osm_map_values(Navit._("Guinea"), "-15.47", "7.12", "-7.58", "12.74", 142811547L, 1), + new osm_map_values(Navit._("Cote d'Ivoire"), "-8.72", "4.09", "-2.43", "10.80", 96781332L, 1), + new osm_map_values(Navit._("Kenya"), "33.8", "-5.2", "42.4", "4.9", 99336192L, 1), + new osm_map_values(Navit._("Lesotho"), "26.9", "-30.7", "29.6", "-28.4", 100726025L, 1), + new osm_map_values(Navit._("Liberia"), "-15.00", "-0.73", "-7.20", "8.65", 124911153L, 1), + new osm_map_values(Navit._("Libya"), "9.32", "19.40", "25.54", "33.63", 92073435L, 1), + new osm_map_values(Navit._("Madagascar"), "42.25", "-26.63", "51.20", "-11.31", 106061047L, 1), + new osm_map_values(Navit._("Namibia")+"+"+Navit._("Botswana"), "11.4", "-29.1", "29.5", "-16.9", 114970822L, 1), + new osm_map_values(Navit._("Reunion"), "55.2", "-21.4", "55.9", "-20.9", 98431755L, 1), + new osm_map_values(Navit._("Rwanda"), "28.8", "-2.9", "30.9", "-1.0", 94150938L, 1), + new osm_map_values(Navit._("South Africa")+"+"+Navit._("Lesotho"), "15.93", "-36.36", "33.65", "-22.08", 156152979L, 1), + new osm_map_values(Navit._("Tanzania, United Republic of"), "29.19", "-11.87", "40.74", "-0.88", 106768648L, 1), + new osm_map_values(Navit._("Uganda"), "29.3", "-1.6", "35.1", "4.3", 100022833L, 1), + new osm_map_values(Navit._("Asia"), "23.8", "0.1", "195.0", "82.4", 3253177355L, 0), + new osm_map_values(Navit._("Azerbaijan"), "44.74", "38.34", "51.69", "42.37", 102293296L, 1), + new osm_map_values(Navit._("China"), "67.3", "5.3", "135.0", "54.5", 903999878L, 1), + new osm_map_values(Navit._("Cyprus"), "32.0", "34.5", "34.9", "35.8", 90703681L, 1), + new osm_map_values(Navit._("India")+"+"+Navit._("Nepal"), "67.9", "5.5", "89.6", "36.0", 256058660L, 1), + new osm_map_values(Navit._("Indonesia"), "93.7", "-17.3", "155.5", "7.6", 228766382L, 1), + new osm_map_values(Navit._("Iran, Islamic Republic of"), "43.5", "24.4", "63.6", "40.4", 154094880L, 1), + new osm_map_values(Navit._("Iraq"), "38.7", "28.5", "49.2", "37.4", 107058534L, 1), + new osm_map_values(Navit._("Israel"), "33.99", "29.8", "35.95", "33.4", 119569846L, 1), + new osm_map_values(Navit._("Japan")+"+"+Navit._("Korea")+"+"+Navit._("Taiwan"), "117.6", "20.5", "151.3", "47.1", 766362093L, 1), + new osm_map_values(Navit._("Kazakhstan"), "46.44", "40.89", "87.36", "55.45", 280438037L, 1), + new osm_map_values(Navit._("Kyrgyzstan"), "69.23", "39.13", "80.33", "43.29", 110465464L, 1), + new osm_map_values(Navit._("Malaysia")+"+"+Navit._("Singapore"), "94.3", "-5.9", "108.6", "6.8", 119187612L, 1), + new osm_map_values(Navit._("Mongolia"), "87.5", "41.4", "120.3", "52.7", 107398401L, 1), + new osm_map_values(Navit._("Pakistan"), "60.83", "23.28", "77.89", "37.15", 136107911L, 1), + new osm_map_values(Navit._("Philippines"), "115.58", "4.47", "127.85", "21.60", 166151582L, 1), + new osm_map_values(Navit._("Saudi Arabia"), "33.2", "16.1", "55.9", "33.5", 170037602L, 1), + new osm_map_values(Navit._("Thailand"), "97.5", "5.7", "105.2", "19.7", 134166813L, 1), + new osm_map_values(Navit._("Turkey"), "25.1", "35.8", "46.4", "42.8", 232347346L, 1), + new osm_map_values(Navit._("Turkmenistan"), "51.78", "35.07", "66.76", "42.91", 95588384L, 1), + new osm_map_values(Navit._("UAE+Other"), "51.5", "22.6", "56.7", "26.5", 95709627L, 1), + new osm_map_values(Navit._("Australia")+"+"+Navit._("Oceania"), "89.84", "-57.39", "179.79", "7.26", 482408675L, 0), + new osm_map_values(Navit._("Australia"), "110.5", "-44.2", "154.9", "-9.2", 244410808L, 0), + new osm_map_values(Navit._("Tasmania"), "144.0", "-45.1", "155.3", "-24.8", 176390644L, 1), + new osm_map_values(Navit._("Victoria")+"+"+Navit._("New South Wales"), "140.7", "-39.4", "153.7", "-26.9", 166905296L, 1), + new osm_map_values(Navit._("New Caledonia"), "157.85", "-25.05", "174.15", "-16.85", 88175405L, 1), + new osm_map_values(Navit._("New Zealand"), "165.2", "-47.6", "179.1", "-33.7", 180469055L, 1), + new osm_map_values(Navit._("Europe"), "-12.97", "33.59", "34.15", "72.10", 9046728786L, 0), + new osm_map_values(Navit._("Western Europe"), "-17.6", "34.5", "42.9", "70.9", 9512395121L, 1), + new osm_map_values(Navit._("Austria"), "9.4", "46.32", "17.21", "49.1", 662454467L, 1), + new osm_map_values(Navit._("Azores"), "-31.62", "36.63", "-24.67", "40.13", 84310373L, 1), + new osm_map_values(Navit._("BeNeLux"), "2.08", "48.87", "7.78", "54.52", 1520394547L, 1), + new osm_map_values(Navit._("Netherlands"), "3.07", "50.75", "7.23", "53.73", 1055308779L, 1), + new osm_map_values(Navit._("Denmark"), "7.65", "54.32", "15.58", "58.07", 290170098L, 1), + new osm_map_values(Navit._("Faroe Islands"), "-7.8", "61.3", "-6.1", "62.5", 83188591L, 1), + new osm_map_values(Navit._("France"), "-5.45", "42.00", "8.44", "51.68", 3249655126L, 1), + new osm_map_values(Navit._("Alsace"), "6.79", "47.27", "8.48", "49.17", 288424319L, 2), + new osm_map_values(Navit._("Aquitaine"), "-2.27", "42.44", "1.50", "45.76", 372741849L, 2), + new osm_map_values(Navit._("Auvergne"), "2.01", "44.57", "4.54", "46.85", 248344580L, 2), + new osm_map_values(Navit._("Basse-Normandie"), "-2.09", "48.13", "1.03", "49.98", 212920166L, 2), + new osm_map_values(Navit._("Bourgogne"), "2.80", "46.11", "5.58", "48.45", 254169749L, 2), + new osm_map_values(Navit._("Bretagne"), "-5.58", "46.95", "-0.96", "48.99", 344216282L, 2), + new osm_map_values(Navit._("Centre"), "0.01", "46.29", "3.18", "48.99", 406182417L, 2), + new osm_map_values(Navit._("Champagne-Ardenne"), "3.34", "47.53", "5.94", "50.28", 229584275L, 2), + new osm_map_values(Navit._("Corse"), "8.12", "41.32", "9.95", "43.28", 100145697L, 2), + new osm_map_values(Navit._("Franche-Comte"), "5.20", "46.21", "7.83", "48.07", 262855868L, 2), + new osm_map_values(Navit._("Haute-Normandie"), "-0.15", "48.62", "1.85", "50.18", 161154198L, 2), + new osm_map_values(Navit._("Ile-de-France"), "1.40", "48.07", "3.61", "49.29", 161154198L, 2), + new osm_map_values(Navit._("Languedoc-Roussillon"), "1.53", "42.25", "4.89", "45.02", 327632080L, 2), + new osm_map_values(Navit._("Limousin"), "0.58", "44.87", "2.66", "46.50", 183489689L, 2), + new osm_map_values(Navit._("Lorraine"), "4.84", "47.77", "7.72", "49.73", 269812559L, 2), + new osm_map_values(Navit._("Midi-Pyrenees"), "-0.37", "42.18", "3.50", "45.10", 383558262L, 2), + new osm_map_values(Navit._("Nord-pas-de-Calais"), "1.42", "49.92", "4.49", "51.31", 302919146L, 2), + new osm_map_values(Navit._("Pays-de-la-Loire"), "-2.88", "46.20", "0.97", "48.62", 450193605L, 2), + new osm_map_values(Navit._("Picardie"), "1.25", "48.79", "4.31", "50.43", 307070563L, 2), + new osm_map_values(Navit._("Poitou-Charentes"), "-1.69", "45.04", "1.26", "47.23", 313113043L, 2), + new osm_map_values(Navit._("Provence-Alpes-Cote-d-Azur"), "4.21", "42.91", "7.99", "45.18", 317595783L, 2), + new osm_map_values(Navit._("Rhone-Alpes"), "3.65", "44.07", "7.88", "46.64", 407877163L, 2), + new osm_map_values(Navit._("Germany"), "5.18", "46.84", "15.47", "55.64", 2837673591L, 1), + new osm_map_values(Navit._("Baden-Wuerttemberg"), "7.32", "47.14", "10.57", "49.85", 527492836L, 2), + new osm_map_values(Navit._("Bayern"), "8.92", "47.22", "13.90", "50.62", 662940459L, 2), + new osm_map_values(Navit._("Mittelfranken"), "9.86", "48.78", "11.65", "49.84", 160155291L, 2), + new osm_map_values(Navit._("Niederbayern"), "11.55", "47.75", "14.12", "49.42", 239575482L, 2), + new osm_map_values(Navit._("Oberbayern"), "10.67", "47.05", "13.57", "49.14", 301207029L, 2), + new osm_map_values(Navit._("Oberfranken"), "10.31", "49.54", "12.49", "50.95", 183767024L, 2), + new osm_map_values(Navit._("Oberpfalz"), "11.14", "48.71", "13.47", "50.43", 199582448L, 2), + new osm_map_values(Navit._("Schwaben"), "9.27", "47.10", "11.36", "49.09", 248955385L, 2), + new osm_map_values(Navit._("Unterfranken"), "8.59", "49.16", "10.93", "50.67", 236009244L, 2), + new osm_map_values(Navit._("Berlin"), "13.03", "52.28", "13.81", "52.73", 236009244L, 2), + new osm_map_values(Navit._("Brandenburg"), "11.17", "51.30", "14.83", "53.63", 248263976L, 2), + new osm_map_values(Navit._("Bremen"), "8.43", "52.96", "9.04", "53.66", 116469818L, 2), + new osm_map_values(Navit._("Hamburg"), "9.56", "53.34", "10.39", "53.80", 122614777L, 2), + new osm_map_values(Navit._("Hessen"), "7.72", "49.34", "10.29", "51.71", 334364378L, 2), + new osm_map_values(Navit._("Mecklenburg-Vorpommern"), "10.54", "53.05", "14.48", "55.05", 164819613L, 2), + new osm_map_values(Navit._("Niedersachsen"), "6.40", "51.24", "11.69", "54.22", 662782848L, 2), + new osm_map_values(Navit._("Nordrhein-westfalen"), "5.46", "50.26", "9.52", "52.59", 796972268L, 2), + new osm_map_values(Navit._("Rheinland-Pfalz"), "6.06", "48.91", "8.56", "51.00", 334191707L, 2), + new osm_map_values(Navit._("Saarland"), "6.30", "49.06", "7.46", "49.69", 120534914L, 2), + new osm_map_values(Navit._("Sachsen-Anhalt"), "10.50", "50.88", "13.26", "53.11", 221889143L, 2), + new osm_map_values(Navit._("Sachsen"), "11.82", "50.11", "15.10", "51.73", 267277236L, 2), + new osm_map_values(Navit._("Schleswig-Holstein"), "7.41", "53.30", "11.98", "55.20", 219653495L, 2), + new osm_map_values(Navit._("Thueringen"), "9.81", "50.15", "12.72", "51.70", 208223042L, 2), + new osm_map_values(Navit._("Germany")+"+"+Navit._("Austria")+"+"+Navit._("Switzerland"), "3.4", "44.5", "18.6", "55.1", 4492224830L, 1), + new osm_map_values(Navit._("Iceland"), "-25.3", "62.8", "-11.4", "67.5", 94548231L, 1), + new osm_map_values(Navit._("Ireland"), "-11.17", "51.25", "-5.23", "55.9", 165550114L, 1), + new osm_map_values(Navit._("Italy"), "6.52", "36.38", "18.96", "47.19", 1062662974L, 1), + new osm_map_values(Navit._("Spain")+"+"+Navit._("Portugal"), "-11.04", "34.87", "4.62", "44.41", 812986937L, 1), + new osm_map_values(Navit._("Mallorca"), "2.2", "38.8", "4.7", "40.2", 134412997L, 2), + new osm_map_values(Navit._("Galicia"), "-10.0", "41.7", "-6.3", "44.1", 151155417L, 2), + new osm_map_values(Navit._("Scandinavia"), "4.0", "54.4", "32.1", "71.5", 957345953L, 1), + new osm_map_values(Navit._("Finland"), "18.6", "59.2", "32.3", "70.3", 326001389L, 1), + new osm_map_values(Navit._("Denmark"), "7.49", "54.33", "13.05", "57.88", 255631813L, 1), + new osm_map_values(Navit._("Switzerland"), "5.79", "45.74", "10.59", "47.84", 439384941L, 1), + new osm_map_values(Navit._("United Kingdom"), "-9.7", "49.6", "2.2", "61.2", 679063758L, 1), + new osm_map_values(Navit._("England"), "-7.80", "48.93", "2.41", "56.14", 724085648L, 1), + new osm_map_values(Navit._("Buckinghamshire"), "-1.19", "51.44", "-0.43", "52.25", 109563143L, 2), + new osm_map_values(Navit._("Cambridgeshire"), "-0.55", "51.96", "0.56", "52.79", 108935775L, 2), + new osm_map_values(Navit._("Cumbria"), "-3.96", "53.85", "-2.11", "55.24", 108479102L, 2), + new osm_map_values(Navit._("East yorkshire with hull"), "-1.16", "53.50", "0.54", "54.26", 109066505L, 2), + new osm_map_values(Navit._("Essex"), "-0.07", "51.40", "1.36", "52.14", 126883293L, 2), + new osm_map_values(Navit._("Herefordshire"), "-3.19", "51.78", "-2.29", "52.45", 97777992L, 2), + new osm_map_values(Navit._("Kent"), "-0.02", "50.81", "1.65", "51.53", 112579242L, 2), + new osm_map_values(Navit._("Lancashire"), "-3.20", "53.43", "-2.00", "54.29", 112845974L, 2), + new osm_map_values(Navit._("Leicestershire"), "-1.65", "52.34", "-0.61", "53.03", 117179765L, 2), + new osm_map_values(Navit._("Norfolk"), "0.10", "52.30", "2.04", "53.41", 108306587L, 2), + new osm_map_values(Navit._("Nottinghamshire"), "-1.39", "52.73", "-0.62", "53.55", 112023678L, 2), + new osm_map_values(Navit._("Oxfordshire"), "-1.77", "51.41", "-0.82", "52.22", 109834780L, 2), + new osm_map_values(Navit._("Shropshire"), "-3.29", "52.26", "-2.18", "53.05", 103532414L, 2), + new osm_map_values(Navit._("Somerset"), "-3.89", "50.77", "-2.20", "51.40", 109975069L, 2), + new osm_map_values(Navit._("South yorkshire"), "-1.88", "53.25", "-0.80", "53.71", 110488840L, 2), + new osm_map_values(Navit._("Suffolk"), "0.29", "51.88", "1.81", "52.60", 109788040L, 2), + new osm_map_values(Navit._("Surrey"), "-0.90", "51.02", "0.10", "51.52", 121727148L, 2), + new osm_map_values(Navit._("Wiltshire"), "-2.41", "50.90", "-1.44", "51.76", 106375888L, 2), + new osm_map_values(Navit._("Scotland"), "-8.13", "54.49", "-0.15", "61.40", 189176250L, 2), + new osm_map_values(Navit._("Wales"), "-5.56", "51.28", "-2.60", "53.60", 144572638L, 2), + new osm_map_values(Navit._("Albania"), "19.09", "39.55", "21.12", "42.72", 106939331L, 1), + new osm_map_values(Navit._("Belarus"), "23.12", "51.21", "32.87", "56.23", 229648760L, 1), + new osm_map_values(Navit._("Russian Federation"), "27.9", "41.5", "190.4", "77.6", 1479983473L, 1), + new osm_map_values(Navit._("Bulgaria"), "24.7", "42.1", "24.8", "42.1", 83696190L, 1), + new osm_map_values(Navit._("Bosnia and Herzegovina"), "15.69", "42.52", "19.67", "45.32", 144196241L, 1), + new osm_map_values(Navit._("Czech Republic"), "11.91", "48.48", "19.02", "51.17", 711304334L, 1), + new osm_map_values(Navit._("Croatia"), "13.4", "42.1", "19.4", "46.9", 251673871L, 1), + new osm_map_values(Navit._("Estonia"), "21.5", "57.5", "28.2", "59.6", 142340828L, 1), + new osm_map_values(Navit._("Greece"), "28.9", "37.8", "29.0", "37.8", 83257661L, 1), + new osm_map_values(Navit._("Crete"), "23.3", "34.5", "26.8", "36.0", 87834598L, 1), + new osm_map_values(Navit._("Hungary"), "16.08", "45.57", "23.03", "48.39", 256779608L, 1), + new osm_map_values(Navit._("Latvia"), "20.7", "55.6", "28.3", "58.1", 144857068L, 1), + new osm_map_values(Navit._("Lithuania"), "20.9", "53.8", "26.9", "56.5", 156811735L, 1), + new osm_map_values(Navit._("Poland"), "13.6", "48.8", "24.5", "55.0", 1018629889L, 1), + new osm_map_values(Navit._("Romania"), "20.3", "43.5", "29.9", "48.4", 265402066L, 1), + new osm_map_values(Navit._("Ukraine"), "22.0", "44.3", "40.4", "52.4", 524768547L, 1), + new osm_map_values(Navit._("North America"), "-178.1", "6.5", "-10.4", "84.0", 4526641449L, 0), + new osm_map_values(Navit._("Alaska"), "-179.5", "49.5", "-129", "71.6", 174207438L, 1), + new osm_map_values(Navit._("Canada"), "-141.3", "41.5", "-52.2", "70.2", 2273900574L, 1), + new osm_map_values(Navit._("Hawaii"), "-161.07", "18.49", "-154.45", "22.85", 87476921L, 1), + new osm_map_values(Navit._("USA")+Navit._(" (except Alaska and Hawaii)"), "-125.4", "24.3", "-66.5", "49.3", 3389691841L, 1), + new osm_map_values(Navit._("Midwest"), "-104.11", "35.92", "-80.46", "49.46", 1030850300L, 2), + new osm_map_values(Navit._("Michigan"), "-90.47", "41.64", "-79.00", "49.37", 495136827L, 2), + new osm_map_values(Navit._("Ohio"), "-84.87", "38.05", "-79.85", "43.53", 226499873L, 2), + new osm_map_values(Navit._("Northeast"), "-80.58", "38.72", "-66.83", "47.53", 848767227L, 2), + new osm_map_values(Navit._("Massachusetts"), "-73.56", "40.78", "-68.67", "42.94", 284272912L, 2), + new osm_map_values(Navit._("Vermont"), "-73.49", "42.68", "-71.41", "45.07", 110911886L, 2), + new osm_map_values(Navit._("Pacific"), "-180.05", "15.87", "-129.75", "73.04", 172206612L, 2), + new osm_map_values(Navit._("South"), "-106.70", "23.98", "-71.46", "40.70", 1481026457L, 2), + new osm_map_values(Navit._("Arkansas"), "-94.67", "32.95", "-89.59", "36.60", 125115656L, 2), + new osm_map_values(Navit._("District of Columbia"), "-77.17", "38.74", "-76.86", "39.05", 101152353L, 2), + new osm_map_values(Navit._("Florida"), "-88.75", "23.63", "-77.67", "31.05", 174378547L, 2), + new osm_map_values(Navit._("Louisiana"), "-94.09", "28.09", "-88.62", "33.07", 177996551L, 2), + new osm_map_values(Navit._("Maryland"), "-79.54", "37.83", "-74.99", "40.22", 213559925L, 2), + new osm_map_values(Navit._("Mississippi"), "-91.71", "29.99", "-88.04", "35.05", 146620850L, 2), + new osm_map_values(Navit._("Oklahoma"), "-103.41", "33.56", "-94.38", "37.38", 167396836L, 2), + new osm_map_values(Navit._("Texas"), "-106.96", "25.62", "-92.97", "36.58", 320259945L, 2), + new osm_map_values(Navit._("Virginia"), "-83.73", "36.49", "-74.25", "39.52", 306054196L, 2), + new osm_map_values(Navit._("West Virginia"), "-82.70", "37.15", "-77.66", "40.97", 181531617L, 2), + new osm_map_values(Navit._("West"), "-133.11", "31.28", "-101.99", "49.51", 837597071L, 2), + new osm_map_values(Navit._("Arizona"), "-114.88", "30.01", "-108.99", "37.06", 140190223L, 2), + new osm_map_values(Navit._("California"), "-125.94", "32.43", "-114.08", "42.07", 384857326L, 2), + new osm_map_values(Navit._("Colorado"), "-109.11", "36.52", "-100.41", "41.05", 185388342L, 2), + new osm_map_values(Navit._("Idaho"), "-117.30", "41.93", "-110.99", "49.18", 137642365L, 2), + new osm_map_values(Navit._("Montana"), "-116.10", "44.31", "-102.64", "49.74", 140601787L, 2), + new osm_map_values(Navit._("New Mexico"), "-109.10", "26.98", "-96.07", "37.05", 263105357L, 2), + new osm_map_values(Navit._("Nevada"), "-120.2", "35.0", "-113.8", "42.1", 164712473L, 2), + new osm_map_values(Navit._("Oregon"), "-124.8", "41.8", "-116.3", "46.3", 153169398L, 2), + new osm_map_values(Navit._("Utah"), "-114.11", "36.95", "-108.99", "42.05", 115653638L, 2), + new osm_map_values(Navit._("Washington State"), "-125.0", "45.5", "-116.9", "49.0", 167427046L, 2), + new osm_map_values(Navit._("South+Middle America"), "-83.5", "-56.3", "-30.8", "13.7", 562230441L, 0), + new osm_map_values(Navit._("Argentina"), "-73.9", "-57.3", "-51.6", "-21.0", 244901827L, 1), + new osm_map_values(Navit._("Argentina")+"+"+Navit._("Chile"), "-77.2", "-56.3", "-52.7", "-16.1", 269594088L, 1), + new osm_map_values(Navit._("Bolivia"), "-70.5", "-23.1", "-57.3", "-9.3", 121759213L, 1), + new osm_map_values(Navit._("Brazil"), "-71.4", "-34.7", "-32.8", "5.4", 388405363L, 1), + new osm_map_values(Navit._("Chile"), "-81.77", "-58.50", "-65.46", "-17.41", 160742590L, 1), + new osm_map_values(Navit._("Cuba"), "-85.3", "19.6", "-74.0", "23.6", 95014897L, 1), + new osm_map_values(Navit._("Colombia"), "-79.1", "-4.0", "-66.7", "12.6", 151545547L, 1), + new osm_map_values(Navit._("Ecuador"), "-82.6", "-5.4", "-74.4", "2.3", 105488624L, 1), + new osm_map_values(Navit._("Guyana")+"+"+Navit._("Suriname")+"+"+Navit._("Guyane Francaise"), "-62.0", "1.0", "-51.2", "8.9", 92083881L, 1), + new osm_map_values(Navit._("Haiti")+"+"+Navit._("Dominican Republic"), "-74.8", "17.3", "-68.2", "20.1", 103797756L, 1), + new osm_map_values(Navit._("Jamaica"), "-78.6", "17.4", "-75.9", "18.9", 85053924L, 1), + new osm_map_values(Navit._("Mexico"), "-117.6", "14.1", "-86.4", "32.8", 384891270L, 1), + new osm_map_values(Navit._("Paraguay"), "-63.8", "-28.1", "-53.6", "-18.8", 116798539L, 1), + new osm_map_values(Navit._("Peru"), "-82.4", "-18.1", "-67.5", "0.4", 137292365L, 1), + new osm_map_values(Navit._("Uruguay"), "-59.2", "-36.5", "-51.7", "-29.7", 113817110L, 1), + new osm_map_values(Navit._("Venezuela"), "-73.6", "0.4", "-59.7", "12.8", 124001905L, 1) }; public static final String MAP_FILENAME_PATH = Navit.MAP_FILENAME_PATH; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <md...@us...> - 2015-03-29 11:38:34
|
Revision: 6033 http://sourceforge.net/p/navit/code/6033 Author: mdankov Date: 2015-03-29 11:38:32 +0000 (Sun, 29 Mar 2015) Log Message: ----------- Fix:port_android:Do not catch SIGSEGV because catching it breaks Lollipop NullPointerException handling. Modified Paths: -------------- trunk/navit/navit/debug.c Modified: trunk/navit/navit/debug.c =================================================================== --- trunk/navit/navit/debug.c 2015-03-28 14:44:01 UTC (rev 6032) +++ trunk/navit/navit/debug.c 2015-03-29 11:38:32 UTC (rev 6033) @@ -88,8 +88,10 @@ void debug_init(const char *program_name) { +#ifndef HAVE_API_ANDROID gdb_program=g_strdup(program_name); signal(SIGSEGV, sigsegv); +#endif debug_hash=g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); #ifdef __IPHONE_OS_VERSION_MIN_REQUIRED debug_fp = stdout; @@ -120,11 +122,13 @@ debug_level_set(const char *name, dbg_level level) { if (!strcmp(name, "segv")) { +#ifndef HAVE_API_ANDROID segv_level=level; if (segv_level) signal(SIGSEGV, sigsegv); else signal(SIGSEGV, NULL); +#endif } else if (!strcmp(name, "timestamps")) { timestamp_prefix=level; } else if (!strcmp(name, DEBUG_MODULE_GLOBAL)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <md...@us...> - 2015-03-28 14:44:03
|
Revision: 6032 http://sourceforge.net/p/navit/code/6032 Author: mdankov Date: 2015-03-28 14:44:01 +0000 (Sat, 28 Mar 2015) Log Message: ----------- Fix:core:Consider more street types for address search. Fixes http://forum.navit-project.org/viewtopic.php?t=549 Modified Paths: -------------- trunk/navit/navit/item.h Modified: trunk/navit/navit/item.h =================================================================== --- trunk/navit/navit/item.h 2015-03-25 22:17:13 UTC (rev 6031) +++ trunk/navit/navit/item.h 2015-03-28 14:44:01 UTC (rev 6032) @@ -53,10 +53,14 @@ #define item_is_poly_place(item) ((item).type >= type_poly_place1 && (item).type <= type_poly_place6) #define item_is_point(item) ((item).type < type_line) #define item_is_custom_poi(item) ((item).type >= type_poi_customg && (item).type < type_line) -#define item_is_street(item) (((item).type >= type_street_0 && (item).type < type_street_1_land) \ - || (item).type == type_street_pedestrian \ +#define item_is_street(item) (((item).type >= type_street_nopass && (item).type <= type_roundabout) \ + || (item).type == type_street_service \ + || ((item).type >= type_street_pedestrian && (item).type <= type_track_grass) \ || (item).type == type_living_street \ - || (item).type == type_footway) + || (item).type == type_street_construction \ + || (item).type == type_path \ + || (item).type == type_street_parking_lane \ + || (item).type == type_footway ) #define item_is_equal_id(a,b) ((a).id_hi == (b).id_hi && (a).id_lo == (b).id_lo) #define item_is_equal(a,b) (item_is_equal_id(a,b) && (a).map == (b).map) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-03-25 22:17:14
|
Revision: 6031 http://sourceforge.net/p/navit/code/6031 Author: kazer_ Date: 2015-03-25 22:17:13 +0000 (Wed, 25 Mar 2015) Log Message: ----------- Add:Translations:Added Mongolian, 73rd translation! Added Paths: ----------- trunk/navit/po/mn.po.in Added: trunk/navit/po/mn.po.in =================================================================== --- trunk/navit/po/mn.po.in (rev 0) +++ trunk/navit/po/mn.po.in 2015-03-25 22:17:13 UTC (rev 6031) @@ -0,0 +1,2571 @@ +# Mongolian translation for navit +# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015 +# This file is distributed under the same license as the navit package. +# Enkhbold https://launchpad.net/~enkhbold-baatar + +msgid "" +msgstr "" +"Project-Id-Version: navit\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2015-03-11 06:11+0000\n" +"Last-Translator: Enkhbold <enk...@ya...>\n" +"Language-Team: Mongolian <mn...@li...>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"Language: mn\n" +"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" + +msgid "Running from source directory\n" +msgstr "Эх байгаа сангаас нь ажиллуулах\n" + +#, c-format +msgid "setting '%s' to '%s'\n" +msgstr "Тохиргоо '%s' to '%s'\n" + +#. TRANSLATORS: the following counts refer to streets +msgid "zeroth" +msgstr "зеротх" + +msgid "first" +msgstr "эхний" + +msgid "second" +msgstr "2 дахь" + +msgid "third" +msgstr "3 дахь" + +msgid "fourth" +msgstr "4 дэх" + +msgid "fifth" +msgstr "5 дэх" + +msgid "sixth" +msgstr "6 дэх" + +#. TRANSLATORS: the following counts refer to roundabout exits +msgid "zeroth exit" +msgstr "зеротх гарах" + +msgid "first exit" +msgstr "" + +msgid "second exit" +msgstr "" + +msgid "third exit" +msgstr "" + +msgid "fourth exit" +msgstr "" + +msgid "fifth exit" +msgstr "" + +msgid "sixth exit" +msgstr "" + +#, c-format +msgid "%d m" +msgstr "" + +#, c-format +msgid "in %d m" +msgstr "" + +#, c-format +msgid "%d feet" +msgstr "" + +#, c-format +msgid "in %d feet" +msgstr "" + +#, c-format +msgid "%d meters" +msgstr "" + +#, c-format +msgid "in %d meters" +msgstr "" + +#, c-format +msgid "%d.%d miles" +msgstr "" + +#, c-format +msgid "in %d.%d miles" +msgstr "" + +#, c-format +msgid "%d.%d kilometers" +msgstr "" + +#, c-format +msgid "in %d.%d kilometers" +msgstr "" + +#, c-format +msgid "one mile" +msgid_plural "%d miles" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "in one mile" +msgid_plural "in %d miles" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "one kilometer" +msgid_plural "%d kilometers" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "in one kilometer" +msgid_plural "in %d kilometers" +msgstr[0] "" +msgstr[1] "" + +msgid "exit" +msgstr "" + +msgid "into the ramp" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name +#, c-format +msgid "%sinto the street %s%s%s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto the %s%s%s|male form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto the %s%s%s|female form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto the %s%s%s|neutral form" +msgstr "" + +#. TRANSLATORS: gives the name of the next road to turn into (into the E17) +#, c-format +msgid "%sinto the %s" +msgstr "" + +#. TRANSLATORS: right, as in 'Turn right' +msgid "right" +msgstr "" + +#. TRANSLATORS: left, as in 'Turn left' +msgid "left" +msgstr "" + +#. TRANSLATORS: Don't forget the ending space +msgid "easily " +msgstr "" + +#. TRANSLATORS: Don't forget the ending space +msgid "strongly " +msgstr "" + +#. TRANSLATORS: Don't forget the ending space +msgid "really strongly " +msgstr "" + +#. TRANSLATORS: Don't forget the ending space +msgid "unknown " +msgstr "" + +msgid "When possible, please turn around" +msgstr "" + +msgid "Enter the roundabout soon" +msgstr "" + +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" +msgstr "" + +#, c-format +msgid "then leave the roundabout at the %s" +msgstr "" + +#, c-format +msgid "Leave the roundabout at the %s" +msgstr "" + +#, c-format +msgid "Follow the road for the next %s" +msgstr "" + +msgid "soon" +msgstr "" + +#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "" + +#, c-format +msgid "after %i roads" +msgstr "" + +msgid "now" +msgstr "" + +#, c-format +msgid "then take the %1$s road to the %2$s" +msgstr "" + +msgid "error" +msgstr "" + +#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "" + +#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#, c-format +msgid "then turn %1$s%2$s %3$s%4$s" +msgstr "" + +#, c-format +msgid "You have reached your destination %s" +msgstr "" + +msgid "then you have reached your destination." +msgstr "" + +#. Android resource: @strings/position_popup_title +msgid "Position" +msgstr "" + +msgid "Command" +msgstr "" + +msgid "Length" +msgstr "" + +msgid "km" +msgstr "" + +msgid "m" +msgstr "" + +msgid "Time" +msgstr "" + +msgid "Destination Length" +msgstr "" + +msgid "Destination Time" +msgstr "" + +msgid "Roadbook" +msgstr "" + +#, c-format +msgid "Waypoint %d" +msgstr "" + +msgid "Visit before..." +msgstr "" + +msgid "Set as position" +msgstr "" + +msgid "Set as destination" +msgstr "" + +msgid "Add as bookmark" +msgstr "" + +#, c-format +msgid "Point 0x%x 0x%x" +msgstr "" + +#, c-format +msgid "Screen coord : %d %d" +msgstr "" + +#. 020 +msgid "Andorra" +msgstr "" + +#. 784 +msgid "United Arab Emirates" +msgstr "" + +#. 004 +msgid "Afghanistan" +msgstr "" + +#. 028 +msgid "Antigua and Barbuda" +msgstr "" + +#. 660 +msgid "Anguilla" +msgstr "" + +#. 008 +msgid "Albania" +msgstr "" + +#. 051 +msgid "Armenia" +msgstr "" + +#. 530 +msgid "Netherlands Antilles" +msgstr "" + +#. 024 +msgid "Angola" +msgstr "" + +#. 010 +msgid "Antarctica" +msgstr "" + +#. 032 +msgid "Argentina" +msgstr "" + +#. 016 +msgid "American Samoa" +msgstr "" + +#. 040 +msgid "Austria" +msgstr "" + +#. 036 +msgid "Australia" +msgstr "" + +#. 533 +msgid "Aruba" +msgstr "" + +#. 248 +msgid "Aland Islands" +msgstr "" + +#. 031 +msgid "Azerbaijan" +msgstr "" + +#. 070 +msgid "Bosnia and Herzegovina" +msgstr "" + +#. 052 +msgid "Barbados" +msgstr "" + +#. 050 +msgid "Bangladesh" +msgstr "" + +#. 056 +msgid "Belgium" +msgstr "" + +#. 854 +msgid "Burkina Faso" +msgstr "" + +#. 100 +msgid "Bulgaria" +msgstr "" + +#. 048 +msgid "Bahrain" +msgstr "" + +#. 108 +msgid "Burundi" +msgstr "" + +#. 204 +msgid "Benin" +msgstr "" + +#. 652 +msgid "Saint Barthelemy" +msgstr "" + +#. 060 +msgid "Bermuda" +msgstr "" + +#. 096 +msgid "Brunei Darussalam" +msgstr "" + +#. 068 +msgid "Bolivia" +msgstr "" + +#. 535 +msgid "Bonaire, Sint Eustatius and Saba" +msgstr "" + +#. 076 +msgid "Brazil" +msgstr "" + +#. 044 +msgid "Bahamas" +msgstr "" + +#. 064 +msgid "Bhutan" +msgstr "" + +#. 074 +msgid "Bouvet Island" +msgstr "" + +#. 072 +msgid "Botswana" +msgstr "" + +#. 112 +msgid "Belarus" +msgstr "" + +#. 084 +msgid "Belize" +msgstr "" + +#. 124 +msgid "Canada" +msgstr "" + +#. 166 +msgid "Cocos (Keeling) Islands" +msgstr "" + +#. 180 +msgid "Congo, Democratic Republic of the" +msgstr "" + +#. 140 +msgid "Central African Republic" +msgstr "" + +#. 178 +msgid "Congo" +msgstr "" + +#. 756 +msgid "Switzerland" +msgstr "" + +#. 384 +msgid "Cote d'Ivoire" +msgstr "" + +#. 184 +msgid "Cook Islands" +msgstr "" + +#. 152 +msgid "Chile" +msgstr "" + +#. 120 +msgid "Cameroon" +msgstr "" + +#. 156 +msgid "China" +msgstr "" + +#. 170 +msgid "Colombia" +msgstr "" + +#. 188 +msgid "Costa Rica" +msgstr "" + +#. 192 +msgid "Cuba" +msgstr "" + +#. 132 +msgid "Cape Verde" +msgstr "" + +#. 531 +msgid "Curacao" +msgstr "" + +#. 162 +msgid "Christmas Island" +msgstr "" + +#. 196 +msgid "Cyprus" +msgstr "" + +#. 203 +msgid "Czech Republic" +msgstr "" + +#. 276 +msgid "Germany" +msgstr "" + +#. 262 +msgid "Djibouti" +msgstr "" + +#. 208 +msgid "Denmark" +msgstr "" + +#. 212 +msgid "Dominica" +msgstr "" + +#. 214 +msgid "Dominican Republic" +msgstr "" + +#. 012 +msgid "Algeria" +msgstr "" + +#. 218 +msgid "Ecuador" +msgstr "" + +#. 233 +msgid "Estonia" +msgstr "" + +#. 818 +msgid "Egypt" +msgstr "" + +#. 732 +msgid "Western Sahara" +msgstr "" + +#. 232 +msgid "Eritrea" +msgstr "" + +#. 724 +msgid "Spain" +msgstr "" + +#. 231 +msgid "Ethiopia" +msgstr "" + +#. 246 +msgid "Finland" +msgstr "" + +#. 242 +msgid "Fiji" +msgstr "" + +#. 238 +msgid "Falkland Islands (Malvinas)" +msgstr "" + +#. 583 +msgid "Micronesia, Federated States of" +msgstr "" + +#. 234 +msgid "Faroe Islands" +msgstr "" + +#. 250 +msgid "France" +msgstr "" + +#. 266 +msgid "Gabon" +msgstr "" + +#. 826 +msgid "United Kingdom" +msgstr "" + +#. 308 +msgid "Grenada" +msgstr "" + +#. 268 +msgid "Georgia" +msgstr "" + +#. 254 +msgid "French Guiana" +msgstr "" + +#. 831 +msgid "Guernsey" +msgstr "" + +#. 288 +msgid "Ghana" +msgstr "" + +#. 292 +msgid "Gibraltar" +msgstr "" + +#. 304 +msgid "Greenland" +msgstr "" + +#. 270 +msgid "Gambia" +msgstr "" + +#. 324 +msgid "Guinea" +msgstr "" + +#. 312 +msgid "Guadeloupe" +msgstr "" + +#. 226 +msgid "Equatorial Guinea" +msgstr "" + +#. 300 +msgid "Greece" +msgstr "" + +#. 239 +msgid "South Georgia and the South Sandwich Islands" +msgstr "" + +#. 320 +msgid "Guatemala" +msgstr "" + +#. 316 +msgid "Guam" +msgstr "" + +#. 624 +msgid "Guinea-Bissau" +msgstr "" + +#. 328 +msgid "Guyana" +msgstr "" + +#. 344 +msgid "Hong Kong" +msgstr "" + +#. 334 +msgid "Heard Island and McDonald Islands" +msgstr "" + +#. 340 +msgid "Honduras" +msgstr "" + +#. 191 +msgid "Croatia" +msgstr "" + +#. 332 +msgid "Haiti" +msgstr "" + +#. 348 +msgid "Hungary" +msgstr "" + +#. 360 +msgid "Indonesia" +msgstr "" + +#. 372 +msgid "Ireland" +msgstr "" + +#. 376 +msgid "Israel" +msgstr "" + +#. 833 +msgid "Isle of Man" +msgstr "" + +#. 356 +msgid "India" +msgstr "" + +#. 086 +msgid "British Indian Ocean Territory" +msgstr "" + +#. 368 +msgid "Iraq" +msgstr "" + +#. 364 +msgid "Iran, Islamic Republic of" +msgstr "" + +#. 352 +msgid "Iceland" +msgstr "" + +#. 380 +msgid "Italy" +msgstr "" + +#. 832 +msgid "Jersey" +msgstr "" + +#. 388 +msgid "Jamaica" +msgstr "" + +#. 400 +msgid "Jordan" +msgstr "" + +#. 392 +msgid "Japan" +msgstr "" + +#. 404 +msgid "Kenya" +msgstr "" + +#. 417 +msgid "Kyrgyzstan" +msgstr "" + +#. 116 +msgid "Cambodia" +msgstr "" + +#. 296 +msgid "Kiribati" +msgstr "" + +#. 174 +msgid "Comoros" +msgstr "" + +#. 659 +msgid "Saint Kitts and Nevis" +msgstr "" + +#. 408 +msgid "Korea, Democratic People's Republic of" +msgstr "" + +#. 410 +msgid "Korea, Republic of" +msgstr "" + +#. 414 +msgid "Kuwait" +msgstr "" + +#. 136 +msgid "Cayman Islands" +msgstr "" + +#. 398 +msgid "Kazakhstan" +msgstr "" + +#. 418 +msgid "Lao People's Democratic Republic" +msgstr "" + +#. 422 +msgid "Lebanon" +msgstr "" + +#. 662 +msgid "Saint Lucia" +msgstr "" + +#. 438 +msgid "Liechtenstein" +msgstr "" + +#. 144 +msgid "Sri Lanka" +msgstr "" + +#. 430 +msgid "Liberia" +msgstr "" + +#. 426 +msgid "Lesotho" +msgstr "" + +#. 440 +msgid "Lithuania" +msgstr "" + +#. 442 +msgid "Luxembourg" +msgstr "" + +#. 428 +msgid "Latvia" +msgstr "" + +#. 434 +msgid "Libya" +msgstr "" + +#. 504 +msgid "Morocco" +msgstr "" + +#. 492 +msgid "Monaco" +msgstr "" + +#. 498 +msgid "Moldova, Republic of" +msgstr "" + +#. 499 +msgid "Montenegro" +msgstr "" + +#. 663 +msgid "Saint Martin (French part)" +msgstr "" + +#. 450 +msgid "Madagascar" +msgstr "" + +#. 584 +msgid "Marshall Islands" +msgstr "" + +#. 807 +msgid "Macedonia, the former Yugoslav Republic of" +msgstr "" + +#. 466 +msgid "Mali" +msgstr "" + +#. 104 +msgid "Myanmar" +msgstr "" + +#. 496 +msgid "Mongolia" +msgstr "" + +#. 446 +msgid "Macao" +msgstr "" + +#. 580 +msgid "Northern Mariana Islands" +msgstr "" + +#. 474 +msgid "Martinique" +msgstr "" + +#. 478 +msgid "Mauritania" +msgstr "" + +#. 500 +msgid "Montserrat" +msgstr "" + +#. 470 +msgid "Malta" +msgstr "" + +#. 480 +msgid "Mauritius" +msgstr "" + +#. 462 +msgid "Maldives" +msgstr "" + +#. 454 +msgid "Malawi" +msgstr "" + +#. 484 +msgid "Mexico" +msgstr "" + +#. 458 +msgid "Malaysia" +msgstr "" + +#. 508 +msgid "Mozambique" +msgstr "" + +#. 516 +msgid "Namibia" +msgstr "" + +#. 540 +msgid "New Caledonia" +msgstr "" + +#. 562 +msgid "Niger" +msgstr "" + +#. 574 +msgid "Norfolk Island" +msgstr "" + +#. 566 +msgid "Nigeria" +msgstr "" + +#. 558 +msgid "Nicaragua" +msgstr "" + +#. 528 +msgid "Netherlands" +msgstr "" + +#. 578 +msgid "Norway" +msgstr "" + +#. 524 +msgid "Nepal" +msgstr "" + +#. 520 +msgid "Nauru" +msgstr "" + +#. 570 +msgid "Niue" +msgstr "" + +#. 554 +msgid "New Zealand" +msgstr "" + +#. 512 +msgid "Oman" +msgstr "" + +#. 591 +msgid "Panama" +msgstr "" + +#. 604 +msgid "Peru" +msgstr "" + +#. 258 +msgid "French Polynesia" +msgstr "" + +#. 598 +msgid "Papua New Guinea" +msgstr "" + +#. 608 +msgid "Philippines" +msgstr "" + +#. 586 +msgid "Pakistan" +msgstr "" + +#. 616 +msgid "Poland" +msgstr "" + +#. 666 +msgid "Saint Pierre and Miquelon" +msgstr "" + +#. 612 +msgid "Pitcairn" +msgstr "" + +#. 630 +msgid "Puerto Rico" +msgstr "" + +#. 275 +msgid "Palestinian Territory, Occupied" +msgstr "" + +#. 620 +msgid "Portugal" +msgstr "" + +#. 585 +msgid "Palau" +msgstr "" + +#. 600 +msgid "Paraguay" +msgstr "" + +#. 634 +msgid "Qatar" +msgstr "" + +#. 638 +msgid "Reunion" +msgstr "" + +#. 642 +msgid "Romania" +msgstr "" + +#. 688 +msgid "Serbia" +msgstr "" + +#. 643 +msgid "Russian Federation" +msgstr "" + +#. 646 +msgid "Rwanda" +msgstr "" + +#. 682 +msgid "Saudi Arabia" +msgstr "" + +#. 090 +msgid "Solomon Islands" +msgstr "" + +#. 690 +msgid "Seychelles" +msgstr "" + +#. 736 +msgid "Sudan" +msgstr "" + +#. 752 +msgid "Sweden" +msgstr "" + +#. 702 +msgid "Singapore" +msgstr "" + +#. 654 +msgid "Saint Helena" +msgstr "" + +#. 705 +msgid "Slovenia" +msgstr "" + +#. 744 +msgid "Svalbard and Jan Mayen" +msgstr "" + +#. 703 +msgid "Slovakia" +msgstr "" + +#. 694 +msgid "Sierra Leone" +msgstr "" + +#. 674 +msgid "San Marino" +msgstr "" + +#. 686 +msgid "Senegal" +msgstr "" + +#. 706 +msgid "Somalia" +msgstr "" + +#. 740 +msgid "Suriname" +msgstr "" + +#. 728 +msgid "South Sudan" +msgstr "" + +#. 678 +msgid "Sao Tome and Principe" +msgstr "" + +#. 222 +msgid "El Salvador" +msgstr "" + +#. 534 +msgid "Sint Maarten (Dutch part)" +msgstr "" + +#. 760 +msgid "Syrian Arab Republic" +msgstr "" + +#. 748 +msgid "Swaziland" +msgstr "" + +#. 796 +msgid "Turks and Caicos Islands" +msgstr "" + +#. 148 +msgid "Chad" +msgstr "" + +#. 260 +msgid "French Southern Territories" +msgstr "" + +#. 768 +msgid "Togo" +msgstr "" + +#. 764 +msgid "Thailand" +msgstr "" + +#. 762 +msgid "Tajikistan" +msgstr "" + +#. 772 +msgid "Tokelau" +msgstr "" + +#. 626 +msgid "Timor-Leste" +msgstr "" + +#. 795 +msgid "Turkmenistan" +msgstr "" + +#. 788 +msgid "Tunisia" +msgstr "" + +#. 776 +msgid "Tonga" +msgstr "" + +#. 792 +msgid "Turkey" +msgstr "" + +#. 780 +msgid "Trinidad and Tobago" +msgstr "" + +#. 798 +msgid "Tuvalu" +msgstr "" + +#. 158 +msgid "Taiwan, Province of China" +msgstr "" + +#. 834 +msgid "Tanzania, United Republic of" +msgstr "" + +#. 804 +msgid "Ukraine" +msgstr "" + +#. 800 +msgid "Uganda" +msgstr "" + +#. 581 +msgid "United States Minor Outlying Islands" +msgstr "" + +#. 840 +msgid "United States" +msgstr "" + +#. 858 +msgid "Uruguay" +msgstr "" + +#. 860 +msgid "Uzbekistan" +msgstr "" + +#. 336 +msgid "Holy See (Vatican City State)" +msgstr "" + +#. 670 +msgid "Saint Vincent and the Grenadines" +msgstr "" + +#. 862 +msgid "Venezuela" +msgstr "" + +#. 092 +msgid "Virgin Islands, British" +msgstr "" + +#. 850 +msgid "Virgin Islands, U.S." +msgstr "" + +#. 704 +msgid "Viet Nam" +msgstr "" + +#. 548 +msgid "Vanuatu" +msgstr "" + +#. 876 +msgid "Wallis and Futuna" +msgstr "" + +#. 882 +msgid "Samoa" +msgstr "" + +#. 887 +msgid "Yemen" +msgstr "" + +#. 175 +msgid "Mayotte" +msgstr "" + +#. 710 +msgid "South Africa" +msgstr "" + +#. 894 +msgid "Zambia" +msgstr "" + +#. 716 +msgid "Zimbabwe" +msgstr "" + +msgid "* Unknown, add is_in tags to those cities" +msgstr "" + +msgid "" +"navit usage:\n" +"navit [options] [configfile]\n" +"\t-c <file>: use <file> as config file\n" +"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting " +"from config file.\n" +"\t-h: print this usage info and exit.\n" +"\t-v: Print the version and exit.\n" +msgstr "" + +#. We have not found an existing config file from all possibilities +msgid "No config file navit.xml, navit.xml.local found\n" +msgstr "" + +#, c-format +msgid "Error parsing config file '%s': %s\n" +msgstr "" + +#, c-format +msgid "Using config file '%s'\n" +msgstr "" + +#, c-format +msgid "Error: No configuration found in config file '%s'\n" +msgstr "" + +msgid "" +"Internal initialization failed, exiting. Check previous error messages.\n" +msgstr "" + +msgid "unknown street" +msgstr "" + +#. Safe cast: attr_generic_set_attr does not modify its parameter. +msgid "Unnamed vehicle" +msgstr "" + +msgid "Failed to write bookmarks file" +msgstr "" + +#. Strings from navit_shipped.xml +msgid "Map Point" +msgstr "" + +msgid "Car" +msgstr "" + +msgid "Iso2" +msgstr "" + +msgid "Iso3" +msgstr "" + +msgid "Country" +msgstr "" + +msgid "Postal" +msgstr "" + +msgid "Town" +msgstr "" + +msgid "District" +msgstr "" + +msgid "Street" +msgstr "" + +msgid "Number" +msgstr "" + +msgid "Enter Destination" +msgstr "" + +msgid "Zip Code" +msgstr "" + +msgid "City" +msgstr "" + +msgid "District/Township" +msgstr "" + +msgid "Map" +msgstr "" + +msgid "Bookmark" +msgstr "" + +msgid "Destination" +msgstr "" + +#. TRANSLATORS: These texts are for menu items in GTK GUI. The _ indicates the mnemonic key (=underlined character) for this menu item. Please place the _ before a suitable character in the translation (or omit it if no mnemonic key is desired). +msgid "_Display" +msgstr "" + +msgid "_Route" +msgstr "" + +msgid "_Former Destinations" +msgstr "" + +msgid "_Bookmarks" +msgstr "" + +msgid "_Map" +msgstr "" + +msgid "_Layout" +msgstr "" + +msgid "_Projection" +msgstr "" + +msgid "_Vehicle" +msgstr "" + +msgid "Zoom_Out" +msgstr "" + +msgid "Decrease zoom level" +msgstr "" + +msgid "Zoom_In" +msgstr "" + +msgid "Increase zoom level" +msgstr "" + +msgid "_Recalculate" +msgstr "" + +msgid "Redraw map" +msgstr "" + +msgid "_Info" +msgstr "" + +msgid "Set _destination" +msgstr "" + +msgid "Opens address search dialog" +msgstr "" + +msgid "_POI search" +msgstr "" + +msgid "Opens POI search dialog" +msgstr "" + +msgid "_Stop Navigation" +msgstr "" + +msgid "Test" +msgstr "" + +msgid "_Quit" +msgstr "" + +msgid "Quit the application" +msgstr "" + +msgid "Show position _cursor" +msgstr "" + +msgid "_Lock on Road" +msgstr "" + +msgid "_Keep orientation to the North" +msgstr "" + +msgid "Switches map orientation to the north or the vehicle" +msgstr "" + +msgid "_Roadbook" +msgstr "" + +msgid "Show/hide route description" +msgstr "" + +msgid "_Autozoom" +msgstr "" + +msgid "Enable/disable automatic zoom level changing" +msgstr "" + +msgid "_Fullscreen" +msgstr "" + +msgid "Data" +msgstr "" + +msgid "Pharmacy" +msgstr "" + +msgid "Restaurant" +msgstr "" + +msgid "Restaurant. Fast food" +msgstr "" + +msgid "Hotel" +msgstr "" + +msgid "Car parking" +msgstr "" + +msgid "Fuel station" +msgstr "" + +msgid "Bank" +msgstr "" + +msgid "Hospital" +msgstr "" + +msgid "Cinema" +msgstr "" + +msgid "Train station" +msgstr "" + +msgid "School" +msgstr "" + +msgid "Police" +msgstr "" + +msgid "Justice" +msgstr "" + +msgid "Taxi" +msgstr "" + +msgid "Shopping" +msgstr "" + +msgid "Distance from screen center (km)" +msgstr "" + +#, c-format +msgid "POI %s. %s" +msgstr "" + +#, c-format +msgid "Set destination to %ld, %ld \n" +msgstr "" + +#, c-format +msgid "Set map to %ld, %ld \n" +msgstr "" + +#, c-format +msgid "Set next visit to %ld, %ld \n" +msgstr "" + +msgid "POI search" +msgstr "" + +msgid "Select a category" +msgstr "" + +msgid "Select a distance to look for (km)" +msgstr "" + +msgid "Select a POI" +msgstr "" + +msgid " " +msgstr "" + +msgid "Category" +msgstr "" + +msgid "Direction" +msgstr "" + +msgid "Distance(m)" +msgstr "" + +msgid "Name" +msgstr "" + +msgid "Visit Before" +msgstr "" + +msgid "N" +msgstr "" + +msgid "NE" +msgstr "" + +msgid "E" +msgstr "" + +msgid "SE" +msgstr "" + +msgid "S" +msgstr "" + +msgid "SW" +msgstr "" + +msgid "W" +msgstr "" + +msgid "NW" +msgstr "" + +#. Android resource: @strings/no +msgid "No" +msgstr "" + +msgid "2D" +msgstr "" + +msgid "3D" +msgstr "" + +msgid "OT" +msgstr "" + +#, c-format +msgid "Route %4.0fkm %02d:%02d ETA" +msgstr "" + +msgid "Route 0000km 0+00:00 ETA" +msgstr "" + +msgid "Help" +msgstr "" + +#, c-format +msgid "Waypoint %s" +msgstr "" + +msgid "Select waypoint to insert the new one before" +msgstr "" + +msgid "View in Browser" +msgstr "" + +msgid "Item type" +msgstr "" + +#. Android resource: @strings/address_search_streets +msgid "Streets" +msgstr "" + +msgid "House numbers" +msgstr "" + +msgid "View Attributes" +msgstr "" + +msgid "Set as position (and deactivate vehicle)" +msgstr "" + +msgid "POIs" +msgstr "" + +msgid "View on map" +msgstr "" + +msgid "Remove search results from the map" +msgstr "" + +msgid "Show results on the map" +msgstr "" + +msgid "Cut Bookmark" +msgstr "" + +msgid "Copy Bookmark" +msgstr "" + +msgid "Rename Bookmark" +msgstr "" + +msgid "Paste Bookmark" +msgstr "" + +msgid "Delete Bookmark" +msgstr "" + +msgid "Delete waypoint" +msgstr "" + +msgid "Bookmarks" +msgstr "" + +msgid "Bookmarks as waypoints" +msgstr "" + +msgid "Save waypoints" +msgstr "" + +msgid "Replace with waypoints" +msgstr "" + +msgid "Delete Folder" +msgstr "" + +#. Adds the Bookmark folders +msgid "Add Bookmark folder" +msgstr "" + +#. Pastes the Bookmark +msgid "Paste bookmark" +msgstr "" + +#, c-format +msgid "Bookmark %s" +msgstr "" + +#, c-format +msgid "Download %s" +msgstr "" + +msgid "Map Download" +msgstr "" + +msgid "Active" +msgstr "" + +msgid "Download Enabled" +msgstr "" + +msgid "Download completely" +msgstr "" + +msgid "Show Satellite Status" +msgstr "" + +msgid " Elevation " +msgstr "" + +msgid " Azimuth " +msgstr "" + +msgid "Show NMEA Data" +msgstr "" + +msgid "car" +msgstr "" + +msgid "bike" +msgstr "" + +msgid "pedestrian" +msgstr "" + +#, c-format +msgid "Current profile: %s" +msgstr "" + +#, c-format +msgid "Change profile to: %s" +msgstr "" + +msgid "Set as active" +msgstr "" + +msgid "Show Satellite status" +msgstr "" + +msgid "Show NMEA data" +msgstr "" + +msgid "Add Bookmark" +msgstr "" + +msgid "Rename" +msgstr "" + +msgid "About Navit" +msgstr "" + +#. Authors +msgid "By" +msgstr "" + +#. Contributors +msgid "And all the Navit Team" +msgstr "" + +msgid "members and contributors." +msgstr "" + +msgid "Waypoints" +msgstr "" + +msgid "Enter Coordinates" +msgstr "" + +#. +#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) +#. gui_internal_widget_append(wb, w) +#. +#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) +#. gui_internal_widget_append(w, we) +msgid "Latitude Longitude" +msgstr "" + +msgid "Enter coordinates, for example:" +msgstr "" + +msgid "Vehicle" +msgstr "" + +msgid "Rules" +msgstr "" + +msgid "Lock on road" +msgstr "" + +msgid "Northing" +msgstr "" + +msgid "Map follows Vehicle" +msgstr "" + +msgid "Plan with Waypoints" +msgstr "" + +msgid "Maps" +msgstr "" + +msgid "Layout" +msgstr "" + +msgid "Height Profile" +msgstr "" + +msgid "Route Description" +msgstr "" + +msgid "Show Locale" +msgstr "" + +msgid "Former Destinations" +msgstr "" + +msgid "- No former destinations available -" +msgstr "" + +msgid "Message" +msgstr "" + +msgid "Back" +msgstr "" + +msgid "Back to map" +msgstr "" + +msgid "Main Menu" +msgstr "" + +msgid "House number" +msgstr "" + +msgid "Next" +msgstr "" + +msgid "Prev" +msgstr "" + +msgid "Return to route!" +msgstr "" + +#. warning told +msgid "Look out! Camera!" +msgstr "" + +#. warning told +msgid "Please decrease your speed" +msgstr "" + +msgid "partial match" +msgstr "" + +#. Android resource: @strings/address_search_button +msgid "Search" +msgstr "" + +#. Android resource: @strings/address_search_towns +msgid "Towns" +msgstr "" + +#. Android resource: @strings/position_popup_drive_here +msgid "Route to here" +msgstr "" + +msgid "Map data (c) OpenStreetMap contributors, ODBL" +msgstr "" + +msgid "Downloaded maps" +msgstr "" + +msgid "Cancel" +msgstr "" + +msgid "Whole Planet" +msgstr "" + +msgid "Africa" +msgstr "" + +msgid "Canary Islands" +msgstr "" + +msgid "Asia" +msgstr "" + +msgid "Korea" +msgstr "" + +msgid "Taiwan" +msgstr "" + +msgid "UAE+Other" +msgstr "" + +msgid "Oceania" +msgstr "" + +msgid "Tasmania" +msgstr "" + +msgid "Victoria" +msgstr "" + +msgid "New South Wales" +msgstr "" + +msgid "Europe" +msgstr "" + +msgid "Western Europe" +msgstr "" + +msgid "Azores" +msgstr "" + +msgid "BeNeLux" +msgstr "" + +msgid "Alsace" +msgstr "" + +msgid "Aquitaine" +msgstr "" + +msgid "Auvergne" +msgstr "" + +msgid "Basse-Normandie" +msgstr "" + +msgid "Bourgogne" +msgstr "" + +msgid "Bretagne" +msgstr "" + +msgid "Centre" +msgstr "" + +msgid "Champagne-Ardenne" +msgstr "" + +msgid "Corse" +msgstr "" + +msgid "Franche-Comte" +msgstr "" + +msgid "Haute-Normandie" +msgstr "" + +msgid "Ile-de-France" +msgstr "" + +msgid "Languedoc-Roussillon" +msgstr "" + +msgid "Limousin" +msgstr "" + +msgid "Lorraine" +msgstr "" + +msgid "Midi-Pyrenees" +msgstr "" + +msgid "Nord-pas-de-Calais" +msgstr "" + +msgid "Pays-de-la-Loire" +msgstr "" + +msgid "Picardie" +msgstr "" + +msgid "Poitou-Charentes" +msgstr "" + +msgid "Provence-Alpes-Cote-d-Azur" +msgstr "" + +msgid "Rhone-Alpes" +msgstr "" + +msgid "Baden-Wuerttemberg" +msgstr "" + +msgid "Bayern" +msgstr "" + +msgid "Mittelfranken" +msgstr "" + +msgid "Niederbayern" +msgstr "" + +msgid "Oberbayern" +msgstr "" + +msgid "Oberfranken" +msgstr "" + +msgid "Oberpfalz" +msgstr "" + +msgid "Schwaben" +msgstr "" + +msgid "Unterfranken" +msgstr "" + +msgid "Berlin" +msgstr "" + +msgid "Brandenburg" +msgstr "" + +msgid "Bremen" +msgstr "" + +msgid "Hamburg" +msgstr "" + +msgid "Hessen" +msgstr "" + +msgid "Mecklenburg-Vorpommern" +msgstr "" + +msgid "Niedersachsen" +msgstr "" + +msgid "Nordrhein-westfalen" +msgstr "" + +msgid "Rheinland-Pfalz" +msgstr "" + +msgid "Saarland" +msgstr "" + +msgid "Sachsen-Anhalt" +msgstr "" + +msgid "Sachsen" +msgstr "" + +msgid "Schleswig-Holstein" +msgstr "" + +msgid "Thueringen" +msgstr "" + +msgid "Mallorca" +msgstr "" + +msgid "Galicia" +msgstr "" + +msgid "Scandinavia" +msgstr "" + +msgid "England" +msgstr "" + +msgid "Buckinghamshire" +msgstr "" + +msgid "Cambridgeshire" +msgstr "" + +msgid "Cumbria" +msgstr "" + +msgid "East yorkshire with hull" +msgstr "" + +msgid "Essex" +msgstr "" + +msgid "Herefordshire" +msgstr "" + +msgid "Kent" +msgstr "" + +msgid "Lancashire" +msgstr "" + +msgid "Leicestershire" +msgstr "" + +msgid "Norfolk" +msgstr "" + +msgid "Nottinghamshire" +msgstr "" + +msgid "Oxfordshire" +msgstr "" + +msgid "Shropshire" +msgstr "" + +msgid "Somerset" +msgstr "" + +msgid "South yorkshire" +msgstr "" + +msgid "Suffolk" +msgstr "" + +msgid "Surrey" +msgstr "" + +msgid "Wiltshire" +msgstr "" + +msgid "Scotland" +msgstr "" + +msgid "Wales" +msgstr "" + +msgid "Crete" +msgstr "" + +msgid "North America" +msgstr "" + +msgid "Alaska" +msgstr "" + +msgid "Hawaii" +msgstr "" + +msgid "USA" +msgstr "" + +msgid " (except Alaska and Hawaii)" +msgstr "" + +msgid "Midwest" +msgstr "" + +msgid "Michigan" +msgstr "" + +msgid "Ohio" +msgstr "" + +msgid "Northeast" +msgstr "" + +msgid "Massachusetts" +msgstr "" + +msgid "Vermont" +msgstr "" + +msgid "Pacific" +msgstr "" + +msgid "South" +msgstr "" + +msgid "Arkansas" +msgstr "" + +msgid "District of Columbia" +msgstr "" + +msgid "Florida" +msgstr "" + +msgid "Louisiana" +msgstr "" + +msgid "Maryland" +msgstr "" + +msgid "Mississippi" +msgstr "" + +msgid "Oklahoma" +msgstr "" + +msgid "Texas" +msgstr "" + +msgid "Virginia" +msgstr "" + +msgid "West Virginia" +msgstr "" + +msgid "West" +msgstr "" + +msgid "Arizona" +msgstr "" + +msgid "California" +msgstr "" + +msgid "Colorado" +msgstr "" + +msgid "Idaho" +msgstr "" + +msgid "Montana" +msgstr "" + +msgid "New Mexico" +msgstr "" + +msgid "Nevada" +msgstr "" + +msgid "Oregon" +msgstr "" + +msgid "Utah" +msgstr "" + +msgid "Washington State" +msgstr "" + +msgid "South+Middle America" +msgstr "" + +msgid "Guyane Francaise" +msgstr "" + +msgid "downloading" +msgstr "" + +#. Android resource: @strings/map_download_ready +msgid "ready" +msgstr "" + +msgid "Error downloading map!" +msgstr "" + +#. Android resource: @strings/map_download_not_enough_free_space +msgid "Not enough free space" +msgstr "" + +msgid "Error writing map!" +msgstr "" + +msgid "Map download aborted!" +msgstr "" + +#. Android resource: @strings/map_download_eta +msgid "ETA" +msgstr "" + +#. Android resource: @strings/map_download_title +msgid "Map download" +msgstr "" + +msgid "Vehicle Position" +msgstr "" + +msgid "Main menu" +msgstr "" + +msgid "" +"Show\n" +"Map" +msgstr "" + +msgid "Settings" +msgstr "" + +msgid "Tools" +msgstr "" + +msgid "Route" +msgstr "" + +msgid "About" +msgstr "" + +msgid "Quit" +msgstr "" + +msgid "Actions" +msgstr "" + +msgid "" +"Former\n" +"Destinations" +msgstr "" + +msgid "Coordinates" +msgstr "" + +msgid "" +"Stop\n" +"Navigation" +msgstr "" + +msgid "Display" +msgstr "" + +msgid "Fullscreen" +msgstr "" + +msgid "Window Mode" +msgstr "" + +msgid "Description" +msgstr "" + +msgid "" +"Drop last \n" +"Waypoint" +msgstr "" + +msgid "" +"Drop next \n" +"Waypoint" +msgstr "" + +msgid "Satellite Status" +msgstr "" + +msgid "NMEA Data" +msgstr "" + +msgid "car_shortest" +msgstr "" + +msgid "car_avoid_tolls" +msgstr "" + +msgid "car_pedantic" +msgstr "" + +msgid "horse" +msgstr "" + +msgid "Truck" +msgstr "" + +#. Strings from android/res/values/strings.xml +#. Android resource: @strings/yes +msgid "Yes" +msgstr "" + +#. Android resource: @strings/notification_ticker +msgid "Navit started" +msgstr "" + +#. Android resource: @strings/notification_event_default +msgid "Navit running" +msgstr "" + +#. Android resource: @strings/initial_info_box_title +msgid "Welcome to Navit" +msgstr "" + +#. Android resource: @strings/initial_info_box_message +msgid "" +"Thank you for installing Navit!\n" +"\n" +"To start, select \"Download maps\" from the menu to download a map. Note: " +"The map filesize may be large (>50MB) - a wifi connection is recommended.\n" +"\n" +"Mapdata: (c) OpenStreetMap contributors\n" +"\n" +"Enjoy Navit!" +msgstr "" + +#. Android resource: @strings/initial_info_box_OK +msgid "OK" +msgstr "" + +#. Android resource: @strings/initial_info_box_more_info +msgid "More info" +msgstr "" + +#. Android resource: @strings/optionsmenu_zoom_in +msgid "Zoom in" +msgstr "" + +#. Android resource: @strings/optionsmenu_zoom_out +msgid "Zoom out" +msgstr "" + +#. Android resource: @strings/optionsmenu_download_maps +msgid "Download maps" +msgstr "" + +#. Android resource: @strings/optionsmenu_toggle_poi +msgid "Toggle POIs" +msgstr "" + +#. Android resource: @strings/optionsmenu_exit_navit +msgid "Exit Navit" +msgstr "" + +#. Android resource: @strings/optionsmenu_backup_restore +msgid "Backup / Restore" +msgstr "" + +#. Android resource: @strings/map_delete +msgid "Delete this map?" +msgstr "" + +#. Android resource: @strings/map_download_downloading +msgid "Downloading:" +msgstr "" + +#. Android resource: @strings/map_download_download_error +msgid "Error downloading map." +msgstr "" + +#. Android resource: @strings/map_download_download_aborted +msgid "Map download aborted" +msgstr "" + +#. Android resource: @strings/map_no_fix +msgid "No location. Reopen after location fix." +msgstr "" + +#. Android resource: @strings/maps_for_current_location +msgid "Maps containing current location" +msgstr "" + +#. Android resource: @strings/address_search_title +msgid "Address search" +msgstr "" + +#. Android resource: @strings/address_enter_destination +msgid "Enter destination" +msgstr "" + +#. Android resource: @strings/address_partial_match +msgid "Match partial address" +msgstr "" + +#. Android resource: @strings/address_search_searching +msgid "Searching..." +msgstr "" + +#. Android resource: @strings/address_search_not_found +msgid "Address not found" +msgstr "" + +#. Android resource: @strings/address_search_getting_results +msgid "Getting search results" +msgstr "" + +#. Android resource: @strings/address_search_loading_results +msgid "Loading search results" +msgstr "" + +#. Android resource: @strings/address_search_no_results +msgid "No results found" +msgstr "" + +#. Android resource: @strings/address_search_no_text_entered +msgid "No text entered" +msgstr "" + +#. Android resource: @strings/address_search_set_destination +msgid "Setting destination to:" +msgstr "" + +#. Android resource: @strings/choose_an_action +msgid "Choose an action" +msgstr "" + +#. Android resource: @strings/please_insert_an_sd_card +msgid "Please insert an SD Card" +msgstr "" + +#. Android resource: @strings/backing_up +msgid "Backing up..." +msgstr "" + +#. Android resource: @strings/restoring +msgid "Restoring..." +msgstr "" + +#. Android resource: @strings/failed_to_create_backup_directory +msgid "Failed to create backup directory" +msgstr "" + +#. Android resource: @strings/backup_failed +msgid "Backup failed" +msgstr "" + +#. Android resource: @strings/no_backup_found +msgid "No backup found" +msgstr "" + +#. Android resource: @strings/failed_to_restore +msgid "Failed to restore" +msgstr "" + +#. Android resource: @strings/backup_successful +msgid "Backup successful" +msgstr "" + +#. Android resource: @strings/restore_successful_please_restart_navit +msgid "" +"Restore Successful\n" +"Please restart Navit" +msgstr "" + +#. Android resource: @strings/backup_not_found +msgid "Backup not found" +msgstr "" + +#. Android resource: @strings/restore_failed +msgid "Restore failed" +msgstr "" + +#. Android resource: @strings/select_backup +msgid "Select backup" +msgstr "" + +#. Android resource: @strings/backup +msgid "Backup" +msgstr "" + +#. Android resource: @strings/restore +msgid "Restore" +msgstr "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-03-25 19:45:11
|
Revision: 6030 http://sourceforge.net/p/navit/code/6030 Author: kazer_ Date: 2015-03-25 19:45:01 +0000 (Wed, 25 Mar 2015) Log Message: ----------- Update:Translations:Updated Czech translation from launchpad Modified Paths: -------------- trunk/navit/po/cs.po.in Modified: trunk/navit/po/cs.po.in =================================================================== --- trunk/navit/po/cs.po.in 2015-03-25 19:26:21 UTC (rev 6029) +++ trunk/navit/po/cs.po.in 2015-03-25 19:45:01 UTC (rev 6030) @@ -19,8 +19,8 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2013-12-09 13:46+0000\n" -"Last-Translator: MMlosh <Unknown>\n" +"PO-Revision-Date: 2015-03-15 14:56+0000\n" +"Last-Translator: Jakuje <ja...@gm...>\n" "Language-Team: Čeština\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1351,7 +1351,7 @@ #, c-format msgid "Error: No configuration found in config file '%s'\n" -msgstr "" +msgstr "Chyba: Nenalezena žádná konfigurace v konfiguračním souboru '%s'\n" msgid "" "Internal initialization failed, exiting. Check previous error messages.\n" @@ -1477,7 +1477,7 @@ msgstr "" msgid "Opens POI search dialog" -msgstr "" +msgstr "Otevře dialog vyhledávání POI" msgid "_Stop Navigation" msgstr "Přestat navigovat" @@ -1522,49 +1522,49 @@ msgstr "Data" msgid "Pharmacy" -msgstr "" +msgstr "Lékárna" msgid "Restaurant" -msgstr "" +msgstr "Restaurace" msgid "Restaurant. Fast food" -msgstr "" +msgstr "Restaurace. Rychlé občerstvení" msgid "Hotel" -msgstr "" +msgstr "Hotel" msgid "Car parking" -msgstr "" +msgstr "Parkoviště" msgid "Fuel station" -msgstr "" +msgstr "Čerpací stanice" msgid "Bank" -msgstr "" +msgstr "Banka" msgid "Hospital" -msgstr "" +msgstr "Nemocnice" msgid "Cinema" -msgstr "" +msgstr "Kino" msgid "Train station" -msgstr "" +msgstr "Vlaková stanice" msgid "School" -msgstr "" +msgstr "Škola" msgid "Police" -msgstr "" +msgstr "Policie" msgid "Justice" msgstr "" msgid "Taxi" -msgstr "" +msgstr "Taxi" msgid "Shopping" -msgstr "" +msgstr "Nakupování" msgid "Distance from screen center (km)" msgstr "" @@ -1575,45 +1575,45 @@ #, c-format msgid "Set destination to %ld, %ld \n" -msgstr "" +msgstr "Nastav cíl na %ld, %ld \n" #, c-format msgid "Set map to %ld, %ld \n" -msgstr "" +msgstr "Posuň mapu na %ld, %ld \n" #, c-format msgid "Set next visit to %ld, %ld \n" -msgstr "" +msgstr "Nastav další zastavení na %ld, %ld \n" msgid "POI search" -msgstr "" +msgstr "Vyhledávání POI" msgid "Select a category" -msgstr "" +msgstr "Vyberte kategorii" msgid "Select a distance to look for (km)" -msgstr "" +msgstr "Vyberte vzdálenost ve které hledat (km)" msgid "Select a POI" -msgstr "" +msgstr "Vyberte POI" msgid " " -msgstr "" +msgstr " " msgid "Category" -msgstr "" +msgstr "Kategorie" msgid "Direction" -msgstr "" +msgstr "Směr" msgid "Distance(m)" -msgstr "" +msgstr "Vzdálenost (m)" msgid "Name" -msgstr "" +msgstr "Název" msgid "Visit Before" -msgstr "" +msgstr "Navštívit před" msgid "N" msgstr "S" @@ -1832,7 +1832,7 @@ #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" -msgstr "" +msgstr "Zeměpisná délka a šířka" msgid "Enter coordinates, for example:" msgstr "Zadejte souřadnice, například:" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-03-25 19:26:32
|
Revision: 6029 http://sourceforge.net/p/navit/code/6029 Author: kazer_ Date: 2015-03-25 19:26:21 +0000 (Wed, 25 Mar 2015) Log Message: ----------- Add:Translations:Added Malayalam, 72nd translation! Added Paths: ----------- trunk/navit/po/ml.po.in Added: trunk/navit/po/ml.po.in =================================================================== --- trunk/navit/po/ml.po.in (rev 0) +++ trunk/navit/po/ml.po.in 2015-03-25 19:26:21 UTC (rev 6029) @@ -0,0 +1,2600 @@ +# Malayalam translation for navit +# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015 +# This file is distributed under the same license as the navit package. +# Sunyl K https://launchpad.net/~sunilk +# Faju https://launchpad.net/~gotoarunk + +msgid "" +msgstr "" +"Project-Id-Version: navit 0.5.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-11-14 23:10-0800\n" +"PO-Revision-Date: 2015-03-18 13:32+0000\n" +"Last-Translator: Sunil K <Unknown>\n" +"Language-Team: Malayalam <ml...@li...>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" + +msgid "Running from source directory\n" +msgstr "സോര്സ് ഡൈരക്ടറിയില് നിന്നും പ്രവര്ത്തിക്കുന്നു\n" + +#, c-format +msgid "setting '%s' to '%s'\n" +msgstr "'%s'-നെ '%s' ആയി ക്രമീകരിച്ചിരിക്കുന്നു\n" + +#. TRANSLATORS: the following counts refer to streets +msgid "zeroth" +msgstr "പൂജ്യം" + +msgid "first" +msgstr "ഒന്നാമത്തേ" + +msgid "second" +msgstr "രണ്ടാമത്തെ" + +msgid "third" +msgstr "മൂന്നാമത്തെ" + +msgid "fourth" +msgstr "നാലാമത്തെ" + +msgid "fifth" +msgstr "അഞ്ചാമത്തെ" + +msgid "sixth" +msgstr "ആറാമത്തെ" + +#. TRANSLATORS: the following counts refer to roundabout exits +msgid "zeroth exit" +msgstr "പൂജ്യം വഴി" + +msgid "first exit" +msgstr "ഒന്നാമത്തേ വഴി" + +msgid "second exit" +msgstr "രണ്ടാമത്തേ വഴി" + +msgid "third exit" +msgstr "മൂന്നാമത്തെ വഴി" + +msgid "fourth exit" +msgstr "നാലമത്തേ വഴി" + +msgid "fifth exit" +msgstr "അഞ്ചാമത്തെ വഴി" + +msgid "sixth exit" +msgstr "ആറാമത്തെ വഴി" + +#, c-format +msgid "%d m" +msgstr "%d മീറ്റര്" + +#, c-format +msgid "in %d m" +msgstr "%d മീറ്ററില്" + +#, c-format +msgid "%d feet" +msgstr "%d അടി" + +#, c-format +msgid "in %d feet" +msgstr "%d അടിയില്" + +#, c-format +msgid "%d meters" +msgstr "%d മീറ്റര്" + +#, c-format +msgid "in %d meters" +msgstr "%d മീറ്ററില്" + +#, c-format +msgid "%d.%d miles" +msgstr "%d.%d മൈല്" + +#, c-format +msgid "in %d.%d miles" +msgstr "%d.%d മൈലില്" + +#, c-format +msgid "%d.%d kilometers" +msgstr "%d.%d കിലോമീറ്റര്" + +#, c-format +msgid "in %d.%d kilometers" +msgstr "%d.%d കിലോമീറ്ററില്" + +#, c-format +msgid "one mile" +msgid_plural "%d miles" +msgstr[0] "ഒരു മൈല്" +msgstr[1] "%d മൈല്" + +#, c-format +msgid "in one mile" +msgid_plural "in %d miles" +msgstr[0] "ഒരു മൈലില്" +msgstr[1] "%d മൈലില്" + +#, c-format +msgid "one kilometer" +msgid_plural "%d kilometers" +msgstr[0] "ഒരു കിലോമീറ്റര്" +msgstr[1] "%d കിലോമീറ്റര്" + +#, c-format +msgid "in one kilometer" +msgid_plural "in %d kilometers" +msgstr[0] "ഒരു കിലോമീറ്ററില്" +msgstr[1] "%d കിലോമീറ്ററില്" + +msgid "exit" +msgstr "പുറത്തേക്ക്" + +msgid "into the ramp" +msgstr "ചരുവിലേക്ക് പോവുക" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name +#, c-format +msgid "%sinto the street %s%s%s" +msgstr "%s തെരുവിലേക്ക് %s%s%s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto the %s%s%s|male form" +msgstr "%s കഴിഞ്ഞു %s %s %s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto the %s%s%s|female form" +msgstr "%sകഴിഞ്ഞു %s %s %s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto the %s%s%s|neutral form" +msgstr "%sകഴിഞ്ഞു %s %s %s" + +#. TRANSLATORS: gives the name of the next road to turn into (into the E17) +#, c-format +msgid "%sinto the %s" +msgstr "%s-ല് %s -ലേക്ക് തിരിയുക" + +#. TRANSLATORS: right, as in 'Turn right' +msgid "right" +msgstr "വലത്തോട്ട്" + +#. TRANSLATORS: left, as in 'Turn left' +msgid "left" +msgstr "ഇടത്തോട്ട്" + +#. TRANSLATORS: Don't forget the ending space +msgid "easily " +msgstr "ചെറുതായ് " + +#. TRANSLATORS: Don't forget the ending space +msgid "strongly " +msgstr "നന്നായി " + +#. TRANSLATORS: Don't forget the ending space +msgid "really strongly " +msgstr "കടുത്തതായ് " + +#. TRANSLATORS: Don't forget the ending space +msgid "unknown " +msgstr "പേരില്ലാത്ത " + +msgid "When possible, please turn around" +msgstr "സാധിക്കുന്നിടത്ത് വച്ച്,തിരിച്ചു പോവുക" + +msgid "Enter the roundabout soon" +msgstr "റൗണ്ടാനയിലേക്ക് ഉടനെ കയറുക" + +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" +msgstr "%s റൗണ്ടാനയിലേക്ക് കേറുക" + +#, c-format +msgid "then leave the roundabout at the %s" +msgstr "%s- ല് റൗണ്ടാനയില് നിന്നും പുറത്തോട്ട് പോവുക" + +#, c-format +msgid "Leave the roundabout at the %s" +msgstr "%s-ലൂടെ റൗണ്ടാനയില് നിന്നും പുറത്തു പോവുകാ" + +#, c-format +msgid "Follow the road for the next %s" +msgstr "ഈ വഴിയിലുടെ അടുത്ത %s പോവുക" + +msgid "soon" +msgstr "അല്പസമയത്തിനുള്ളില്" + +#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "%2$s %1$s-മത്തെ പാത എടുക്കുക" + +#, c-format +msgid "after %i roads" +msgstr "%i വഴികൾക്കു ശേഷം" + +msgid "now" +msgstr "ഇപ്പോള്" + +#, c-format +msgid "then take the %1$s road to the %2$s" +msgstr "അതിനു ശേഷം %2$s ഉള്ള %1$s വഴിയെ പോവുക" + +msgid "error" +msgstr "പിശക്" + +#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "%4$s ലേക്ക് %3$s %2$s %1$s തിരിയുക" + +#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#, c-format +msgid "then turn %1$s%2$s %3$s%4$s" +msgstr "അതിനു ശേഷം %4$s ലേക്ക് %3$s ശേഷം %2$s %1$s തിരിയുക" + +#, c-format +msgid "You have reached your destination %s" +msgstr "നിങ്ങള് %s ലക്ഷ്യത്തിലെത്തിയിരിക്കുന്നു" + +msgid "then you have reached your destination." +msgstr "അപ്പോള് നിങ്ങള് ലക്ഷ്യത്തിലെത്തും" + +#. Android resource: @strings/position_popup_title +msgid "Position" +msgstr "സ്ഥാനം" + +msgid "Command" +msgstr "നിര്ദ്ദേശം" + +msgid "Length" +msgstr "ദൂരം" + +msgid "km" +msgstr "കിലോമീറ്റെര്" + +msgid "m" +msgstr "മീറ്റര്" + +msgid "Time" +msgstr "സമയം" + +msgid "Destination Length" +msgstr "ലക്ഷ്യത്തിലേക്കുള്ള ദൂരം" + +msgid "Destination Time" +msgstr "ലക്ഷ്യത്തിലേക്കുള്ള സമയം" + +msgid "Roadbook" +msgstr "ഭൂപട പുസ്തകം" + +#, c-format +msgid "Waypoint %d" +msgstr "%d വഴിത്തിരിവ്" + +msgid "Visit before..." +msgstr "മുന്പെ സന്ദര്ശിക്കുക ..." + +msgid "Set as position" +msgstr "സ്ഥാനമായി നിശ്ചയിക്കുക" + +msgid "Set as destination" +msgstr "ഉദ്ദിഷ്ടസ്ഥാനമായി ഉറപ്പിക്കുക" + +msgid "Add as bookmark" +msgstr "ബുക്ക്മാര്ക് ചെയ്യുക" + +#, c-format +msgid "Point 0x%x 0x%x" +msgstr "സ്ഥാനം 0x%x 0x%x" + +#, c-format +msgid "Screen coord : %d %d" +msgstr "സ്ക്രീന് സ്ഥാനം %d %d" + +#. 020 +msgid "Andorra" +msgstr "അന്ഡോറാ" + +#. 784 +msgid "United Arab Emirates" +msgstr "യുണൈറ്റഡ് അറബ് എമിറേറ്റ്സ്" + +#. 004 +msgid "Afghanistan" +msgstr "അഫ്ഗാനിസ്ഥാന്" + +#. 028 +msgid "Antigua and Barbuda" +msgstr "ആന്റിഗ്വാ ബാര്ബുഡ" + +#. 660 +msgid "Anguilla" +msgstr "ആന്ഗ്വില" + +#. 008 +msgid "Albania" +msgstr "അല്ബേനിയ" + +#. 051 +msgid "Armenia" +msgstr "അര്മേനിയ" + +#. 530 +msgid "Netherlands Antilles" +msgstr "നെതര്ലന്ഡ്സ് ആന്റിലസ്" + +#. 024 +msgid "Angola" +msgstr "അംഗോളാ" + +#. 010 +msgid "Antarctica" +msgstr "അന്റാര്ട്ടിക്ക" + +#. 032 +msgid "Argentina" +msgstr "അര്ജന്റീന" + +#. 016 +msgid "American Samoa" +msgstr "അമേരിക്കന് സമോവ" + +#. 040 +msgid "Austria" +msgstr "ഓസ്ട്രിയാ" + +#. 036 +msgid "Australia" +msgstr "ഓസ്ട്രേലിയ" + +#. 533 +msgid "Aruba" +msgstr "അറൂബ" + +#. 248 +msgid "Aland Islands" +msgstr "ആലന്ഡ് ദീപുകള്" + +#. 031 +msgid "Azerbaijan" +msgstr "അസര്ബൈജാന്" + +#. 070 +msgid "Bosnia and Herzegovina" +msgstr "ബോസ്നിയ-ഹെര്സെഗോവിന" + +#. 052 +msgid "Barbados" +msgstr "ബാര്ബഡോസ്" + +#. 050 +msgid "Bangladesh" +msgstr "ബംഗ്ലാദേശ്" + +#. 056 +msgid "Belgium" +msgstr "ബെൽജിയം" + +#. 854 +msgid "Burkina Faso" +msgstr "ബർക്കിനാ ഫാസോ" + +#. 100 +msgid "Bulgaria" +msgstr "ബള്ഗേറിയ" + +#. 048 +msgid "Bahrain" +msgstr "ബഹറിന്" + +#. 108 +msgid "Burundi" +msgstr "ബറുണ്ടി" + +#. 204 +msgid "Benin" +msgstr "ബെനിന്" + +#. 652 +msgid "Saint Barthelemy" +msgstr "സെന്റ് ബര്തെലെമി" + +#. 060 +msgid "Bermuda" +msgstr "ബെർമുഡ" + +#. 096 +msgid "Brunei Darussalam" +msgstr "ബ്രൂണെയ് ദാറുസ്സലാം" + +#. 068 +msgid "Bolivia" +msgstr "ബൊളീവിയ" + +#. 535 +msgid "Bonaire, Sint Eustatius and Saba" +msgstr "ബോനെയര്, സെന്റ് എഷ്ടാത്യൂസ് സാബ" + +#. 076 +msgid "Brazil" +msgstr "ബ്രസീൽ" + +#. 044 +msgid "Bahamas" +msgstr "ബഹാമാസ്" + +#. 064 +msgid "Bhutan" +msgstr "ഭൂട്ടാന്" + +#. 074 +msgid "Bouvet Island" +msgstr "ബൌവെ ദ്വീപുകള്" + +#. 072 +msgid "Botswana" +msgstr "ബോട്സ്വാന" + +#. 112 +msgid "Belarus" +msgstr "ബെലാറസ്" + +#. 084 +msgid "Belize" +msgstr "ബെലീസ്" + +#. 124 +msgid "Canada" +msgstr "കാനഡ" + +#. 166 +msgid "Cocos (Keeling) Islands" +msgstr "കോക്കോസ് (കീലിങ്) ദ്വീപുകള്" + +#. 180 +msgid "Congo, Democratic Republic of the" +msgstr "കോങ്കോ ( ഡിമോക്രാറ്റിക്ക് റിപബ്ലിക്ക് )" + +#. 140 +msgid "Central African Republic" +msgstr "മദ്ധ്യ ആഫ്രിക്കൻ റിപ്പബ്ലിക്ക്" + +#. 178 +msgid "Congo" +msgstr "കോംഗോ" + +#. 756 +msgid "Switzerland" +msgstr "സ്വിറ്റ്സര്ലാന്ഡ്" + +#. 384 +msgid "Cote d'Ivoire" +msgstr "കോട്ടേ ഡെല്വോയിര്" + +#. 184 +msgid "Cook Islands" +msgstr "കുക്ക് ദ്വീപുകള്" + +#. 152 +msgid "Chile" +msgstr "ചിലി" + +#. 120 +msgid "Cameroon" +msgstr "കാമറൂൺ" + +#. 156 +msgid "China" +msgstr "ചൈന" + +#. 170 +msgid "Colombia" +msgstr "കൊളംബിയ" + +#. 188 +msgid "Costa Rica" +msgstr "കോസ്റ്റ റീക്ക" + +#. 192 +msgid "Cuba" +msgstr "ക്യൂബ" + +#. 132 +msgid "Cape Verde" +msgstr "കേപ് വെര്ഡെ" + +#. 531 +msgid "Curacao" +msgstr "കുറക്കാവൊ" + +#. 162 +msgid "Christmas Island" +msgstr "ക്രിസ്തുമസ് ദ്വീപ്" + +#. 196 +msgid "Cyprus" +msgstr "സൈപ്രസ്സ്" + +#. 203 +msgid "Czech Republic" +msgstr "ചെക്ക് റിപ്പബ്ലിക്ക്" + +#. 276 +msgid "Germany" +msgstr "ജര്മനി" + +#. 262 +msgid "Djibouti" +msgstr "ജിബൂട്ടി" + +#. 208 +msgid "Denmark" +msgstr "ഡെന്മാർക്ക്" + +#. 212 +msgid "Dominica" +msgstr "ഡൊമിനിക്ക" + +#. 214 +msgid "Dominican Republic" +msgstr "ഡൊമിനിക്കന് റിപബ്ലിക്ക്" + +#. 012 +msgid "Algeria" +msgstr "അള്ജീരിയ" + +#. 218 +msgid "Ecuador" +msgstr "ഇക്വഡോര്" + +#. 233 +msgid "Estonia" +msgstr "എസ്റ്റോണിയ" + +#. 818 +msgid "Egypt" +msgstr "ഈജിപ്ത്" + +#. 732 +msgid "Western Sahara" +msgstr "പശ്ചിമ സഹാറ" + +#. 232 +msgid "Eritrea" +msgstr "എറിട്രിയ" + +#. 724 +msgid "Spain" +msgstr "സ്പെയിന്" + +#. 231 +msgid "Ethiopia" +msgstr "എത്യോപ്യ" + +#. 246 +msgid "Finland" +msgstr "ഫിന്ലാന്റ്" + +#. 242 +msgid "Fiji" +msgstr "ഫിജി" + +#. 238 +msgid "Falkland Islands (Malvinas)" +msgstr "ഫാക്ലാന്ഡ് ദ്വീപുകള് (മാള്വിനാസ്)" + +#. 583 +msgid "Micronesia, Federated States of" +msgstr "മൈക്രോനേഷ്യ" + +#. 234 +msgid "Faroe Islands" +msgstr "ഫാറോ ദ്വീപുകള്" + +#. 250 +msgid "France" +msgstr "ഫ്രാന്സ്" + +#. 266 +msgid "Gabon" +msgstr "ഗാബോണ്" + +#. 826 +msgid "United Kingdom" +msgstr "യുണൈറ്റഡ് കിങ്ഡം" + +#. 308 +msgid "Grenada" +msgstr "ഗ്രനഡ" + +#. 268 +msgid "Georgia" +msgstr "ജോര്ജിയ" + +#. 254 +msgid "French Guiana" +msgstr "ഫ്രഞ്ച് ഗയാന" + +#. 831 +msgid "Guernsey" +msgstr "ജേണ്സി" + +#. 288 +msgid "Ghana" +msgstr "ഘാന" + +#. 292 +msgid "Gibraltar" +msgstr "ജിബ്രാള്ട്ടര്" + +#. 304 +msgid "Greenland" +msgstr "ഗ്രീന്ലാന്ഡ്" + +#. 270 +msgid "Gambia" +msgstr "ഗാംബിയ" + +#. 324 +msgid "Guinea" +msgstr "ഗിനിയ" + +#. 312 +msgid "Guadeloupe" +msgstr "ഗ്വാഡെലോപ്" + +#. 226 +msgid "Equatorial Guinea" +msgstr "ഇക്വറ്റോറിയല് ഗിനിയ" + +#. 300 +msgid "Greece" +msgstr "ഗ്രീസ്" + +#. 239 +msgid "South Georgia and the South Sandwich Islands" +msgstr "തെക്കന് ജോര്ജിയ തെക്കന് സാന്ഡ്വിച്ച് ദ്വീപുകള്" + +#. 320 +msgid "Guatemala" +msgstr "ഗ്വാട്ടിമാല" + +#. 316 +msgid "Guam" +msgstr "ഗുവാം" + +#. 624 +msgid "Guinea-Bissau" +msgstr "ഗിനിയ-ബിസ്സാവു" + +#. 328 +msgid "Guyana" +msgstr "ഗയാന" + +#. 344 +msgid "Hong Kong" +msgstr "ഹോങ്കോങ്" + +#. 334 +msgid "Heard Island and McDonald Islands" +msgstr "ഹെര്ഡ് ദ്വീപും മക്ഡൊണാള്ഡ് ദ്വീപുകളും" + +#. 340 +msgid "Honduras" +msgstr "ഹോണ്ടുറാസ്" + +#. 191 +msgid "Croatia" +msgstr "ക്രോയേഷ്യ" + +#. 332 +msgid "Haiti" +msgstr "ഹെയ്തി" + +#. 348 +msgid "Hungary" +msgstr "ഹംഗറി" + +#. 360 +msgid "Indonesia" +msgstr "ഇന്തോനേഷ്യ" + +#. 372 +msgid "Ireland" +msgstr "അയർലണ്ട്" + +#. 376 +msgid "Israel" +msgstr "ഇസ്രയേൽ" + +#. 833 +msgid "Isle of Man" +msgstr "ഐല് ഓഫ് മാന്" + +#. 356 +msgid "India" +msgstr "ഇന്ത്യ" + +#. 086 +msgid "British Indian Ocean Territory" +msgstr "ബ്രിട്ടീഷ് ഇന്ത്യന് ഓഷ്യന് ടെറിട്ടറി" + +#. 368 +msgid "Iraq" +msgstr "ഇറാഖ്" + +#. 364 +msgid "Iran, Islamic Republic of" +msgstr "ഇറാന്, ഇസ്ലാമിക് റിപ്പബ്ലിക് ഓഫ്" + +#. 352 +msgid "Iceland" +msgstr "ഐസ്ലാന്റ്" + +#. 380 +msgid "Italy" +msgstr "ഇറ്റലി" + +#. 832 +msgid "Jersey" +msgstr "ജേര്സി" + +#. 388 +msgid "Jamaica" +msgstr "ജമൈക്ക" + +#. 400 +msgid "Jordan" +msgstr "ജോര്ദാന്" + +#. 392 +msgid "Japan" +msgstr "ജപ്പാൻ" + +#. 404 +msgid "Kenya" +msgstr "കെനിയ" + +#. 417 +msgid "Kyrgyzstan" +msgstr "കിർഗ്ഗിസ്ഥാൻ" + +#. 116 +msgid "Cambodia" +msgstr "കമ്പോഡിയ" + +#. 296 +msgid "Kiribati" +msgstr "കിരിബാറ്റി" + +#. 174 +msgid "Comoros" +msgstr "കൊമോറോസ്" + +#. 659 +msgid "Saint Kitts and Nevis" +msgstr "സെയിന്റ് കിറ്റ്സും നെവിസും" + +#. 408 +msgid "Korea, Democratic People's Republic of" +msgstr "ഉത്തര കൊറിയ" + +#. 410 +msgid "Korea, Republic of" +msgstr "ദക്ഷിണ കൊറിയ" + +#. 414 +msgid "Kuwait" +msgstr "കുവൈറ്റ്" + +#. 136 +msgid "Cayman Islands" +msgstr "കേയ്മാന് ദ്വീപുകള്" + +#. 398 +msgid "Kazakhstan" +msgstr "കസാഖിസ്ഥാന്" + +#. 418 +msgid "Lao People's Democratic Republic" +msgstr "ലാവോസ്" + +#. 422 +msgid "Lebanon" +msgstr "ലെബനന്" + +#. 662 +msgid "Saint Lucia" +msgstr "സെയ്ന്റ് ലൂസിയ" + +#. 438 +msgid "Liechtenstein" +msgstr "ലീച്ചെന്സ്റ്റീന്" + +#. 144 +msgid "Sri Lanka" +msgstr "ശ്രീലങ്ക" + +#. 430 +msgid "Liberia" +msgstr "ലൈബീരിയ" + +#. 426 +msgid "Lesotho" +msgstr "ലെസോത്തോ" + +#. 440 +msgid "Lithuania" +msgstr "ലിത്വാനിയ" + +#. 442 +msgid "Luxembourg" +msgstr "ലക്സംബർഗ്" + +#. 428 +msgid "Latvia" +msgstr "ലാത്വിയ" + +#. 434 +msgid "Libya" +msgstr "ലിബിയ" + +#. 504 +msgid "Morocco" +msgstr "മൊറോക്കോ" + +#. 492 +msgid "Monaco" +msgstr "മൊണാക്കോ" + +#. 498 +msgid "Moldova, Republic of" +msgstr "മോള്ഡോവ" + +#. 499 +msgid "Montenegro" +msgstr "മോണ്ടിനെഗ്രോ" + +#. 663 +msgid "Saint Martin (French part)" +msgstr "സെയിന്റ് മാര്ട്ടിന് (ഫ്രഞ്ച് ഭാഗം)" + +#. 450 +msgid "Madagascar" +msgstr "മഡഗാസ്കര്" + +#. 584 +msgid "Marshall Islands" +msgstr "മാര്ഷല് ദ്വീപുകള്" + +#. 807 +msgid "Macedonia, the former Yugoslav Republic of" +msgstr "മാസിഡോണിയ (പഴയ യൂകൊസ്ളാവിയ)" + +#. 466 +msgid "Mali" +msgstr "മാലി" + +#. 104 +msgid "Myanmar" +msgstr "മ്യാന്മര്" + +#. 496 +msgid "Mongolia" +msgstr "മംഗോളിയ" + +#. 446 +msgid "Macao" +msgstr "മാക്കാവോ" + +#. 580 +msgid "Northern Mariana Islands" +msgstr "വടക്കന് മരിയാന ദ്വീപുകള്" + +#. 474 +msgid "Martinique" +msgstr "മാര്ട്ടിനിക്ക്" + +#. 478 +msgid "Mauritania" +msgstr "മൌറിറ്റാനിയ" + +#. 500 +msgid "Montserrat" +msgstr "മോണ്ട്സെറാറ്റ്" + +#. 470 +msgid "Malta" +msgstr "മാള്ട്ട" + +#. 480 +msgid "Mauritius" +msgstr "മൗറീഷ്യസ്" + +#. 462 +msgid "Maldives" +msgstr "മാലിദ്വീപ്" + +#. 454 +msgid "Malawi" +msgstr "മലാവി" + +#. 484 +msgid "Mexico" +msgstr "മെക്സിക്കോ" + +#. 458 +msgid "Malaysia" +msgstr "മലേഷ്യ" + +#. 508 +msgid "Mozambique" +msgstr "മൊസാംബിക്ക്" + +#. 516 +msgid "Namibia" +msgstr "നമീബിയ" + +#. 540 +msgid "New Caledonia" +msgstr "ന്യൂ കാലിഡോണിയാ" + +#. 562 +msgid "Niger" +msgstr "നൈജര്" + +#. 574 +msgid "Norfolk Island" +msgstr "നോര്ഫോക്ക് ദ്വീപു്" + +#. 566 +msgid "Nigeria" +msgstr "നൈജീരിയ" + +#. 558 +msgid "Nicaragua" +msgstr "നിക്കരാഗ്വ" + +#. 528 +msgid "Netherlands" +msgstr "നെതര്ലാന്റ്സ് ( ഹോളണ്ട് )" + +#. 578 +msgid "Norway" +msgstr "നോർവെ" + +#. 524 +msgid "Nepal" +msgstr "നേപ്പാള്" + +#. 520 +msgid "Nauru" +msgstr "നൌറു" + +#. 570 +msgid "Niue" +msgstr "നിയൂ" + +#. 554 +msgid "New Zealand" +msgstr "ന്യൂസീലൻഡ്" + +#. 512 +msgid "Oman" +msgstr "ഒമാന്" + +#. 591 +msgid "Panama" +msgstr "പനാമ" + +#. 604 +msgid "Peru" +msgstr "പെറു" + +#. 258 +msgid "French Polynesia" +msgstr "ഫ്രഞ്ച് പോളിനേഷ്യ" + +#. 598 +msgid "Papua New Guinea" +msgstr "പപുവ ന്യൂ ഗിനിയ" + +#. 608 +msgid "Philippines" +msgstr "ഫിലിപ്പീന്സ്" + +#. 586 +msgid "Pakistan" +msgstr "പാക്കിസ്ഥാന്" + +#. 616 +msgid "Poland" +msgstr "പോളണ്ട്" + +#. 666 +msgid "Saint Pierre and Miquelon" +msgstr "സെയിന്റ് പിയറി ആന്ഡ് മിക്വിലണ്" + +#. 612 +msgid "Pitcairn" +msgstr "പിറ്റ്കെയിന്" + +#. 630 +msgid "Puerto Rico" +msgstr "പ്യൂര്ട്ടോ റികോ" + +#. 275 +msgid "Palestinian Territory, Occupied" +msgstr "പാലസ്തീന്" + +#. 620 +msgid "Portugal" +msgstr "പോര്ച്ചുഗല്" + +#. 585 +msgid "Palau" +msgstr "പലാവു" + +#. 600 +msgid "Paraguay" +msgstr "പരാഗ്വെ" + +#. 634 +msgid "Qatar" +msgstr "ഖത്തര്" + +#. 638 +msgid "Reunion" +msgstr "റീയൂണിയന്" + +#. 642 +msgid "Romania" +msgstr "റൊമേനിയ" + +#. 688 +msgid "Serbia" +msgstr "സെർബിയ" + +#. 643 +msgid "Russian Federation" +msgstr "റഷ്യന് ഫെഡറേഷന്" + +#. 646 +msgid "Rwanda" +msgstr "റുവാണ്ട" + +#. 682 +msgid "Saudi Arabia" +msgstr "സൗദി അറേബ്യ" + +#. 090 +msgid "Solomon Islands" +msgstr "സോളമൻ ദ്വീപുകൾ" + +#. 690 +msgid "Seychelles" +msgstr "സെയ്ഷെൽസ്" + +#. 736 +msgid "Sudan" +msgstr "സുഡാൻ" + +#. 752 +msgid "Sweden" +msgstr "സ്വീഡൻ" + +#. 702 +msgid "Singapore" +msgstr "സിംഗപ്പൂർ" + +#. 654 +msgid "Saint Helena" +msgstr "സെയിന്റ് ഹെലേന" + +#. 705 +msgid "Slovenia" +msgstr "സ്ലോവേനിയ" + +#. 744 +msgid "Svalbard and Jan Mayen" +msgstr "സ്വാല്ബാര്ഡും ജാന് മായെനും" + +#. 703 +msgid "Slovakia" +msgstr "സ്ലോവാക്ക്യ" + +#. 694 +msgid "Sierra Leone" +msgstr "സിയറ ലിയോണ്" + +#. 674 +msgid "San Marino" +msgstr "സാന് മരീനൊ" + +#. 686 +msgid "Senegal" +msgstr "സെനഗല്" + +#. 706 +msgid "Somalia" +msgstr "സോമാലിയ" + +#. 740 +msgid "Suriname" +msgstr "സുരിനാം" + +#. 728 +msgid "South Sudan" +msgstr "തെക്കന് സുഡാന്" + +#. 678 +msgid "Sao Tome and Principe" +msgstr "സാവോ ടോമും പ്രിന്സിപ്പിയും" + +#. 222 +msgid "El Salvador" +msgstr "എൽ സാൽവദോർ" + +#. 534 +msgid "Sint Maarten (Dutch part)" +msgstr "സെന്റ് മാര്ട്ടിന് (ഡച്ച്)" + +#. 760 +msgid "Syrian Arab Republic" +msgstr "സിറിയന് അറബ് റിപ്പബ്ലിക്" + +#. 748 +msgid "Swaziland" +msgstr "സ്വാസിലാന്റ്" + +#. 796 +msgid "Turks and Caicos Islands" +msgstr "ടർക്സ്-കൈകോസ് ദ്വീപുകൾ" + +#. 148 +msgid "Chad" +msgstr "ഛാഡ്" + +#. 260 +msgid "French Southern Territories" +msgstr "ഫ്രഞ്ച് തെക്കന് പ്രദേശങ്ങള്" + +#. 768 +msgid "Togo" +msgstr "ടോഗോ" + +#. 764 +msgid "Thailand" +msgstr "തായ്ലാന്റ്" + +#. 762 +msgid "Tajikistan" +msgstr "താജിക്കിസ്ഥാന്" + +#. 772 +msgid "Tokelau" +msgstr "ടോക്ലവ്" + +#. 626 +msgid "Timor-Leste" +msgstr "ടിമോര്-ലെസ്ത്തേ" + +#. 795 +msgid "Turkmenistan" +msgstr "തുര്ക്മേനിസ്ഥാന്" + +#. 788 +msgid "Tunisia" +msgstr "ടുണീഷ്യ" + +#. 776 +msgid "Tonga" +msgstr "ടോംഗ" + +#. 792 +msgid "Turkey" +msgstr "തുർക്കി" + +#. 780 +msgid "Trinidad and Tobago" +msgstr "ട്രിനിഡാഡും ടൊബാഗോയും" + +#. 798 +msgid "Tuvalu" +msgstr "ടുവാലു" + +#. 158 +msgid "Taiwan, Province of China" +msgstr "തായ്വാന്" + +#. 834 +msgid "Tanzania, United Republic of" +msgstr "ടാന്സാനിയ" + +#. 804 +msgid "Ukraine" +msgstr "യുക്രെയിൻ" + +#. 800 +msgid "Uganda" +msgstr "ഉഗാണ്ട" + +#. 581 +msgid "United States Minor Outlying Islands" +msgstr "യുണൈറ്റഡ് സ്റ്റേറ്റ്സിലെ പുറത്തു് കിടക്കുന്ന ചെറിയ ദ്വീപുകള്" + +#. 840 +msgid "United States" +msgstr "ആമേരിക്കന് ഐക്യനാടുകള്" + +#. 858 +msgid "Uruguay" +msgstr "ഉറുഗ്വേ" + +#. 860 +msgid "Uzbekistan" +msgstr "ഉസ്ബെക്കിസ്ഥാൻ" + +#. 336 +msgid "Holy See (Vatican City State)" +msgstr "വത്തിക്കാന്" + +#. 670 +msgid "Saint Vincent and the Grenadines" +msgstr "സെയിന്റ് വിന്സന്റും ഗ്രനഡൈന്സും" + +#. 862 +msgid "Venezuela" +msgstr "വെനിസ്വേല" + +#. 092 +msgid "Virgin Islands, British" +msgstr "ബ്രിട്ടീഷ് വിര്ജിന് ദ്വീപുകള്" + +#. 850 +msgid "Virgin Islands, U.S." +msgstr "യു.എസ്. വിര്ജിന് ദ്വീപുകള്" + +#. 704 +msgid "Viet Nam" +msgstr "വിയറ്റ്നാം" + +#. 548 +msgid "Vanuatu" +msgstr "വാന്വാട്ടു" + +#. 876 +msgid "Wallis and Futuna" +msgstr "വോളിസ് ആന്റ് ഫുട്ടാന" + +#. 882 +msgid "Samoa" +msgstr "സമോവ" + +#. 887 +msgid "Yemen" +msgstr "യെമൻ" + +#. 175 +msgid "Mayotte" +msgstr "മയോട്ടെ" + +#. 710 +msgid "South Africa" +msgstr "ദക്ഷിണാഫ്രിക്ക" + +#. 894 +msgid "Zambia" +msgstr "സാംബിയ" + +#. 716 +msgid "Zimbabwe" +msgstr "സിംബാബ്വെ" + +msgid "* Unknown, add is_in tags to those cities" +msgstr "* അറിയില്ല, ദയവായി is_in ടാഗ് സിറ്റികളില് ചേര്ക്കുക" + +msgid "" +"navit usage:\n" +"navit [options] [configfile]\n" +"\t-c <file>: use <file> as config file\n" +"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting " +"from config file.\n" +"\t-h: print this usage info and exit.\n" +"\t-v: Print the version and exit.\n" +msgstr "" +"നാവിറ്റ് ഉപയോഗിക്കുന്ന വിധം\n" +"നാവിറ്റ് [ഓപ്ഷന്] കോണ്ഫിഗ് ഫയല്\n" +"\t-c <file>: use <file> as config file\n" +"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting " +"from config file.\n" +"\t-h: print this usage info and exit.\n" +"\t-v: Print the version and exit.\n" + +#. We have not found an existing config file from all possibilities +msgid "No config file navit.xml, navit.xml.local found\n" +msgstr "കോണ്ഫിഗറേഷന് ഫയലുകള് (navit.xml, navit.xml.local) കാണുന്നില്ല\n" + +#, c-format +msgid "Error parsing config file '%s': %s\n" +msgstr "'%s': %s കോണ്ഫിഗറേഷന് ഫയല് വായിക്കത്തില്ല \\n\n" + +#, c-format +msgid "Using config file '%s'\n" +msgstr "%s കോണ്ഫിഗറേഷന് ഫയല് ഉപയോഗിക്കുന്നു.\n" + +#, c-format +msgid "Error: No configuration found in config file '%s'\n" +msgstr "'%s' കോണ്ഫിഗറേഷന് ഫയലില് വിവരങ്ങള് ലഭ്യമല്ല\n" + +msgid "" +"Internal initialization failed, exiting. Check previous error messages.\n" +msgstr "" +"പിഴവ് സംഭവിച്ചു. നിര്ത്തുന്നു. ദയവായ് മുന് സന്ദേശങ്ങള് പരിശോധിക്കുക\n" + +msgid "unknown street" +msgstr "പേരില്ലാത്ത തെരുവ്" + +#. Safe cast: attr_generic_set_attr does not modify its parameter. +msgid "Unnamed vehicle" +msgstr "പേരില്ലാത്ത വാഹനം" + +msgid "Failed to write bookmarks file" +msgstr "ബൂക്ക്മാര്ക്ക് എഴുതാന് പറ്റുന്നില്ലാ" + +#. Strings from navit_shipped.xml +msgid "Map Point" +msgstr "ഭൂപടസ്ഥാനം" + +msgid "Car" +msgstr "കാര്" + +msgid "Iso2" +msgstr "ഐ എസ് ഓ 2 (ISO2)" + +msgid "Iso3" +msgstr "ഐ. എസ്. ഒ 3" + +msgid "Country" +msgstr "രാജ്യം" + +msgid "Postal" +msgstr "തപാല്" + +msgid "Town" +msgstr "പട്ടണം" + +msgid "District" +msgstr "ജില്ല" + +msgid "Street" +msgstr "തെരുവ്" + +msgid "Number" +msgstr "അക്കം" + +msgid "Enter Destination" +msgstr "ഉദ്ദിഷ്ടസ്ഥാനം ചേര്ക്കുക" + +msgid "Zip Code" +msgstr "പിന് കോഡ്" + +msgid "City" +msgstr "നഗരം" + +msgid "District/Township" +msgstr "ജില്ല/ടൗണ്ഷിപ്പ്" + +msgid "Map" +msgstr "മാപ്പ്" + +msgid "Bookmark" +msgstr "സൂചിതസ്ഥാനം(bookmark)" + +msgid "Destination" +msgstr "ലക്ഷ്യസ്ഥാനം" + +#. TRANSLATORS: These texts are for menu items in GTK GUI. The _ indicates the mnemonic key (=underlined character) for this menu item. Please place the _ before a suitable character in the translation (or omit it if no mnemonic key is desired). +msgid "_Display" +msgstr "പ്രദര്ശനം" + +msgid "_Route" +msgstr "വഴി" + +msgid "_Former Destinations" +msgstr "മുന് ഉദ്ദിഷ്ട സ്ഥാനങ്ങള്" + +msgid "_Bookmarks" +msgstr "_ഓര്മ്മക്കുറിപ്പുകള്" + +msgid "_Map" +msgstr "_ഭൂപടം" + +msgid "_Layout" +msgstr "_ക്രമീകരണം" + +msgid "_Projection" +msgstr "_പ്രൊജക്ഷന്" + +msgid "_Vehicle" +msgstr "_വാഹനം" + +msgid "Zoom_Out" +msgstr "ചെറുതാക്കുക" + +msgid "Decrease zoom level" +msgstr "ചെറുതാക്കുക" + +msgid "Zoom_In" +msgstr "വലുതാക്കുക" + +msgid "Increase zoom level" +msgstr "വലുതാക്കുക" + +msgid "_Recalculate" +msgstr "_വീണ്ടും കണക്കാക്കുക" + +msgid "Redraw map" +msgstr "മാപ് വീണ്ടും വരക്കുക" + +msgid "_Info" +msgstr "വിവരം (_I)" + +msgid "Set _destination" +msgstr "ലക്ഷ്യസ്ഥാനം ഉറപ്പിക്കുക" + +msgid "Opens address search dialog" +msgstr "മേല്വിലാസം തിരയാന് തുറക്കുക" + +msgid "_POI search" +msgstr "_സ്ഥലങ്ങള് തിരയുക" + +msgid "Opens POI search dialog" +msgstr "സ്ഥലങ്ങള് തിരയാനുള്ള താള് തുറക്കുക" + +msgid "_Stop Navigation" +msgstr "_വഴികാട്ടി നിറുത്തുക" + +msgid "Test" +msgstr "പരീക്ഷണം" + +msgid "_Quit" +msgstr "പുറത്ത് കടക്കുക" + +msgid "Quit the application" +msgstr "നാവിറ്റില് നിന്ന് പുറത്ത് പോവുക" + +msgid "Show position _cursor" +msgstr "സ്ഥാനം കാണിക്കുക" + +msgid "_Lock on Road" +msgstr "വീഥിയില് നിറുത്തുക" + +msgid "_Keep orientation to the North" +msgstr "വടക്കോട്ട് ദര്ശനം" + +msgid "Switches map orientation to the north or the vehicle" +msgstr "വടക്കോട്ട് ദര്ശനം/സഞ്ചാര ദിശ" + +msgid "_Roadbook" +msgstr "_ഭൂപടപുസ്തകം" + +msgid "Show/hide route description" +msgstr "വഴി വിവരണം കാണിക്കുക/മറക്കുക" + +msgid "_Autozoom" +msgstr "ശരിയായ വലിപ്പം തന്നത്താന് കണക്കാക്കുക" + +msgid "Enable/disable automatic zoom level changing" +msgstr "തന്നത്താന് വലിപ്പം അനുവദിക്കുക/നിരസിക്കുക" + +msgid "_Fullscreen" +msgstr "സ്ക്രീന് പൂര്ണ്ണ വലിപ്പത്തില് (_F)" + +msgid "Data" +msgstr "വിവരങ്ങള്" + +msgid "Pharmacy" +msgstr "മരുന്നു കട" + +msgid "Restaurant" +msgstr "ഹോട്ടല്" + +msgid "Restaurant. Fast food" +msgstr "തട്ടുകട" + +msgid "Hotel" +msgstr "ഹോട്ടല്" + +msgid "Car parking" +msgstr "കാര് പാര്ക്കിങ്ങ്" + +msgid "Fuel station" +msgstr "പെട്രോള് പമ്പ്" + +msgid "Bank" +msgstr "ബാങ്ക്" + +msgid "Hospital" +msgstr "ആശുപത്രി" + +msgid "Cinema" +msgstr "സിനിമ തിയറ്റര്" + +msgid "Train station" +msgstr "റയില്വെ സ്ടേഷന്" + +msgid "School" +msgstr "സ്കൂള്" + +msgid "Police" +msgstr "പോലീസ് സ്ടേഷന്" + +msgid "Justice" +msgstr "കോടതി" + +msgid "Taxi" +msgstr "ടാക്സി സ്റ്റാന്റ്" + +msgid "Shopping" +msgstr "കച്ചവടസ്ഥാപനം" + +msgid "Distance from screen center (km)" +msgstr "സ്ക്രീനിന്റെ നടുവില് നിന്നുള്ള ദൂരം (കി. മി. )" + +#, c-format +msgid "POI %s. %s" +msgstr "പി. ഓ. ഐ (ഇഷ്ടപെട്ട സ്ഥലങ്ങള്) %s. %s" + +#, c-format +msgid "Set destination to %ld, %ld \n" +msgstr "%ld, %ld ലക്ഷ്യസ്ഥാനമാക്കുക \n" + +#, c-format +msgid "Set map to %ld, %ld \n" +msgstr "%ld, %ld -നെ മാപ്പില് ക്രമീകരിക്കുക \n" + +#, c-format +msgid "Set next visit to %ld, %ld \n" +msgstr "%ld, %ld നെ അടുത്ത ലക്ഷ്യമാക്കുക \n" + +msgid "POI search" +msgstr "സ്ഥലങ്ങള് (POI) തിരയുക" + +msgid "Select a category" +msgstr "ഒരു വിഭാഗം തെരഞ്ഞെടുക്കുക" + +msgid "Select a distance to look for (km)" +msgstr "ഇത്ര ദൂരത്തിനുള്ളില് തെരയുക" + +msgid "Select a POI" +msgstr "സ്ഥലങ്ങള് (POI) തിരഞ്ഞെടുക്കുക" + +msgid " " +msgstr " " + +msgid "Category" +msgstr "വിഭാഗങ്ങള്" + +msgid "Direction" +msgstr "ദിശ" + +msgid "Distance(m)" +msgstr "ദൂരം" + +msgid "Name" +msgstr "പേരു്" + +msgid "Visit Before" +msgstr "ഉദ്ദിഷ്ടസ്ഥാനത്തിന് മുന്പ് സന്ദര്ശിക്കുക" + +msgid "N" +msgstr "വടക്ക് (N)" + +msgid "NE" +msgstr "വടക്കുകിഴക്കു്" + +msgid "E" +msgstr "കിഴക്ക് (E)" + +msgid "SE" +msgstr "തെക്കുകിഴക്കു്" + +msgid "S" +msgstr "തെക്ക് (S)" + +msgid "SW" +msgstr "തെക്കുപടിഞ്ഞാറു്" + +msgid "W" +msgstr "പടിഞ്ഞാറ് (W)" + +msgid "NW" +msgstr "വടക്കുപടിഞ്ഞാറു്" + +#. Android resource: @strings/no +msgid "No" +msgstr "വേണ്ട" + +msgid "2D" +msgstr "ദ്വിമാനം" + +msgid "3D" +msgstr "ത്രിമാനം" + +msgid "OT" +msgstr "ഓ റ്റി" + +#, c-format +msgid "Route %4.0fkm %02d:%02d ETA" +msgstr "%4.0f കി.മി ദൂരം %02d:%02d സമയത്ത് എത്തും" + +msgid "Route 0000km 0+00:00 ETA" +msgstr "0000km ദൂരം 0+00:00 സമയത്ത് എത്തും" + +msgid "Help" +msgstr "സഹായം" + +#, c-format +msgid "Waypoint %s" +msgstr "%s വഴിത്തിരിവ്" + +msgid "Select waypoint to insert the new one before" +msgstr "പുതിയവഴിതിരിവിന്റെ സ്ഥാനം (മുന്പില്)" + +msgid "View in Browser" +msgstr "ബ്രൌസരില് കാണുക" + +msgid "Item type" +msgstr "ഇന വിവരം" + +#. Android resource: @strings/address_search_streets +msgid "Streets" +msgstr "തെരുവ്" + +msgid "House numbers" +msgstr "വീട്ട് നമ്പര്" + +msgid "View Attributes" +msgstr "ആട്രിബ്യൂട്ടുകള്" + +msgid "Set as position (and deactivate vehicle)" +msgstr "സ്ഥാനമായ് ക്രമീകരിക്കുക (വാഹനം നിര്ജീവമാക്കുക)" + +msgid "POIs" +msgstr "സ്ഥലങ്ങള് (POIs)" + +msgid "View on map" +msgstr "ഭൂപടത്തില് കാണുക" + +msgid "Remove search results from the map" +msgstr "ഭൂപടത്തില് നിന്നും തെരച്ചില് ഫലങ്ങള് കളയുക" + +msgid "Show results on the map" +msgstr "തിരച്ചില് ഫലങ്ങള് ഭൂപടത്തില് കാണിക്കുക" + +msgid "Cut Bookmark" +msgstr "ബുക്ക്മാര്ക്ക് കട്ട് ചെയ്യുക" + +msgid "Copy Bookmark" +msgstr "ബുക്ക്മാര്ക്ക് കട്ട് ചെയ്യുക" + +msgid "Rename Bookmark" +msgstr "അടയാളക്കുറിപ്പിന്റെ പേരു് മാറ്റുക" + +msgid "Paste Bookmark" +msgstr "ബുക്ക്മാര്ക്ക് പേസ്റ്റ് ചെയ്യുക" + +msgid "Delete Bookmark" +msgstr "അടയാളക്കുറിപ്പ് നീക്കം ചെയ്യുക" + +msgid "Delete waypoint" +msgstr "വഴിത്തിരിവ് കളയുക" + +msgid "Bookmarks" +msgstr "അടയാളക്കുറിപ്പുകള്" + +msgid "Bookmarks as waypoints" +msgstr "വഴിതിരിവായി ബുക്ക്മാര്ക്ക് ചെയ്യുക" + +msgid "Save waypoints" +msgstr "വഴിതിരിവ് സൂക്ഷിച്ചു വക്കുക" + +msgid "Replace with waypoints" +msgstr "വഴിത്തിരിവുപയോഗിച്ച് മാറ്റുക" + +msgid "Delete Folder" +msgstr "ഫോള്ഡര് വെട്ടി മാറ്റുക" + +#. Adds the Bookmark folders +msgid "Add Bookmark folder" +msgstr "ബുക്ക്മാര്ക്ക് ഫോള്ഡര് ചേര്ക്കുക" + +#. Pastes the Bookmark +msgid "Paste bookmark" +msgstr "ബുക്ക്മാര്ക്ക് പേസ്റ്റ് ചെയ്യുക" + +#, c-format +msgid "Bookmark %s" +msgstr "അടയാളക്കുറിപ്പുകള് %s" + +#, c-format +msgid "Download %s" +msgstr "%s ഡൗണ്ലോഡ് ചെയ്യുക" + +msgid "Map Download" +msgstr "ഭൂപടം ഡൗണ്ലോഡ് ചെയ്യുക" + +msgid "Active" +msgstr "സജ്ജമാണ്" + +msgid "Download Enabled" +msgstr "ഡൗണ്ലോഡ് അനുവദിച്ചിരിക്കുന്നു" + +msgid "Download completely" +msgstr "മുഴുവന് ഡൗണ്ലോഡ് ചെയ്യുക" + +msgid "Show Satellite Status" +msgstr "ഉപഗ്രഹ നിലവാരം കാണിക്കുക" + +msgid " Elevation " +msgstr " ഉയരം " + +msgid " Azimuth " +msgstr " ഉയരം " + +msgid "Show NMEA Data" +msgstr "NMEA വിവരം കാണുക" + +msgid "car" +msgstr "കാര്" + +msgid "bike" +msgstr "ബൈക്ക്" + +msgid "pedestrian" +msgstr "കാല്നടയാത്രക്കാരന്" + +#, c-format +msgid "Current profile: %s" +msgstr "നിലവിലെ പ്രോഫൈല് : %s" + +#, c-format +msgid "Change profile to: %s" +msgstr "%s ലേക്ക് പ്രൊഫൈല് മാറ്റുക" + +msgid "Set as active" +msgstr "സജീവമാക്കുക" + +msgid "Show Satellite status" +msgstr "ഉപഗ്രഹ നിലവാരം കാണിക്കുക" + +msgid "Show NMEA data" +msgstr "എന്. എം. ഇ. ഏ (NMEA) വിവരങ്ങള്" + +msgid "Add Bookmark" +msgstr "അടയാളക്കുറിപ്പു് ചേര്ക്കുക" + +msgid "Rename" +msgstr "പേരു് മാറ്റുക" + +msgid "About Navit" +msgstr "നാവിറ്റിനെ കുറിച്ച്" + +#. Authors +msgid "By" +msgstr "എഴുത്തുകാര്" + +#. Contributors +msgid "And all the Navit Team" +msgstr "നാവിറ്റിന്റെ ടീം" + +msgid "members and contributors." +msgstr "അംഗങ്ങള്, സഹകാരികാള്" + +msgid "Waypoints" +msgstr "വഴിത്തിരിവുകള്" + +msgid "Enter Coordinates" +msgstr "കോഓര്ഡിനേറ്റുകള് ചേര്ക്കുക" + +#. +#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) +#. gui_internal_widget_append(wb, w) +#. +#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) +#. gui_internal_widget_append(w, we) +msgid "Latitude Longitude" +msgstr "അക്ഷാംശം രേകാംശം" + +msgid "Enter coordinates, for example:" +msgstr "കോഓര്ഡിനേറ്റുകള് ചേര്ക്കുക, ഉദാഹരണം" + +msgid "Vehicle" +msgstr "വാഹനം" + +msgid "Rules" +msgstr "നിയമങ്ങള്" + +msgid "Lock on road" +msgstr "പാതയില് തന്നെ നിര്ത്തുക" + +msgid "Northing" +msgstr "വടക്കോട്ട് ദര്ശനം" + +msgid "Map follows Vehicle" +msgstr "വാഹനത്തോടൊപ്പം സഞ്ചരിക്കുക" + +msgid "Plan with Waypoints" +msgstr "വഴിത്തിരിവുകളോടെ പ്ളാന് ചെയ്യുക" + +msgid "Maps" +msgstr "ഭൂപടങ്ങള്" + +msgid "Layout" +msgstr "വിന്യാസം" + +msgid "Height Profile" +msgstr "ഉയര വിവരങ്ങള്" + +msgid "Route Description" +msgstr "പാത വിവരണം" + +msgid "Show Locale" +msgstr "ഭാഷ വിവരം" + +msgid "Former Destinations" +msgstr "മുന് ലക്ഷ്യസ്ഥാനങ്ങള്" + +msgid "- No former destinations available -" +msgstr "- മുന് ലക്ഷ്യസ്ഥാനങ്ങള് സജ്ജീകരിച്ചിട്ടില്ല -" + +msgid "Message" +msgstr "സന്ദേശം" + +msgid "Back" +msgstr "പിന്നോട്ട്" + +msgid "Back to map" +msgstr "ഭൂപടത്തിലോട്ട് തിരിച്ചു പോവുക" + +msgid "Main Menu" +msgstr "പ്രധാന പട്ടിക" + +msgid "House number" +msgstr "വീട്ടു നംബര്" + +msgid "Next" +msgstr "അടുത്തത്" + +msgid "Prev" +msgstr "പുറകോട്ട്" + +msgid "Return to route!" +msgstr "പാതയിലോട്ട് തിരിച്ചു പോവുക" + +#. warning told +msgid "Look out! Camera!" +msgstr "സ്പീഡ് ക്യാമറ : ശ്രദ്ധിക്കുക" + +#. warning told +msgid "Please decrease your speed" +msgstr "ദയവായി വേഗത കുറക്കുക" + +msgid "partial match" +msgstr "ഭാഗിക പൊരുത്തം" + +#. Android resource: @strings/address_search_button +msgid "Search" +msgstr "തിരയുക" + +#. Android resource: @strings/address_search_towns +msgid "Towns" +msgstr "പട്ടണങ്ങള്" + +#. Android resource: @strings/position_popup_drive_here +msgid "Route to here" +msgstr "ഇവിടെ വരെയുള്ള വഴി കാട്ടുക" + +msgid "Map data (c) OpenStreetMap contributors, ODBL" +msgstr "ഭൂപട വിവരങ്ങള് (3) ഓപ്പണ്സ്റ്റ്രീറ്റ് മാപ്" + +msgid "Downloaded maps" +msgstr "ഡൗണ്ലോഡ് ചെയ്ത ഭൂപടങ്ങള്" + +msgid "Cancel" +msgstr "റദ്ദാക്കുക" + +msgid "Whole Planet" +msgstr "ഭൂലോകം മുഴുവന്" + +msgid "Africa" +msgstr "ആഫ്രിക്ക" + +msgid "Canary Islands" +msgstr "കാനറി ഐലന്ഡുകള്" + +msgid "Asia" +msgstr "ഏഷ്യ" + +msgid "Korea" +msgstr "കൊറിയ" + +msgid "Taiwan" +msgstr "തായ്വാൻ" + +msgid "UAE+Other" +msgstr "യൂ ഏ ഈ" + +msgid "Oceania" +msgstr "ഓഷ്യാനിയ" + +msgid "Tasmania" +msgstr "ടാസ്മാനിയ" + +msgid "Victoria" +msgstr "വിക്ടോറിയ" + +msgid "New South Wales" +msgstr "ന്യൂ സൌത്ത് വേയില്സ്" + +msgid "Europe" +msgstr "യൂറോപ്പ്" + +msgid "Western Europe" +msgstr "പടിഞ്ഞാറന് യൂറോപ്പ്" + +msgid "Azores" +msgstr "ആസൊറെസ്" + +msgid "BeNeLux" +msgstr "ബെനെലക്സ്" + +msgid "Alsace" +msgstr "അല്സേസ്" + +msgid "Aquitaine" +msgstr "അക്വിറ്റയിന്" + +msgid "Auvergne" +msgstr "ഓവെര്ണെ" + +msgid "Basse-Normandie" +msgstr "ബസ്സെ-നോര്മന്ഡി" + +msgid "Bourgogne" +msgstr "ബുര്ഗോണേ" + +msgid "Bretagne" +msgstr "ബ്രെട്ടാനെ" + +msgid "Centre" +msgstr "നടുവില്" + +msgid "Champagne-Ardenne" +msgstr "ഷാംപേന്-ആര്ഡെന്നെ" + +msgid "Corse" +msgstr "കോര്സ്" + +msgid "Franche-Comte" +msgstr "ഫ്രെഞ്ചു - കോമ്തെ" + +msgid "Haute-Normandie" +msgstr "ഹോടെ- നോര്മന്ഡി" + +msgid "Ile-de-France" +msgstr "ഐല്-ഡെ-ഫ്രന്സ്" + +msgid "Languedoc-Roussillon" +msgstr "ലാങ്ങ്യുഡോക് - റോസ്സില്ലന്" + +msgid "Limousin" +msgstr "ലിമോസിന്" + +msgid "Lorraine" +msgstr "ലൊറൈന്" + +msgid "Midi-Pyrenees" +msgstr "മിഡി-പൈറെന്നീസ് - ഫ്രാന്സ്" + +msgid "Nord-pas-de-Calais" +msgstr "നോഡ്-പാസ്-ഡെ-കലായിസ്" + +msgid "Pays-de-la-Loire" +msgstr "പെയ്സ്-ഡെ-ല-ലോയ്ര്" + +msgid "Picardie" +msgstr "പിക്കാര്ഡീ" + +msgid "Poitou-Charentes" +msgstr "പോയിറ്റൂ-ചരന്റിസ്" + +msgid "Provence-Alpes-Cote-d-Azur" +msgstr "കോടെ-ഡെ-അസുര്" + +msgid "Rhone-Alpes" +msgstr "റോണെ - ആല്പ്സ് (ലിയോണ്) ഫ്രാന്സ്" + +msgid "Baden-Wuerttemberg" +msgstr "ബഡേന് - വറ്റന്ബര്ഗ് - ഫ്രാന്സ്" + +msgid "Bayern" +msgstr "ബയെണ്" + +msgid "Mittelfranken" +msgstr "മിറ്റല്ഫ്രാങ്കെന്" + +msgid "Niederbayern" +msgstr "നീഡെര്ബയേര്ണ്" + +msgid "Oberbayern" +msgstr "ഓബെര്ബയെണ്" + +msgid "Oberfranken" +msgstr "ഓബെര്ഫ്രാങ്കെന്" + +msgid "Oberpfalz" +msgstr "ഓബെര്ഫാല്സ്" + +msgid "Schwaben" +msgstr "ഷ്വബെന്" + +msgid "Unterfranken" +msgstr "അന്റെര്ഫ്രാങ്കെന്" + +msgid "Berlin" +msgstr "ബെര്ലിന്" + +msgid "Brandenburg" +msgstr "ബ്രാണ്ടന്ബര്ഗ്" + +msgid "Bremen" +msgstr "ബ്രെമെന്" + +msgid "Hamburg" +msgstr "ഹാംബര്ഗ്" + +msgid "Hessen" +msgstr "ഹെസ്സെന്" + +msgid "Mecklenburg-Vorpommern" +msgstr "മെകലന്ബര്ഗ്-വൊര്പോമ്മെന്" + +msgid "Niedersachsen" +msgstr "നീദെര്സാച്സെന്" + +msgid "Nordrhein-westfalen" +msgstr "നോര്ദീന്-വെസ്റ്റ്ഫാളന്" + +msgid "Rheinland-Pfalz" +msgstr "റീന്ലാന്റ് -ഫാല്സ്" + +msgid "Saarland" +msgstr "സാര്ലാന്റ്" + +msgid "Sachsen-Anhalt" +msgstr "സാച്സെന്-ആന്ഹാല്ട്" + +msgid "Sachsen" +msgstr "സാഷേന്" + +msgid "Schleswig-Holstein" +msgstr "ഷെല്സ്വിഗ്-ഹോള്സ്റ്റീന്" + +msgid "Thueringen" +msgstr "തുരിങ്ങ്ജെന്" + +msgid "Mallorca" +msgstr "മല്ലൊര്ക്കാ" + +msgid "Galicia" +msgstr "ഗലീസ്യ" + +msgid "Scandinavia" +msgstr "സ്കാന്ഡിനേവിയ" + +msgid "England" +msgstr "ഇംഗ്ലന്ഡ്" + +msgid "Buckinghamshire" +msgstr "ബക്കിങ്ഹാംഷയര്" + +msgid "Cambridgeshire" +msgstr "കേംബ്രിഡ്ജ്ഷയര്" + +msgid "Cumbria" +msgstr "കംബ്രീയ - ഇംഗ്ലണ്ട്" + +msgid "East yorkshire with hull" +msgstr "കിഴക്കന് യോര്ക്ക്ഷെയര്" + +msgid "Essex" +msgstr "എസ്സെക്സ്" + +msgid "Herefordshire" +msgstr "ഹെര്ഫോര്ഡ്ഷയര്" + +msgid "Kent" +msgstr "കെന്റ്" + +msgid "Lancashire" +msgstr "ലാങ്കാഷയര്" + +msgid "Leicestershire" +msgstr "ലീസസ്റ്റര്ഷയര്" + +msgid "Norfolk" +msgstr "നോര്ഫോക്ക്" + +msgid "Nottinghamshire" +msgstr "നോട്ടിങ്ഹാംഷയര്" + +msgid "Oxfordshire" +msgstr "ഓക്സ്ഫോര്ഡ്ഷയര്" + +msgid "Shropshire" +msgstr "ഷ്രോപ്പ്ഷയര്" + +msgid "Somerset" +msgstr "സോമര്സെറ്റ്" + +msgid "South yorkshire" +msgstr "തെക്കന് യോര്ക്ക്ഷെയര്" + +msgid "Suffolk" +msgstr "സഫോക്ക്" + +msgid "Surrey" +msgstr "സറ്റേ" + +msgid "Wiltshire" +msgstr "വില്റ്റ്ഷെയര്" + +msgid "Scotland" +msgstr "സ്കോട്ട്ലന്റ്" + +msgid "Wales" +msgstr "വെയില്സ്" + +msgid "Crete" +msgstr "ക്രീറ്റ്" + +msgid "North America" +msgstr "വടക്കേ അമേരിക്ക" + +msgid "Alaska" +msgstr "അലാസ്ക" + +msgid "Hawaii" +msgstr "ഹവായ്" + +msgid "USA" +msgstr "അമേരിക്കന് ഐക്യനാടുകള്" + +msgid " (except Alaska and Hawaii)" +msgstr " (ആലസ്കായും ഹവായിയും ഒഴുകെ" + +msgid "Midwest" +msgstr "മിഡ്-വെസ്ട് (അമേരിക്ക)" + +msgid "Michigan" +msgstr "മിഷിഗന്" + +msgid "Ohio" +msgstr "ഓഹായോ" + +msgid "Northeast" +msgstr "വടക്കുകിഴക്കു്" + +msgid "Massachusetts" +msgstr "മാസ്സാച്ചുസെറ്റ്സ്" + +msgid "Vermont" +msgstr "വെര്മോണ്ട്" + +msgid "Pacific" +msgstr "പസഫിക്" + +msgid "South" +msgstr "തെക്ക്" + +msgid "Arkansas" +msgstr "അര്ക്കന്സാസ്" + +msgid "District of Columbia" +msgstr "ഡിസ്ട്രിക്റ്റ് ഓഫ് കൊളംബിയ" + +msgid "Florida" +msgstr "ഫ്ലോറിഡ" + +msgid "Louisiana" +msgstr "ലൂസിയാനാ" + +msgid "Maryland" +msgstr "മേരീലാന്റ്" + +msgid "Mississippi" +msgstr "മിസ്സിസ്സിപ്പി" + +msgid "Oklahoma" +msgstr "ഓക്ക്ലഹാമ" + +msgid "Texas" +msgstr "ടെക്സാസ്" + +msgid "Virginia" +msgstr "വിര്ജീനിയ" + +msgid "West Virginia" +msgstr "വെസ്റ്റ് വിര്ജീനിയ" + +msgid "West" +msgstr "പടിഞ്ഞാറ്" + +msgid "Arizona" +msgstr "അരിസോണ" + +msgid "California" +msgstr "കാലിഫോര്ണിയ" + +msgid "Colorado" +msgstr "കൊളറാഡോ" + +msgid "Idaho" +msgstr "ഇഡാഹോ" + +msgid "Montana" +msgstr "മൊണ്ടാന" + +msgid "New Mexico" +msgstr "ന്യൂ മെക്സിക്കോ" + +msgid "Nevada" +msgstr "നെവാഡ" + +msgid "Oregon" +msgstr "ഒറിഗണ്" + +msgid "Utah" +msgstr "യൂട്ട" + +msgid "Washington State" +msgstr "വാഷിംഗ്ടണ്" + +msgid "South+Middle America" +msgstr "തെക്ക്-മധ്യ അമേരിക്ക" + +msgid "Guyane Francaise" +msgstr "ഫ്രെന്ജ് ഗയാന" + +msgid "downloading" +msgstr "ഡൌണ്ലോഡ് ചെയ്തുകൊണ്ടിരിക്കുന്നു" + +#. Android resource: @strings/map_download_ready +msgid "ready" +msgstr "തയ്യാര്" + +msgid "Error downloading map!" +msgstr "ഭൂപടം ഡൗണ്ലോഡ് ചെയ്തപ്പോള് തെറ്റിപ്പോയ് !" + +#. Android resource: @strings/map_download_not_enough_free_space +msgid "Not enough free space" +msgstr "ആവശ്യത്തിന് സ്ഥലമില്ലാ" + +msgid "Error writing map!" +msgstr "ഫയല് (ഭൂപടം) എഴുതാന് സ്ഥലമില്ലാ" + +msgid "Map download aborted!" +msgstr "ഭൂപടം ഡൗണ്ലോഡ് ചെയ്യുന്നത് നിറുത്തിയിരിക്കുന്നു" + +#. Android resource: @strings/map_download_eta +msgid "ETA" +msgstr "ഉദ്ദിഷ്ടസമയം" + +#. Android resource: @strings/map_download_title +msgid "Map download" +msgstr "ഭൂപടം ഡൗണ്ലോഡ് ചെയ്യുക" + +msgid "Vehicle Position" +msgstr "വാഹന സ്ഥാനം" + +msgid "Main menu" +msgstr "പ്രധാനവിവരപട്ടിക" + +msgid "" +"Show\n" +"Map" +msgstr "" +"ഭൂപടം\n" +"കാണിക്കുക" + +msgid "Settings" +msgstr "സജ്ജീകരണങ്ങള്" + +msgid "Tools" +msgstr "ഉപകരണങ്ങള്" + +msgid "Route" +msgstr "മാര്ഗം" + +msgid "About" +msgstr "വിവരണം" + +msgid "Quit" +msgstr "പുറത്ത് കടക്കുക" + +msgid "Actions" +msgstr "പ്രവര്ത്തികള്" + +msgid "" +"Former\n" +"Destinations" +msgstr "" +"മുന്\n" +"ലക്ഷ്യങ്ങള്" + +msgid "Coordinates" +msgstr "കോര്ഡിനേറ്റുകള്" + +msgid "" +"Stop\n" +"Navigation" +msgstr "" +"വഴികാട്ടി\n" +"നിര്ത്തുക" + +msgid "Display" +msgstr "പ്രദര്ശിപ്പിക്കുക" + +msgid "Fullscreen" +msgstr "മുഴുവന് തിരശ്ശീല" + +msgid "Window Mode" +msgstr "വിന്റൊ മോഡ്" + +msgid "Description" +msgstr "വിവരണം" + +msgid "" +"Drop last \n" +"Waypoint" +msgstr "" +"ആവസാന വഴിത്തിരിവു\n" +"എടുത്ത് കളയുക" + +msgid "" +"Drop next \n" +"Waypoint" +msgstr "" +"അടുത്ത വഴിത്തിരിവ്\n" +"എടുത്തു കളയുക" + +msgid "Satellite Status" +msgstr "ഉപഗ്രഹസ്ഥിതി" + +msgid "NMEA Data" +msgstr "എന്.എം.ഇ.എ വിവരങ്ങള്" + +msgid "car_shortest" +msgstr "കാര് - കുറഞ്ഞ ദൂരം" + +msgid "car_avoid_tolls" +msgstr "കാര് ടോള്-ഒഴിവാക്കുക" + +msgid "car_pedantic" +msgstr "കാര് (പെഡാന്റിക്ക് മോഡ്)" + +msgid "horse" +msgstr "കുതിര" + +msgid "Truck" +msgstr "ലോറി" + +#. Strings from android/res/values/strings.xml +#. Android resource: @strings/yes +msgid "Yes" +msgstr "ശരി" + +#. Android resource: @strings/notification_ticker +msgid "Navit started" +msgstr "നാവിറ്റ് പ്രവര്ത്തനം തുടങ്ങിയിരിക്കുന്നു" + +#. Android resource: @strings/notification_event_default +msgid "Navit running" +msgstr "നാവിറ്റ് ഓടിക്കൊണ്ടിരിക്കുന്നു" + +#. Android resource: @strings/initial_info_box_title +msgid "Welcome to Navit" +msgstr "നാവിറ്റിലേക്കു സ്വാഗതം" + +#. Android resource: @strings/initial_info_box_message +msgid "" +"Thank you for installing Navit!\n" +"\n" +"To start, select \"Download maps\" from the menu to download a map. Note: " +"The map filesize may be large (>50MB) - a wifi connection is recommended.\n" +"\n" +"Mapdata: (c) OpenStreetMap contributors\n" +"\n" +"Enjoy Navit!" +msgstr "" +"നാവിറ്റ് ഉപയോഗിക്കുന്നതിനു നന്നീ\n" +"\n" +"തുടങ്ങുവാന് നാവിറ്റ് മെനുവില് നിന്നും ഭൂപടം ഡൗണ്ലോഡ് ചെയ്യാനുള്ള ഓപ്ഷ്ന് " +"തെരഞ്ഞെടുക്കുക, (ഫയല് വളരെ വലുതായതിനാല് വൈഫൈ \n" +"\n" +"കണക്ഷന് ഉപയോഗിക്കുന്നത് ഉചിതമായിരിക്കും)\n" +"\n" +"മാപ് (c) ഓപണ്സ്റ്റ്രീറ്റ്മാപ് സഹകാരികള്.\n" +"\n" +"Enjoy Navit!" + +#. Android resource: @strings/initial_info_box_OK +msgid "OK" +msgstr "ശരി" + +#. Android resource: @strings/initial_info_box_more_info +msgid "More info" +msgstr "കൂടുതല് വിവരങ്ങള്" + +#. Android resource: @strings/optionsmenu_zoom_in +msgid "Zoom in" +msgstr "വലുതാക്കുക" + +#. Android resource: @strings/optionsmenu_zoom_out +msgid "Zoom out" +msgstr "ചെറുതാക്കുക" + +#. Android resource: @strings/optionsmenu_download_maps +msgid "Download maps" +msgstr "ഭൂപടങ്ങള് ഡൗണ്ലോഡ് ചെയ്യുക" + +#. Android resource: @strings/optionsmenu_toggle_poi +msgid "Toggle POIs" +msgstr "പ്രധാനസ്ഥലങ്ങള് കാണിക്കുക" + +#. Android resource: @strings/optionsmenu_exit_navit +msgid "Exit Navit" +msgstr "നാവിറ്റില് നിന്നും പുറത്ത് പോവുക" + +#. Android resource: @strings/optionsmenu_backup_restore +msgid "Backup / Restore" +msgstr "സൂക്ഷിക്കുക/പുനസ്ഥാപിക്കുക" + +#. Android resource: @strings/map_delete +msgid "Delete this map?" +msgstr "ഈ ഭൂപടം മായിച്ചു കളയുക" + +#. Android resource: @strings/map_download_downloading +msgid "Downloading:" +msgstr "ഡൗണ്ലോഡ് ചെയ്തു കൊണ്ടിരിക്കുന്നു" + +#. Android resource: @strings/map_download_download_error +msgid "Error downloading map." +msgstr "ഭൂപടം ഡൗണ്ലോഡ് ചെയ്യുന്നതില് പിഴവ് സംഭവിച്ചു" + +#. Android resource: @strings/map_download_download_aborted +msgid "Map download aborted" +msgstr "ഭൂപടം ഡൗണ്ലോഡ് ചെയ്യുന്നത് അവസാനിപ്പിചിരിക്കുന്നു" + +#. Android resource: @strings/map_no_fix +msgid "No location. Reopen after location fix." +msgstr "സ്ഥാനം അറിയില്ല. സ്ഥാനം ഉറപ്പിച ശേഷം വീണ്ടും വരുക" + +#. Android resource: @strings/maps_for_current_location +msgid "Maps containing current location" +msgstr "നിലവിലെ സ്ഥാനമുള്ള ഭൂപടം" + +#. Android resource: @strings/address_search_title +msgid "Address search" +msgstr "മേല്വിലാസം തെരയുക" + +#. Android resource: @strings/address_enter_destination +msgid "Enter destination" +msgstr "ഉദ്ദിഷ്ടസ്ഥാനം ചേര്ക്കുക" + +#. Android resource: @strings/address_partial_match +msgid "Match partial address" +msgstr "ഭാഗിക ചേര്ച്ചയുള്ള മേല്വിലാസം" + +#. Android resource: @strings/address_search_searching +msgid "Searching..." +msgstr "തെരഞ്ഞുകൊണ്ടിരിക്കുന്നു..." + +#. Android resource: @strings/address_search_not_found +msgid "Address not found" +msgstr "മേല്വിലാസം കണ്ടുപിടിക്കാനായില്ല" + +#. Android resource: @strings/address_search_getting_results +msgid "Getting search results" +msgstr "തെരഞ്ഞുകൊണ്ടിരിക്കുന്നു" + +#. Android resource: @strings/address_search_loading_results +msgid "Loading search results" +msgstr "തെരച്ചിലിന്റെ ഫലങ്ങള് അവതരിപ്പിക്കുന്നു" + +#. Android resource: @strings/address_search_no_results +msgid "No results found" +msgstr "ഫലമൊന്നും ലഭ്യമായില്ല" + +#. Android resource: @strings/address_search_no_text_entered +msgid "No text entered" +msgstr "വാക്കുകള് തന്നിട്ടില്ല" + +#. Android resource: @strings/address_search_set_destination +msgid "Setting destination to:" +msgstr "ഉദ്ദിഷ്ടസ്ഥാനം ഉരപ്പിച്ചിരിക്കുന്നു :" + +#. Android resource: @strings/choose_an_action +msgid "Choose an action" +msgstr "പ്രവര്ത്തികള് തെരഞ്ഞെടുക്കുക" + +#. Android resource: @strings/please_insert_an_sd_card +msgid "Please insert an SD Card" +msgstr "ഓരു എസ്. ഡി. (SD) കാര്ഡ് ഇടുക" + +#. Android resource: @strings/backing_up +msgid "Backing up..." +msgstr "ബാക്കപ്പ് കോപി എടുത്തുകൊണ്ടിരിക്കുന്നു" + +#. Android resource: @strings/restoring +msgid "Restoring..." +msgstr "പുനസ്ഥാപിച്ചു കൊണ്ടിരിക്കുന്നു" + +#. Android resource: @strings/failed_to_create_backup_directory +msgid "Failed to create backup directory" +msgstr "ബാക്കപ്പ് ഡൈറക്ടറി ഉണ്ടാക്കാന് സാധിക്കുന്നില്ല" + +#. Android resource: @strings/backup_failed +msgid "Backup failed" +msgstr "വിവരങ്ങള് ശരിയായി പകര്ത്താന് കഴിഞ്ഞില്ല" + +#. Android resource: @strings/no_backup_found +msgid "No backup found" +msgstr "പകര്പ്പൊന്നും കാണ്മാനില്ല" + +#. Android resource: @strings/failed_to_restore +msgid "Failed to restore" +msgstr "പുനസ്ഥാപനം പരാജയപ്പെട്ടു" + +#. Android resource: @strings/backup_successful +msgid "Backup successful" +msgstr "വിവരങ്ങള് സുരക്ഷിതമാക്കിയിരിക്കുന്നു" + +#. Android resource: @strings/restore_successful_please_restart_navit +msgid "" +"Restore Successful\n" +"Please restart Navit" +msgstr "പകര്പ്പ് വിജയകരമായി പുനസ്ഥാപിച്ചിരിക്കുന്നു" + +#. Android resource: @strings/backup_not_found +msgid "Backup not found" +msgstr "പകര്പ്പൊന്നും കാണ്മാനില്ല" + +#. Android resource: @strings/restore_failed +msgid "Restore failed" +msgstr "പുനസ്ഥാപനം പരാജയപ്പെട്ടിരിക്കുന്നു" + +#. Android resource: @strings/select_backup +msgid "Select backup" +msgstr "പകര്പ്പ് തെരഞ്ഞെടുക്കുക" + +#. Android resource: @strings/backup +msgid "Backup" +msgstr "പകര്പ്പ് സൂക്ഷിക്കുക" + +#. Android resource: @strings/restore +msgid "Restore" +msgstr "പുനഃസ്ഥാപിക്കുക" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ... [truncated message content] |
From: <md...@us...> - 2015-03-24 20:54:24
|
Revision: 6028 http://sourceforge.net/p/navit/code/6028 Author: mdankov Date: 2015-03-24 20:54:21 +0000 (Tue, 24 Mar 2015) Log Message: ----------- Fix:port_android:Ask user if they want to start voice data download dialog, if there's no voice data available. Modified Paths: -------------- trunk/navit/navit/android/res/values/strings.xml trunk/navit/navit/android/src/org/navitproject/navit/NavitSpeech2.java trunk/navit/po/ru.po.in Modified: trunk/navit/navit/android/res/values/strings.xml =================================================================== --- trunk/navit/navit/android/res/values/strings.xml 2015-03-24 08:33:08 UTC (rev 6027) +++ trunk/navit/navit/android/res/values/strings.xml 2015-03-24 20:54:21 UTC (rev 6028) @@ -71,5 +71,9 @@ <string name="select_backup">Select backup</string> <string name="backup">Backup</string> <string name="restore">Restore</string> + + <!-- TTS --> + <string name="TTS_title_data_missing">System text to speech engine data is missing</string> + <string name="TTS_qery_install_data">Navit can use any text to speech engine installed on your device. The currently selected engine reports it is unable to speak in your language. Should we ask the system to show voice download dialog?</string> </resources> Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitSpeech2.java =================================================================== --- trunk/navit/navit/android/src/org/navitproject/navit/NavitSpeech2.java 2015-03-24 08:33:08 UTC (rev 6027) +++ trunk/navit/navit/android/src/org/navitproject/navit/NavitSpeech2.java 2015-03-24 20:54:21 UTC (rev 6028) @@ -20,7 +20,10 @@ package org.navitproject.navit; import android.content.Intent; +import android.content.Context; +import android.content.DialogInterface; import android.content.pm.PackageManager; +import android.app.AlertDialog; import android.speech.tts.TextToSpeech; import android.util.Log; @@ -44,10 +47,20 @@ // success, create the TTS instance mTts = new TextToSpeech(navit, this); } else { - // missing data, install it - Intent installIntent = new Intent(); - installIntent.setAction(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA); - navit.startActivity(installIntent); + // missing data, ask to install it + AlertDialog.Builder builder = new AlertDialog.Builder(navit); + builder + .setTitle(R.string.TTS_title_data_missing) + .setMessage(R.string.TTS_qery_install_data) + .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + Intent installIntent = new Intent(); + installIntent.setAction(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA); + navit.startActivity(installIntent); + } + }) + .setNegativeButton(R.string.no, null) + .show(); } } } Modified: trunk/navit/po/ru.po.in =================================================================== --- trunk/navit/po/ru.po.in 2015-03-24 08:33:08 UTC (rev 6027) +++ trunk/navit/po/ru.po.in 2015-03-24 20:54:21 UTC (rev 6028) @@ -2629,3 +2629,20 @@ #. Android resource: @strings/restore msgid "Restore" msgstr "Восстановление из копии" + +#. Android resource: @strings/TTS_title_data_missing +msgid "System text to speech engine data is missing" +msgstr "Отсутствуют данные системного приложения преобразования текста в речь" + +#. Android resource: @strings/TTS_qery_install_data +msgid "" +"Navit can use any text to speech engine installed on your device. The " +"currently selected engine reports it is unable to speak in your language. " +"Should we ask the system to show voice download dialog?" +msgstr "" +"Navit может использовать любое приложение преобразования текста в " +"речь, установленное на Вашем устройстве. Активное сейчас приложение " +"сообщило о невозможности говорить на Вашем языке. Попросим систему " +"показать диалог загрузки голосовых данных?" + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2015-03-24 08:33:15
|
Revision: 6027 http://sourceforge.net/p/navit/code/6027 Author: martin-s Date: 2015-03-24 08:33:08 +0000 (Tue, 24 Mar 2015) Log Message: ----------- Fix:binding_dbus:Fix 64 bit issue with ints and booleans Modified Paths: -------------- trunk/navit/navit/binding/dbus/binding_dbus.c Modified: trunk/navit/navit/binding/dbus/binding_dbus.c =================================================================== --- trunk/navit/navit/binding/dbus/binding_dbus.c 2015-03-19 19:17:26 UTC (rev 6026) +++ trunk/navit/navit/binding/dbus/binding_dbus.c 2015-03-24 08:33:08 UTC (rev 6027) @@ -548,14 +548,18 @@ if (attr->type >= attr_type_int_begin && attr->type <= attr_type_boolean_begin) { if (dbus_message_iter_get_arg_type(&iterattr) == DBUS_TYPE_INT32) { - dbus_message_iter_get_basic(&iterattr, &attr->u.num); + int val; + dbus_message_iter_get_basic(&iterattr, &val); + attr->u.num=val; return 1; } return 0; } if(attr->type >= attr_type_boolean_begin && attr->type <= attr_type_int_end) { if (dbus_message_iter_get_arg_type(&iterattr) == DBUS_TYPE_BOOLEAN) { - dbus_message_iter_get_basic(&iterattr, &attr->u.num); + int val; + dbus_message_iter_get_basic(&iterattr, &val); + attr->u.num=val; return 1; } return 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <md...@us...> - 2015-03-19 19:17:28
|
Revision: 6026 http://sourceforge.net/p/navit/code/6026 Author: mdankov Date: 2015-03-19 19:17:26 +0000 (Thu, 19 Mar 2015) Log Message: ----------- Fix:maptool:Fix experimental map by moving coastline to order=9. See #845. Modified Paths: -------------- trunk/navit/navit/maptool/misc.c Modified: trunk/navit/navit/maptool/misc.c =================================================================== --- trunk/navit/navit/maptool/misc.c 2015-03-16 00:09:17 UTC (rev 6025) +++ trunk/navit/navit/maptool/misc.c 2015-03-19 19:17:26 UTC (rev 6026) @@ -183,10 +183,6 @@ case type_district_label_5e5: max=6; break; - case type_poly_water_tiled: - if(experimental) - max=6; - break; case type_town_label_2e5: case type_town_label_1e5: case type_district_label_2e5: @@ -205,6 +201,10 @@ case type_district_label_1e4: max=9; break; + case type_poly_water_tiled: + if(experimental) + max=9; + break; case type_street_4_land: case type_street_4_city: max=10; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sl...@us...> - 2015-03-16 00:09:25
|
Revision: 6025 http://sourceforge.net/p/navit/code/6025 Author: sleske Date: 2015-03-16 00:09:17 +0000 (Mon, 16 Mar 2015) Log Message: ----------- Add:core:Add some error messages for when connecting graphics to gui fails. Modified Paths: -------------- trunk/navit/navit/gui/internal/gui_internal.c trunk/navit/navit/gui.c Modified: trunk/navit/navit/gui/internal/gui_internal.c =================================================================== --- trunk/navit/navit/gui/internal/gui_internal.c 2015-03-09 00:34:36 UTC (rev 6024) +++ trunk/navit/navit/gui/internal/gui_internal.c 2015-03-16 00:09:17 UTC (rev 6025) @@ -2843,8 +2843,10 @@ struct transformation *trans=navit_get_trans(this->nav); win=graphics_get_data(gra, "window"); - if (! win) + if (! win) { + dbg(lvl_error, "failed to obtain window from graphics plugin, cannot set graphics\n"); return 1; + } navit_ignore_graphics_events(this->nav, 1); this->gra=gra; this->win=win; Modified: trunk/navit/navit/gui.c =================================================================== --- trunk/navit/navit/gui.c 2015-03-09 00:34:36 UTC (rev 6024) +++ trunk/navit/navit/gui.c 2015-03-16 00:09:17 UTC (rev 6025) @@ -157,8 +157,10 @@ int gui_set_graphics(struct gui *this_, struct graphics *gra) { - if (! this_->meth.set_graphics) + if (! this_->meth.set_graphics) { + dbg(lvl_error, "cannot set graphics, method 'set_graphics' not available\n"); return 1; + } return this_->meth.set_graphics(this_->priv, gra); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-03-09 00:34:38
|
Revision: 6024 http://sourceforge.net/p/navit/code/6024 Author: kazer_ Date: 2015-03-09 00:34:36 +0000 (Mon, 09 Mar 2015) Log Message: ----------- Add:binding_dbus:Added a command to dump the route as GeoJSON and another one to do a graceful quit Modified Paths: -------------- trunk/navit/navit/binding/dbus/binding_dbus.c Modified: trunk/navit/navit/binding/dbus/binding_dbus.c =================================================================== --- trunk/navit/navit/binding/dbus/binding_dbus.c 2015-03-08 22:53:58 UTC (rev 6023) +++ trunk/navit/navit/binding/dbus/binding_dbus.c 2015-03-09 00:34:36 UTC (rev 6024) @@ -51,8 +51,8 @@ #include "roadprofile.h" #include "util.h" #include "transform.h" +#include "event.h" - static DBusConnection *connection; static dbus_uint32_t dbus_serial; @@ -1287,7 +1287,32 @@ return empty_reply(connection, message); } +/** + * @brief Gracefully exit Navit by registering a one-second callback to allow clean shutdown of the dbus connection + * @param connection The DBusConnection object through which \a message arrived + * @param message The DBusMessage + * @returns An empty reply if everything went right, otherwise DBUS_HANDLER_RESULT_NOT_YET_HANDLED + */ static DBusHandlerResult +request_navit_quit(DBusConnection *connection, DBusMessage *message) +{ + dbg(lvl_debug,"Got a quit request from DBUS\n"); + struct attr navit; + navit.type=attr_navit; + struct navit *nav; + nav = object_get_from_message(message, "navit"); + if (! nav) + return dbus_error_invalid_object_path(connection, message); + navit.u.navit=nav; + config_remove_attr(config, &navit); + + struct callback *callback; + callback=callback_new_1(callback_cast(event_main_loop_quit), NULL); + event_add_timeout(1000, 1, callback); + return empty_reply(connection, message); +} + +static DBusHandlerResult request_navit_zoom(DBusConnection *connection, DBusMessage *message) { int factor; @@ -1321,6 +1346,12 @@ } +/** + * @brief Exports the current route as a GPX file + * @param connection The DBusConnection object through which a message arrived + * @param message The DBusMessage including the 'filename' parameter + * @returns An empty reply if everything went right, otherwise DBUS_HANDLER_RESULT_NOT_YET_HANDLED + */ static DBusHandlerResult request_navit_route_export_gpx(DBusConnection *connection, DBusMessage *message) { @@ -1381,7 +1412,99 @@ return empty_reply(connection, message); } +/** + * @brief Exports the current route as a GeoJSON file + * @param connection The DBusConnection object through which a message arrived + * @param message The DBusMessage including the 'filename' parameter + * @returns An empty reply if everything went right, otherwise DBUS_HANDLER_RESULT_NOT_YET_HANDLED + */ static DBusHandlerResult +request_navit_route_export_geojson(DBusConnection *connection, DBusMessage *message) +{ + char * filename; + struct point p, *pp=NULL; + struct navit *navit; + DBusMessageIter iter; + + navit = object_get_from_message(message, "navit"); + if (! navit) + return dbus_error_invalid_object_path(connection, message); + + dbus_message_iter_init(message, &iter); + + dbus_message_iter_get_basic(&iter, &filename); + + if (dbus_message_iter_has_next(&iter)) + { + dbus_message_iter_next(&iter); + if (!point_get_from_message(message, &iter, &p)) + return dbus_error_invalid_parameter(connection, message); + pp=&p; + } + + dbg(lvl_debug,"Dumping route from dbus to %s\n", filename); + + struct map * map=NULL; + struct navigation * nav = NULL; + struct map_rect * mr=NULL; + struct item *item = NULL; + struct attr attr,route; + struct coord c; + struct coord_geo g; + struct transformation *trans; + + char *header = "{\n" +" \"type\": \"FeatureCollection\",\n" +" \"features\": [\n" +" {\n" +" \"type\": \"Feature\",\n" +" \"properties\": {\n" +" \"name\": \"Navit route export\",\n" +" \"stroke\": \"red\",\n" +" \"stroke-width\": \"5px\"\n" +" },\n" +" \"geometry\": {\n" +" \"type\": \"LineString\",\n" +" \"coordinates\": [\n"; + + nav = navit_get_navigation(navit); + if(!nav) { + return; + } + map = navigation_get_map(nav); + if(map) + mr = map_rect_new(map,NULL); + trans = navit_get_trans (nav); + + FILE *fp; + fp = fopen(filename,"w"); + fprintf(fp, "%s", header); + int is_first=1; + char * instructions; + instructions=g_strdup_printf(""); + while((item = map_rect_get_item(mr))) { + if(item_attr_get(item,attr_navigation_long,&attr)) { + item_coord_get(item, &c, 1); + transform_to_geo (projection_mg, &c, &g); + if(!is_first){ + fprintf(fp,",\n"); + instructions=g_strconcat_printf(instructions,",\n"); + } + fprintf(fp,"[ %4.16f, %4.16f ]",g.lng, g.lat); + instructions=g_strconcat_printf(instructions, g_strdup_printf(" { \"type\": \"Feature\", \"properties\": { \"Instruction\": \"%s\", \"name\": \"\" }, \"geometry\": { \"type\": \"Point\", \"coordinates\": [ %4.16f, %4.16f ] } }", map_convert_string_tmp(item->map,attr.u.str), g.lng, g.lat)); + /* fprintf(fp,"<rtept lon='%4.16f' lat='%4.16f'><type>%s</type><name>%s</name></rtept>\n",g.lng, g.lat, item_to_name(item->type), map_convert_string_tmp(item->map,attr.u.str)); */ + is_first=0; + } + } + + fprintf(fp," ]}\n },\n%s ]\n }\n",instructions); + + fclose(fp); + + return empty_reply(connection, message); +} + +static DBusHandlerResult request_navit_block(DBusConnection *connection, DBusMessage *message) { int mode; @@ -1822,7 +1945,9 @@ {".navit", "set_layout", "s", "layoutname", "", "", request_navit_set_layout}, {".navit", "zoom", "i(ii)", "factor(pixel_x,pixel_y)", "", "", request_navit_zoom}, {".navit", "zoom", "i", "factor", "", "", request_navit_zoom}, + {".navit", "quit", "", "", "", "", request_navit_quit}, {".navit", "export_as_gpx", "s", "filename", "", "", request_navit_route_export_gpx}, + {".navit", "export_as_geojson", "s", "filename", "", "", request_navit_route_export_geojson}, {".navit", "block", "i", "mode", "", "", request_navit_block}, {".navit", "resize", "ii", "upperleft,lowerright", "", "", request_navit_resize}, {".navit", "attr_iter", "", "", "o", "attr_iter", request_navit_attr_iter}, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sl...@us...> - 2015-03-08 22:54:01
|
Revision: 6023 http://sourceforge.net/p/navit/code/6023 Author: sleske Date: 2015-03-08 22:53:58 +0000 (Sun, 08 Mar 2015) Log Message: ----------- Refactor:core:Remove unused graphics method graphics_gc_set_stipple. Modified Paths: -------------- trunk/navit/navit/graphics/cocoa/graphics_cocoa.m trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c trunk/navit/navit/graphics/win32/graphics_win32.c trunk/navit/navit/graphics.c trunk/navit/navit/graphics.h trunk/navit/navit/plugin/pedestrian/pedestrian.c Modified: trunk/navit/navit/graphics/cocoa/graphics_cocoa.m =================================================================== --- trunk/navit/navit/graphics/cocoa/graphics_cocoa.m 2015-03-07 13:18:56 UTC (rev 6022) +++ trunk/navit/navit/graphics/cocoa/graphics_cocoa.m 2015-03-08 22:53:58 UTC (rev 6023) @@ -532,18 +532,12 @@ { } -static void -gc_set_stipple(struct graphics_gc_priv *gc, struct graphics_image_priv *img) -{ -} - static struct graphics_gc_methods gc_methods = { gc_destroy, gc_set_linewidth, gc_set_dashes, gc_set_foreground, gc_set_background, - gc_set_stipple, }; static struct graphics_gc_priv *gc_new(struct graphics_priv *gr, struct graphics_gc_methods *meth) Modified: trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c =================================================================== --- trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2015-03-07 13:18:56 UTC (rev 6022) +++ trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2015-03-08 22:53:58 UTC (rev 6023) @@ -175,22 +175,12 @@ gc_set_color(gc, c, 0); } -static void -gc_set_stipple(struct graphics_gc_priv *gc, struct graphics_image_priv *img) -{ - char data[2]={0x2,0x1}; - gdk_gc_set_fill(gc->gc, GDK_STIPPLED); - gc->pixmap=gdk_bitmap_create_from_data(gc->gr->widget->window, data, 2, 2); - gdk_gc_set_stipple(gc->gc, gc->pixmap); -} - static struct graphics_gc_methods gc_methods = { gc_destroy, gc_set_linewidth, gc_set_dashes, gc_set_foreground, gc_set_background, - gc_set_stipple, }; static struct graphics_gc_priv *gc_new(struct graphics_priv *gr, struct graphics_gc_methods *meth) Modified: trunk/navit/navit/graphics/win32/graphics_win32.c =================================================================== --- trunk/navit/navit/graphics/win32/graphics_win32.c 2015-03-07 13:18:56 UTC (rev 6022) +++ trunk/navit/navit/graphics/win32/graphics_win32.c 2015-03-08 22:53:58 UTC (rev 6023) @@ -822,7 +822,6 @@ gc_set_dashes, gc_set_foreground, gc_set_background, - NULL, //gc_set_stipple }; static struct graphics_gc_priv *gc_new(struct graphics_priv *gr, struct graphics_gc_methods *meth) Modified: trunk/navit/navit/graphics.c =================================================================== --- trunk/navit/navit/graphics.c 2015-03-07 13:18:56 UTC (rev 6022) +++ trunk/navit/navit/graphics.c 2015-03-08 22:53:58 UTC (rev 6023) @@ -568,18 +568,6 @@ * @returns <> * @author Martin Schaller (04/2008) */ -void graphics_gc_set_stipple(struct graphics_gc *gc, struct graphics_image *img) -{ - gc->meth.gc_set_stipple(gc->priv, img ? img->priv : NULL); -} - - -/** - * FIXME - * @param <> - * @returns <> - * @author Martin Schaller (04/2008) -*/ void graphics_gc_set_linewidth(struct graphics_gc *gc, int width) { gc->meth.gc_set_linewidth(gc->priv, width); Modified: trunk/navit/navit/graphics.h =================================================================== --- trunk/navit/navit/graphics.h 2015-03-07 13:18:56 UTC (rev 6022) +++ trunk/navit/navit/graphics.h 2015-03-08 22:53:58 UTC (rev 6023) @@ -99,7 +99,6 @@ void (*gc_set_dashes)(struct graphics_gc_priv *gc, int width, int offset, unsigned char dash_list[], int n); void (*gc_set_foreground)(struct graphics_gc_priv *gc, struct color *c); void (*gc_set_background)(struct graphics_gc_priv *gc, struct color *c); - void (*gc_set_stipple)(struct graphics_gc_priv *gc, struct graphics_image_priv *img); }; struct graphics_gc { @@ -166,7 +165,6 @@ void graphics_gc_destroy(struct graphics_gc *gc); void graphics_gc_set_foreground(struct graphics_gc *gc, struct color *c); void graphics_gc_set_background(struct graphics_gc *gc, struct color *c); -void graphics_gc_set_stipple(struct graphics_gc *gc, struct graphics_image *img); void graphics_gc_set_linewidth(struct graphics_gc *gc, int width); void graphics_gc_set_dashes(struct graphics_gc *gc, int width, int offset, unsigned char dash_list[], int n); struct graphics_image *graphics_image_new_scaled(struct graphics *gra, char *path, int w, int h); Modified: trunk/navit/navit/plugin/pedestrian/pedestrian.c =================================================================== --- trunk/navit/navit/plugin/pedestrian/pedestrian.c 2015-03-07 13:18:56 UTC (rev 6022) +++ trunk/navit/navit/plugin/pedestrian/pedestrian.c 2015-03-08 22:53:58 UTC (rev 6023) @@ -1021,7 +1021,6 @@ p.x=0; p.y=0; graphics_gc_set_foreground(gc, &c); - graphics_gc_set_stipple(gc, NULL); graphics_draw_rectangle(gra, gc, &p, 1000, 200); graphics_gc_destroy(gc); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sl...@us...> - 2015-03-07 13:19:06
|
Revision: 6022 http://sourceforge.net/p/navit/code/6022 Author: sleske Date: 2015-03-07 13:18:56 +0000 (Sat, 07 Mar 2015) Log Message: ----------- Refactor:graphics_gtk_drawing_area:Remove disabled code. Modified Paths: -------------- trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c Modified: trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c =================================================================== --- trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2015-03-06 08:09:39 UTC (rev 6021) +++ trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2015-03-07 13:18:56 UTC (rev 6022) @@ -705,34 +705,9 @@ if (! gra->drawable) configure(widget, NULL, user_data); gtk_drawing_area_draw(gra, &event->area); -#if 0 - gdk_draw_drawable(widget->window, widget->style->fg_gc[GTK_WIDGET_STATE(widget)], - gra->drawable, event->area.x, event->area.y, - event->area.x, event->area.y, - event->area.width, event->area.height); -#endif - return FALSE; } -#if 0 -static gint -button_timeout(gpointer user_data) -{ -#if 0 - struct container *co=user_data; - int x=co->gra->gra->button_event.x; - int y=co->gra->gra->button_event.y; - int button=co->gra->gra->button_event.button; - - co->gra->gra->button_timeout=0; - popup(co, x, y, button); - - return FALSE; -#endif -} -#endif - static int tv_delta(struct timeval *old, struct timeval *new) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2015-03-06 08:09:47
|
Revision: 6021 http://sourceforge.net/p/navit/code/6021 Author: martin-s Date: 2015-03-06 08:09:39 +0000 (Fri, 06 Mar 2015) Log Message: ----------- Add:Core:More custom icons for those who used all up Modified Paths: -------------- trunk/navit/navit/item.h trunk/navit/navit/item_def.h Modified: trunk/navit/navit/item.h =================================================================== --- trunk/navit/navit/item.h 2015-03-06 08:08:46 UTC (rev 6020) +++ trunk/navit/navit/item.h 2015-03-06 08:09:39 UTC (rev 6021) @@ -52,7 +52,7 @@ #define item_is_district(item) ((item).type >= type_district_label && (item).type <= type_district_label_1e7) #define item_is_poly_place(item) ((item).type >= type_poly_place1 && (item).type <= type_poly_place6) #define item_is_point(item) ((item).type < type_line) -#define item_is_custom_poi(item) ((item).type >= type_poi_custom0 && (item).type < type_line) +#define item_is_custom_poi(item) ((item).type >= type_poi_customg && (item).type < type_line) #define item_is_street(item) (((item).type >= type_street_0 && (item).type < type_street_1_land) \ || (item).type == type_street_pedestrian \ || (item).type == type_living_street \ Modified: trunk/navit/navit/item_def.h =================================================================== --- trunk/navit/navit/item_def.h 2015-03-06 08:08:46 UTC (rev 6020) +++ trunk/navit/navit/item_def.h 2015-03-06 08:09:39 UTC (rev 6021) @@ -350,7 +350,23 @@ ITEM(poi_buddhist) ITEM(poi_bahai) ITEM(found_item) -ITEM2(0x7ffffff0,poi_custom0) +ITEM2(0x7fffffe0,poi_customg) +ITEM(poi_customh) +ITEM(poi_customi) +ITEM(poi_customj) +ITEM(poi_customk) +ITEM(poi_customl) +ITEM(poi_customm) +ITEM(poi_customn) +ITEM(poi_customo) +ITEM(poi_customp) +ITEM(poi_customq) +ITEM(poi_customr) +ITEM(poi_customs) +ITEM(poi_customt) +ITEM(poi_customu) +ITEM(poi_customv) +ITEM(poi_custom0) ITEM(poi_custom1) ITEM(poi_custom2) ITEM(poi_custom3) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2015-03-06 08:08:54
|
Revision: 6020 http://sourceforge.net/p/navit/code/6020 Author: martin-s Date: 2015-03-06 08:08:46 +0000 (Fri, 06 Mar 2015) Log Message: ----------- Fix:maptool:Avoid core dumps when using -b option Modified Paths: -------------- trunk/navit/navit/maptool/maptool.c Modified: trunk/navit/navit/maptool/maptool.c =================================================================== --- trunk/navit/navit/maptool/maptool.c 2015-03-06 08:05:47 UTC (rev 6019) +++ trunk/navit/navit/maptool/maptool.c 2015-03-06 08:08:46 UTC (rev 6020) @@ -944,26 +944,30 @@ if (p.process_relations && p.process_ways && p.process_nodes && start_phase(&p,"processing associated street relations")) { struct files_relation_processing *files_relproc = files_relation_processing_new(p.osm.line2poi, suffix); p.osm.associated_streets=tempfile(suffix,"associated_streets",0); + if (p.osm.associated_streets) { - process_associated_streets(p.osm.associated_streets, files_relproc); + process_associated_streets(p.osm.associated_streets, files_relproc); - fclose(p.osm.associated_streets); - files_relation_processing_destroy(files_relproc, suffix); - if(!p.keep_tmpfiles) { - tempfile_unlink(suffix,"associated_streets"); + fclose(p.osm.associated_streets); + files_relation_processing_destroy(files_relproc, suffix); + if(!p.keep_tmpfiles) { + tempfile_unlink(suffix,"associated_streets"); + } } } if (p.process_relations && p.process_ways && p.process_nodes && start_phase(&p,"processing house number interpolations")) { // OSM house number interpolations are handled like a relation. struct files_relation_processing *files_relproc = files_relation_processing_new(p.osm.line2poi, suffix); p.osm.house_number_interpolations=tempfile(suffix,"house_number_interpolations",0); + if (p.osm.house_number_interpolations) { - process_house_number_interpolations(p.osm.house_number_interpolations, files_relproc); + process_house_number_interpolations(p.osm.house_number_interpolations, files_relproc); - fclose(p.osm.house_number_interpolations); - files_relation_processing_destroy(files_relproc, suffix); - if(!p.keep_tmpfiles) { - tempfile_unlink(suffix,"house_number_interpolations"); + fclose(p.osm.house_number_interpolations); + files_relation_processing_destroy(files_relproc, suffix); + if(!p.keep_tmpfiles) { + tempfile_unlink(suffix,"house_number_interpolations"); + } } } if (p.output == 1 && start_phase(&p,"dumping")) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2015-03-06 08:05:49
|
Revision: 6019 http://sourceforge.net/p/navit/code/6019 Author: martin-s Date: 2015-03-06 08:05:47 +0000 (Fri, 06 Mar 2015) Log Message: ----------- Add:binding_dbus:Command to dump a map into a given file name Modified Paths: -------------- trunk/navit/navit/binding/dbus/binding_dbus.c Modified: trunk/navit/navit/binding/dbus/binding_dbus.c =================================================================== --- trunk/navit/navit/binding/dbus/binding_dbus.c 2015-03-04 09:30:38 UTC (rev 6018) +++ trunk/navit/navit/binding/dbus/binding_dbus.c 2015-03-06 08:05:47 UTC (rev 6019) @@ -988,6 +988,31 @@ return request_set_add_remove_attr(connection, message, "map", NULL, (int (*)(void *, struct attr *))map_set_attr); } +static DBusHandlerResult +request_map_dump(DBusConnection *connection, DBusMessage *message) +{ + DBusMessageIter iter; + struct map *map; + + map=object_get_from_message(message, "map"); + if (! map) + return dbus_error_invalid_object_path(connection, message); + + dbus_message_iter_init(message, &iter); + if(!strcmp(dbus_message_iter_get_signature(&iter), "s")) { + char *file; + FILE *f; + dbus_message_iter_get_basic(&iter, &file); + /* dbg(0,"File '%s'\n",file); */ + f=fopen(file,"w"); + map_dump_filedesc(map,f); + fclose(f); + return empty_reply(connection, message); + } + return dbus_error_invalid_parameter(connection, message); +} + + /* mapset */ static DBusHandlerResult @@ -1818,6 +1843,7 @@ {".layout", "get_attr", "s", "attribute", "sv", "attrname,value", request_layout_get_attr}, {".map", "get_attr", "s", "attribute", "sv", "attrname,value", request_map_get_attr}, {".map", "set_attr", "sv", "attribute,value", "", "", request_map_set_attr}, + {".map", "dump", "s", "file", "", "", request_map_dump}, {".mapset", "attr_iter", "", "", "o", "attr_iter", request_mapset_attr_iter}, {".mapset", "attr_iter_destroy", "o", "attr_iter", "", "", request_mapset_attr_iter_destroy}, {".mapset", "get_attr", "s", "attribute", "sv", "attrname,value", request_mapset_get_attr}, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <md...@us...> - 2015-03-04 09:30:41
|
Revision: 6018 http://sourceforge.net/p/navit/code/6018 Author: mdankov Date: 2015-03-04 09:30:38 +0000 (Wed, 04 Mar 2015) Log Message: ----------- Fix:maptool:Mark coastline pulling to order 6 as experimental feature, related to #854. Modified Paths: -------------- trunk/navit/navit/maptool/maptool.c trunk/navit/navit/maptool/misc.c Modified: trunk/navit/navit/maptool/maptool.c =================================================================== --- trunk/navit/navit/maptool/maptool.c 2015-03-03 17:51:32 UTC (rev 6017) +++ trunk/navit/navit/maptool/maptool.c 2015-03-04 09:30:38 UTC (rev 6018) @@ -57,7 +57,7 @@ int unknown_country; char ch_suffix[] ="r"; /* Used to make compiler happy due to Bug 35903 in gcc */ /** Textual description of available experimental features, or NULL (=none available). */ -char* experimental_feature_description = NULL; /* add description here */ +char* experimental_feature_description = "Move coastline data to order 6 tiles. Makes map look more smooth, but may affect drawing/searching performance."; /* add description here */ /** Indicates if experimental features (if available) were enabled. */ int experimental; Modified: trunk/navit/navit/maptool/misc.c =================================================================== --- trunk/navit/navit/maptool/misc.c 2015-03-03 17:51:32 UTC (rev 6017) +++ trunk/navit/navit/maptool/misc.c 2015-03-04 09:30:38 UTC (rev 6018) @@ -181,9 +181,12 @@ case type_district_label_2e6: case type_district_label_1e6: case type_district_label_5e5: - case type_poly_water_tiled: max=6; break; + case type_poly_water_tiled: + if(experimental) + max=6; + break; case type_town_label_2e5: case type_town_label_1e5: case type_district_label_2e5: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-03-03 17:51:35
|
Revision: 6017 http://sourceforge.net/p/navit/code/6017 Author: kazer_ Date: 2015-03-03 17:51:32 +0000 (Tue, 03 Mar 2015) Log Message: ----------- Fix:maptool:Fixed badly rendered coastlines ( Trac #854 ) Modified Paths: -------------- trunk/navit/navit/maptool/misc.c Modified: trunk/navit/navit/maptool/misc.c =================================================================== --- trunk/navit/navit/maptool/misc.c 2015-03-03 16:43:33 UTC (rev 6016) +++ trunk/navit/navit/maptool/misc.c 2015-03-03 17:51:32 UTC (rev 6017) @@ -181,6 +181,7 @@ case type_district_label_2e6: case type_district_label_1e6: case type_district_label_5e5: + case type_poly_water_tiled: max=6; break; case type_town_label_2e5: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sl...@us...> - 2015-03-03 16:43:41
|
Revision: 6016 http://sourceforge.net/p/navit/code/6016 Author: sleske Date: 2015-03-03 16:43:33 +0000 (Tue, 03 Mar 2015) Log Message: ----------- Refactor:core:Remove unused and broken graphics driver gtk_gl_ext. Removed Paths: ------------- trunk/navit/navit/graphics/gtk_gl_ext/graphics_gtk_gl_ext.c Deleted: trunk/navit/navit/graphics/gtk_gl_ext/graphics_gtk_gl_ext.c =================================================================== --- trunk/navit/navit/graphics/gtk_gl_ext/graphics_gtk_gl_ext.c 2015-03-03 16:43:25 UTC (rev 6015) +++ trunk/navit/navit/graphics/gtk_gl_ext/graphics_gtk_gl_ext.c 2015-03-03 16:43:33 UTC (rev 6016) @@ -1,352 +0,0 @@ -/** - * Navit, a modular navigation system. - * Copyright (C) 2005-2008 Navit Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#include <stdlib.h> -#include <gtk/gtk.h> -#include <gtk/gtkgl.h> -#include <GL/gl.h> -#include <GL/glu.h> -#include "point.h" -#include "graphics.h" -#include "container.h" - - -struct graphics_gra { - GtkWidget *widget; - int width; - int height; - int library_init; - int visible; - int buffer; -}; - -struct graphics_font { -}; - -struct graphics_gc { - double fr,fg,fb; - double br,bg,bb; - double width; - struct graphics_gra *gra; -}; - -static struct graphics_font *font_new(struct graphics *gr, int size) -{ - struct graphics_font *font=g_new(struct graphics_font, 1); - return font; -} - -static struct graphics_gc *gc_new(struct graphics *gr) -{ - struct graphics_gc *gc=g_new(struct graphics_gc, 1); - - gc->fr=1; - gc->fg=1; - gc->fb=1; - gc->br=0; - gc->bg=0; - gc->bb=0; - gc->width=1; - gc->gra=gr->gra; - return gc; -} - -static void -gc_set_linewidth(struct graphics_gc *gc, int w) -{ - gc->width=w; -} - -static void -gc_set_foreground(struct graphics_gc *gc, int r, int g, int b) -{ - gc->fr=r/65535.0; - gc->fg=g/65535.0; - gc->fb=b/65535.0; -} - -static void -gc_set_background(struct graphics_gc *gc, int r, int g, int b) -{ - gc->br=r/65535.0; - gc->bg=g/65535.0; - gc->bb=b/65535.0; -} - -static void -vertex(struct point *p) -{ - double x,y; - x=p->x; - y=p->y; - x/=792; - y/=469; - x-=0.5; - y=0.5-y; - glVertex3f(x,y,0); -} - -static void -draw_lines(struct graphics *gr, struct graphics_gc *gc, struct point *p, int count) -{ - int i; - - glLineWidth(gc->width); - glColor3f(gc->fr, gc->fg, gc->fb); - glBegin(GL_LINE_STRIP); - for (i=0 ; i < count ; i++) - vertex(p++); - glEnd(); -} - -static void -draw_polygon(struct graphics *gr, struct graphics_gc *gc, struct point *p, int count) -{ - int i; - double x,y; - glColor3f(gc->fr, gc->fg, gc->fb); - glBegin(GL_POLYGON); - for (i=0 ; i < count ; i++) - vertex(p++); - glEnd(); -} - - -static void -draw_circle(struct graphics *gr, struct graphics_gc *gc, struct point *p, int r) -{ - -} - -static void -draw_text(struct graphics *gr, struct graphics_gc *fg, struct graphics_gc *bg, struct graphics_font *font, unsigned char *text, int x, int y, int dx, int dy) -{ -} - -static void -draw_begin(struct graphics *gr) -{ - printf("draw_begin\n"); - glClearColor(gr->gc[0]->br, gr->gc[0]->bg, gr->gc[0]->bb, 0); - glNewList(1, GL_COMPILE); - gr->gra->buffer=1; -} - -static void -draw_end(struct graphics *gr) -{ - printf("draw_end\n"); - glEndList(); - gr->gra->buffer=0; -} - -static void realize(GtkWidget * widget, gpointer data) -{ - GdkGLContext *glcontext = gtk_widget_get_gl_context(widget); - GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(widget); - - GLUquadricObj *qobj; - static GLfloat light_diffuse[] = { 1.0, 0.0, 0.0, 1.0 }; - static GLfloat light_position[] = { 1.0, 1.0, 1.0, 0.0 }; - - /*** OpenGL BEGIN ***/ - if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext)) - return; - - qobj = gluNewQuadric(); - gluQuadricDrawStyle(qobj, GLU_FILL); -#if 0 - glNewList(1, GL_COMPILE); - gluSphere(qobj, 1.0, 20, 20); - glBegin(GL_LINE_STRIP); - glVertex3f(0.0,0.1,0.0); - glVertex3f(0.1,0.1,0.0); - glVertex3f(0.1,0.2,0.0); - glVertex3f(0.2,0.2,0.0); - glEnd(); - glEndList(); -#endif - -#if 0 - glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse); - glLightfv(GL_LIGHT0, GL_POSITION, light_position); - glEnable(GL_LIGHTING); - glEnable(GL_LIGHT0); - glEnable(GL_DEPTH_TEST); -#endif - - glClearColor(1.0, 1.0, 1.0, 1.0); - glClearDepth(1.0); - - glViewport(0, 0, - widget->allocation.width, widget->allocation.height); - - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - gluPerspective(19.0, 1.0, 1.0, 10.0); - - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - gluLookAt(0.0, 0.0, 3.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0); - glTranslatef(0.0, 0.0, 0.0); - - gdk_gl_drawable_gl_end(gldrawable); - /*** OpenGL END ***/ -} - -static gboolean -configure(GtkWidget * widget, GdkEventConfigure * event, gpointer user_data) -{ - GdkGLContext *glcontext = gtk_widget_get_gl_context(widget); - GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(widget); - struct container *co=user_data; - struct graphics_gra *gra=co->gra->gra; - - - printf("configure %d %d\n",gra->width, gra->height); - gra->width=widget->allocation.width; - gra->height=widget->allocation.height; - - /*** OpenGL BEGIN ***/ - if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext)) - return FALSE; - - glViewport(0, 0, - widget->allocation.width, widget->allocation.height); - - gdk_gl_drawable_gl_end(gldrawable); - /*** OpenGL END ***/ - if (gra->visible) - graphics_resize(co, gra->width, gra->height); - - return TRUE; -} - -static gboolean -expose(GtkWidget * widget, GdkEventExpose * event, gpointer user_data) -{ - GdkGLContext *glcontext = gtk_widget_get_gl_context(widget); - GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(widget); - struct container *co=user_data; - struct graphics_gra *gra=co->gra->gra; - - printf("expose\n"); - if (! gra->visible) { - gra->visible=1; - configure(widget, NULL, user_data); - } - /*** OpenGL BEGIN ***/ - if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext)) - return FALSE; - - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - - glCallList(1); - - if (gdk_gl_drawable_is_double_buffered(gldrawable)) - gdk_gl_drawable_swap_buffers(gldrawable); - else - glFlush(); - - gdk_gl_drawable_gl_end(gldrawable); - /*** OpenGL END ***/ - - return TRUE; -} - - -struct graphics * -graphics_gtk_gl_area_new(struct container *co, GtkWidget **widget) -{ - GdkGLConfig *glconfig; - gint major, minor; - GtkWidget *drawing_area; - - struct graphics *this=g_new0(struct graphics,1); - this->draw_lines=draw_lines; - this->draw_polygon=draw_polygon; - this->draw_circle=draw_circle; - this->draw_text=draw_text; -#if 0 - this->draw_begin=draw_begin; - this->draw_end=draw_end; -#endif - this->gc_new=gc_new; - this->gc_set_linewidth=gc_set_linewidth; - this->gc_set_foreground=gc_set_foreground; - this->gc_set_background=gc_set_background; - this->font_new=font_new; - this->gra=g_new0(struct graphics_gra, 1); - - /* - * Init GtkGLExt. - */ - - gtk_gl_init(NULL, NULL); - - /* - * Query OpenGL extension version. - */ - - gdk_gl_query_version(&major, &minor); - g_print("OpenGL extension version - %d.%d\n", major, minor); - - /* - * Configure OpenGL-capable visual. - */ - - /* Try double-buffered visual */ - glconfig = gdk_gl_config_new_by_mode(GDK_GL_MODE_RGB | - GDK_GL_MODE_DEPTH | - GDK_GL_MODE_DOUBLE); - if (glconfig == NULL) { - g_print("*** Cannot find the double-buffered visual.\n"); - g_print("*** Trying single-buffered visual.\n"); - - /* Try single-buffered visual */ - glconfig = gdk_gl_config_new_by_mode(GDK_GL_MODE_RGB | - GDK_GL_MODE_DEPTH); - if (glconfig == NULL) { - g_print - ("*** No appropriate OpenGL-capable visual found.\n"); - exit(1); - } - } - - - drawing_area = gtk_drawing_area_new(); - - /* Set OpenGL-capability to the widget. */ - gtk_widget_set_gl_capability(drawing_area, - glconfig, - NULL, TRUE, GDK_GL_RGBA_TYPE); - - g_signal_connect_after(G_OBJECT(drawing_area), "realize", - G_CALLBACK(realize), NULL); - g_signal_connect(G_OBJECT(drawing_area), "configure_event", - G_CALLBACK(configure), co); - g_signal_connect(G_OBJECT(drawing_area), "expose_event", - G_CALLBACK(expose), co); - - *widget=drawing_area; - this->gra->widget=drawing_area; - return this; -} - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sl...@us...> - 2015-03-03 16:43:27
|
Revision: 6015 http://sourceforge.net/p/navit/code/6015 Author: sleske Date: 2015-03-03 16:43:25 +0000 (Tue, 03 Mar 2015) Log Message: ----------- Refactor:core:Remove unused method graphics_draw_restore. Modified Paths: -------------- trunk/navit/navit/graphics/android/graphics_android.c trunk/navit/navit/graphics/cocoa/graphics_cocoa.m trunk/navit/navit/graphics/gd/graphics_gd.c trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c trunk/navit/navit/graphics/null/graphics_null.c trunk/navit/navit/graphics/opengl/graphics_opengl.c trunk/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp trunk/navit/navit/graphics/sdl/graphics_sdl.c trunk/navit/navit/graphics/win32/graphics_win32.c trunk/navit/navit/graphics.c trunk/navit/navit/graphics.h Modified: trunk/navit/navit/graphics/android/graphics_android.c =================================================================== --- trunk/navit/navit/graphics/android/graphics_android.c 2015-02-20 00:20:52 UTC (rev 6014) +++ trunk/navit/navit/graphics/android/graphics_android.c 2015-03-03 16:43:25 UTC (rev 6015) @@ -373,11 +373,6 @@ } -static void -draw_restore(struct graphics_priv *gr, struct point *p, int w, int h) -{ -} - static void draw_drag(struct graphics_priv *gra, struct point *p) { (*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_draw_drag, p ? p->x : 0, p ? p->y : 0); @@ -458,7 +453,6 @@ draw_text, draw_image, NULL, - draw_restore, draw_drag, font_new, gc_new, Modified: trunk/navit/navit/graphics/cocoa/graphics_cocoa.m =================================================================== --- trunk/navit/navit/graphics/cocoa/graphics_cocoa.m 2015-02-20 00:20:52 UTC (rev 6014) +++ trunk/navit/navit/graphics/cocoa/graphics_cocoa.m 2015-03-03 16:43:25 UTC (rev 6015) @@ -639,7 +639,6 @@ draw_text, draw_image, NULL, /* draw_image_warp, */ - NULL, /* draw_restore, */ draw_drag, font_new, gc_new, Modified: trunk/navit/navit/graphics/gd/graphics_gd.c =================================================================== --- trunk/navit/navit/graphics/gd/graphics_gd.c 2015-02-20 00:20:52 UTC (rev 6014) +++ trunk/navit/navit/graphics/gd/graphics_gd.c 2015-03-03 16:43:25 UTC (rev 6015) @@ -467,11 +467,6 @@ } static void -draw_restore(struct graphics_priv *gr, struct point *p, int w, int h) -{ -} - -static void draw_drag(struct graphics_priv *gr, struct point *p) { if (p) @@ -806,7 +801,6 @@ draw_text, draw_image, NULL, - draw_restore, draw_drag, NULL, gc_new, Modified: trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c =================================================================== --- trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2015-02-20 00:20:52 UTC (rev 6014) +++ trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2015-03-03 16:43:25 UTC (rev 6015) @@ -601,17 +601,6 @@ } static void -draw_restore(struct graphics_priv *gr, struct point *p, int w, int h) -{ - GtkWidget *widget=gr->widget; - gdk_draw_drawable(widget->window, - widget->style->fg_gc[GTK_WIDGET_STATE(widget)], - gr->drawable, - p->x, p->y, p->x, p->y, w, h); - -} - -static void draw_drag(struct graphics_priv *gr, struct point *p) { if (!gr->cleanup) { @@ -1155,7 +1144,6 @@ #else NULL, #endif - draw_restore, draw_drag, NULL, /* font_new */ gc_new, Modified: trunk/navit/navit/graphics/null/graphics_null.c =================================================================== --- trunk/navit/navit/graphics/null/graphics_null.c 2015-02-20 00:20:52 UTC (rev 6014) +++ trunk/navit/navit/graphics/null/graphics_null.c 2015-03-03 16:43:25 UTC (rev 6015) @@ -150,11 +150,6 @@ { } -static void -draw_restore(struct graphics_priv *gr, struct point *p, int w, int h) -{ -} - static void draw_drag(struct graphics_priv *gr, struct point *p) { } @@ -230,7 +225,6 @@ draw_text, draw_image, NULL, - draw_restore, draw_drag, font_new, gc_new, Modified: trunk/navit/navit/graphics/opengl/graphics_opengl.c =================================================================== --- trunk/navit/navit/graphics/opengl/graphics_opengl.c 2015-02-20 00:20:52 UTC (rev 6014) +++ trunk/navit/navit/graphics/opengl/graphics_opengl.c 2015-03-03 16:43:25 UTC (rev 6015) @@ -1084,11 +1084,6 @@ } static void -draw_restore(struct graphics_priv *gr, struct point *p, int w, int h) -{ -} - -static void draw_drag(struct graphics_priv *gr, struct point *p) { @@ -1427,7 +1422,6 @@ draw_text, draw_image, NULL, - draw_restore, draw_drag, NULL, gc_new, Modified: trunk/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp =================================================================== --- trunk/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp 2015-02-20 00:20:52 UTC (rev 6014) +++ trunk/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp 2015-03-03 16:43:25 UTC (rev 6015) @@ -459,16 +459,6 @@ gr->painter->drawPixmap(p->x, p->y, *img->pixmap); } -//############################################################################################################## -//# Description: -//# Comment: -//# Authors: Martin Schaller (04/2008) -//############################################################################################################## -static void draw_restore(struct graphics_priv *gr, struct point *p, int w, int h) -{ -} - - static void draw_drag(struct graphics_priv *gr, struct point *p) { @@ -694,7 +684,6 @@ draw_text, draw_image, NULL, - draw_restore, draw_drag, font_new, gc_new, Modified: trunk/navit/navit/graphics/sdl/graphics_sdl.c =================================================================== --- trunk/navit/navit/graphics/sdl/graphics_sdl.c 2015-02-20 00:20:52 UTC (rev 6014) +++ trunk/navit/navit/graphics/sdl/graphics_sdl.c 2015-03-03 16:43:25 UTC (rev 6015) @@ -780,12 +780,6 @@ } static void -draw_restore(struct graphics_priv *gr, struct point *p, int w, int h) -{ - dbg(lvl_debug, "draw_restore\n"); -} - -static void background_gc(struct graphics_priv *gr, struct graphics_gc_priv *gc) { dbg(lvl_debug, "background_gc\n"); @@ -903,7 +897,6 @@ draw_text, draw_image, NULL, /*draw_image_warp */ - draw_restore, draw_drag, NULL, /* font_new */ gc_new, Modified: trunk/navit/navit/graphics/win32/graphics_win32.c =================================================================== --- trunk/navit/navit/graphics/win32/graphics_win32.c 2015-02-20 00:20:52 UTC (rev 6014) +++ trunk/navit/navit/graphics/win32/graphics_win32.c 2015-03-03 16:43:25 UTC (rev 6015) @@ -912,12 +912,6 @@ } - -static void draw_restore(struct graphics_priv *gr, struct point *p, int w, int h) -{ - InvalidateRect( gr->wnd_handle, NULL, FALSE ); -} - static void draw_drag(struct graphics_priv *gr, struct point *p) { if ( p ) @@ -1578,7 +1572,6 @@ #else NULL, #endif - draw_restore, draw_drag, font_new, gc_new, Modified: trunk/navit/navit/graphics.c =================================================================== --- trunk/navit/navit/graphics.c 2015-02-20 00:20:52 UTC (rev 6014) +++ trunk/navit/navit/graphics.c 2015-03-03 16:43:25 UTC (rev 6015) @@ -857,17 +857,6 @@ * @returns <> * @author Martin Schaller (04/2008) */ -void graphics_draw_restore(struct graphics *this_, struct point *p, int w, int h) -{ - this_->meth.draw_restore(this_->priv, p, w, h); -} - -/** - * FIXME - * @param <> - * @returns <> - * @author Martin Schaller (04/2008) -*/ void graphics_draw_mode(struct graphics *this_, enum draw_mode_num mode) { this_->meth.draw_mode(this_->priv, mode); Modified: trunk/navit/navit/graphics.h =================================================================== --- trunk/navit/navit/graphics.h 2015-02-20 00:20:52 UTC (rev 6014) +++ trunk/navit/navit/graphics.h 2015-03-03 16:43:25 UTC (rev 6015) @@ -69,7 +69,6 @@ void (*draw_text)(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct graphics_gc_priv *bg, struct graphics_font_priv *font, char *text, struct point *p, int dx, int dy); void (*draw_image)(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p, struct graphics_image_priv *img); void (*draw_image_warp)(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p, int count, struct graphics_image_priv *img); - void (*draw_restore)(struct graphics_priv *gr, struct point *p, int w, int h); void (*draw_drag)(struct graphics_priv *gr, struct point *p); struct graphics_font_priv *(*font_new)(struct graphics_priv *gr, struct graphics_font_methods *meth, char *font, int size, int flags); struct graphics_gc_priv *(*gc_new)(struct graphics_priv *gr, struct graphics_gc_methods *meth); @@ -174,7 +173,6 @@ struct graphics_image *graphics_image_new_scaled_rotated(struct graphics *gra, char *path, int w, int h, int rotate); struct graphics_image *graphics_image_new(struct graphics *gra, char *path); void graphics_image_free(struct graphics *gra, struct graphics_image *img); -void graphics_draw_restore(struct graphics *this_, struct point *p, int w, int h); void graphics_draw_mode(struct graphics *this_, enum draw_mode_num mode); void graphics_draw_lines(struct graphics *this_, struct graphics_gc *gc, struct point *p, int count); void graphics_draw_circle(struct graphics *this_, struct graphics_gc *gc, struct point *p, int r); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sl...@us...> - 2015-02-20 00:21:18
|
Revision: 6014 http://sourceforge.net/p/navit/code/6014 Author: sleske Date: 2015-02-20 00:20:52 +0000 (Fri, 20 Feb 2015) Log Message: ----------- Refactor:osd:Rename osd_std_draw to osd_fill_with_bgcolor; extract variable. Modified Paths: -------------- trunk/navit/navit/osd/core/osd_core.c trunk/navit/navit/osd.c trunk/navit/navit/osd.h trunk/navit/navit/plugin/j1850/j1850.c Modified: trunk/navit/navit/osd/core/osd_core.c =================================================================== --- trunk/navit/navit/osd/core/osd_core.c 2015-02-20 00:20:43 UTC (rev 6013) +++ trunk/navit/navit/osd/core/osd_core.c 2015-02-20 00:20:52 UTC (rev 6014) @@ -335,7 +335,7 @@ this->warned = 0; } } - osd_std_draw(&opc->osd_item); + osd_fill_with_bgcolor(&opc->osd_item); dist_str = format_distance(min_dist, "", imperial); @@ -685,7 +685,7 @@ if(0==curr_vehicle) return; - osd_std_draw(&opc->osd_item); + osd_fill_with_bgcolor(&opc->osd_item); if(this->bActive) { if(!vehicle_get_attr(curr_vehicle, attr_position_coord_geo,&position_attr, NULL)) { return; @@ -1035,7 +1035,7 @@ this->bReserved = 0; } - osd_std_draw(&opc->osd_item); + osd_fill_with_bgcolor(&opc->osd_item); //display image if(this->img) { @@ -1183,7 +1183,7 @@ time_t total_sec,total_min,total_hours,total_days; total_sec = this->sum_time; - osd_std_draw(&opc->osd_item); + osd_fill_with_bgcolor(&opc->osd_item); if(this->bActive) { total_sec += time(0)-this->current_base_time; @@ -1332,7 +1332,7 @@ if (navit_get_attr(nav, attr_imperial, &imperial_attr, NULL)) imperial=imperial_attr.u.num; - osd_std_draw(&opc->osd_item); + osd_fill_with_bgcolor(&opc->osd_item); p.x = opc->osd_item.w/2; p.y = opc->osd_item.w/2; graphics_draw_circle(opc->osd_item.gr, @@ -1448,7 +1448,7 @@ osd_button_adjust_sizes(opc, img); p.x=(opc->osd_item.w-img->width)/2; p.y=(opc->osd_item.h-img->height)/2; - osd_std_draw(&opc->osd_item); + osd_fill_with_bgcolor(&opc->osd_item); graphics_draw_image(opc->osd_item.gr, opc->osd_item.graphic_bg, &p, img); graphics_image_free(opc->osd_item.gr, img); } else { @@ -1471,8 +1471,7 @@ if (!opc->osd_item.configured) return; - if(this->img) - graphics_draw_image(opc->osd_item.gr, opc->osd_item.graphic_bg, &p, this->img); + graphics_draw_image(opc->osd_item.gr, opc->osd_item.graphic_bg, &p, this->img); } } @@ -1496,7 +1495,7 @@ img=graphics_image_new(opc->osd_item.gr, this->src); p.x=(opc->osd_item.w-this->img->width)/2; p.y=(opc->osd_item.h-this->img->height)/2; - osd_std_draw(&opc->osd_item); + osd_fill_with_bgcolor(&opc->osd_item); graphics_draw_image(opc->osd_item.gr, opc->osd_item.graphic_bg, &p, img); graphics_draw_mode(opc->osd_item.gr, draw_mode_end); graphics_image_free(opc->osd_item.gr, img); @@ -1630,7 +1629,7 @@ img=graphics_image_new(opc->osd_item.gr, this->src); p.x=(opc->osd_item.w-this->img->width)/2; p.y=(opc->osd_item.h-this->img->height)/2; - osd_std_draw(&opc->osd_item); + osd_fill_with_bgcolor(&opc->osd_item); graphics_draw_image(opc->osd_item.gr, opc->osd_item.graphic_bg, &p, img); graphics_draw_mode(opc->osd_item.gr, draw_mode_end); graphics_image_free(opc->osd_item.gr, img); @@ -1734,7 +1733,7 @@ map_rect_destroy(mr); if (do_draw) { - osd_std_draw(&opc->osd_item); + osd_fill_with_bgcolor(&opc->osd_item); if (this->active) { image = g_strdup_printf(this->icon_src, name); dbg(lvl_debug, "image=%s\n", image); @@ -2141,7 +2140,7 @@ buffer [0] = 0; buffer2[0] = 0; - osd_std_draw(&opc->osd_item); + osd_fill_with_bgcolor(&opc->osd_item); str_replace(buffer,this_->text,"${distance}",format_distance(dCurrDist,"",imperial)); str_replace(buffer2,buffer,"${camera_type}",(0<=idx && idx<=CAM_TRAFFIPAX)?camera_t_strs[idx]:""); @@ -2292,7 +2291,7 @@ struct graphics_image *img = this->img_off; - osd_std_draw(&opc->osd_item); + osd_fill_with_bgcolor(&opc->osd_item); p.x=opc->osd_item.w/2-this->d/4; p.y=opc->osd_item.h/2-this->d/4; p.x=opc->osd_item.w/2; @@ -2875,10 +2874,10 @@ absbegin=str; if (do_draw) { - //osd_std_draw(&opc->osd_item); + //osd_fill_with_bgcolor(&opc->osd_item); } if (do_draw && str) { - osd_std_draw(&opc->osd_item); + osd_fill_with_bgcolor(&opc->osd_item); lines=0; next=str; last=str; @@ -3205,7 +3204,7 @@ do_draw=1; } if (do_draw) { - osd_std_draw(&opc->osd_item); + osd_fill_with_bgcolor(&opc->osd_item); if (this->active) { image = g_strdup_printf(this->icon_src, strength); gr_image = graphics_image_new_scaled(opc->osd_item.gr, image, this->icon_w, this->icon_h); @@ -3296,7 +3295,7 @@ struct graphics_image *gr_image; char *image; - osd_std_draw(&opc->osd_item); + osd_fill_with_bgcolor(&opc->osd_item); if (this->active) { image = g_strdup_printf(this->icon_src, this->strength); gr_image = graphics_image_new_scaled(opc->osd_item.gr, image, this->icon_w, this->icon_h); Modified: trunk/navit/navit/osd.c =================================================================== --- trunk/navit/navit/osd.c 2015-02-20 00:20:43 UTC (rev 6013) +++ trunk/navit/navit/osd.c 2015-02-20 00:20:52 UTC (rev 6014) @@ -135,11 +135,13 @@ void osd_std_click(struct osd_item *this, struct navit *nav, int pressed, int button, struct point *p) { + int click_is_outside_item; struct point bp = this->p; if (!this->command || !this->command[0]) return; osd_wrap_point(&bp, nav); - if ((p->x < bp.x || p->y < bp.y || p->x > bp.x + this->w || p->y > bp.y + this->h || !this->configured) && !this->pressed) + click_is_outside_item = p->x < bp.x || p->y < bp.y || p->x > bp.x + this->w || p->y > bp.y + this->h; + if ((click_is_outside_item || !this->configured) && !this->pressed) return; if (button != 1) return; @@ -393,9 +395,9 @@ } void -osd_std_draw(struct osd_item *item) +osd_fill_with_bgcolor(struct osd_item *item) { - struct point p[2]; + struct point p[1]; graphics_draw_mode(item->gr, draw_mode_begin); p[0].x=0; p[0].y=0; Modified: trunk/navit/navit/osd.h =================================================================== --- trunk/navit/navit/osd.h 2015-02-20 00:20:43 UTC (rev 6013) +++ trunk/navit/navit/osd.h 2015-02-20 00:20:52 UTC (rev 6014) @@ -73,7 +73,7 @@ void osd_set_std_graphic(struct navit *nav, struct osd_item *item, struct osd_priv *priv); void osd_std_resize(struct osd_item *item); void osd_std_calculate_sizes(struct osd_item *item, int w, int h); -void osd_std_draw(struct osd_item *item); +void osd_fill_with_bgcolor(struct osd_item *item); int osd_set_attr(struct osd *osd, struct attr* attr); int osd_get_attr(struct osd *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter); /* end of prototypes */ Modified: trunk/navit/navit/plugin/j1850/j1850.c =================================================================== --- trunk/navit/navit/plugin/j1850/j1850.c 2015-02-20 00:20:43 UTC (rev 6013) +++ trunk/navit/navit/plugin/j1850/j1850.c 2015-02-20 00:20:52 UTC (rev 6014) @@ -269,7 +269,7 @@ osd_j1850_draw(struct j1850 *this, struct navit *nav, struct vehicle *v) { - osd_std_draw(&this->osd_item); + osd_fill_with_bgcolor(&this->osd_item); struct point p, bbox[4]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sl...@us...> - 2015-02-20 00:20:45
|
Revision: 6013 http://sourceforge.net/p/navit/code/6013 Author: sleske Date: 2015-02-20 00:20:43 +0000 (Fri, 20 Feb 2015) Log Message: ----------- Refactor:graphics_gtk_drawing_area:Remove unused struct members background, background_ready. Modified Paths: -------------- trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c Modified: trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c =================================================================== --- trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2015-02-14 16:14:20 UTC (rev 6012) +++ trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2015-02-20 00:20:43 UTC (rev 6013) @@ -63,8 +63,6 @@ GtkWidget *win; struct window window; GdkDrawable *drawable; - GdkDrawable *background; - int background_ready; GdkColormap *colormap; struct point p; struct point pclean; @@ -699,10 +697,6 @@ if (gra->drawable != NULL) { g_object_unref(gra->drawable); } - if(gra->background_ready && gra->background != NULL) { - g_object_unref(gra->background); - gra->background_ready = 0; - } #ifndef _WIN32 dbg(lvl_debug,"window=%lu\n", GDK_WINDOW_XID(widget->window)); #endif @@ -992,10 +986,8 @@ if (changed) { // Set the drawables to the right sizes g_object_unref(this->drawable); - g_object_unref(this->background); this->drawable=gdk_pixmap_new(this->parent->widget->window, w2, h2, -1); - this->background=gdk_pixmap_new(this->parent->widget->window, w2, h2, -1); if ((w == 0) || (h == 0)) { this->overlay_autodisabled = 1; @@ -1072,7 +1064,6 @@ w2 = w; } - this->background=gdk_pixmap_new(gr->widget->window, w2, h2, -1); this->drawable=gdk_pixmap_new(gr->widget->window, w2, h2, -1); if ((w == 0) || (h == 0)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <md...@us...> - 2015-02-14 16:14:27
|
Revision: 6012 http://sourceforge.net/p/navit/code/6012 Author: mdankov Date: 2015-02-14 16:14:20 +0000 (Sat, 14 Feb 2015) Log Message: ----------- Fix:maptool:Produce more exact warning messages on country conflicts. Modified Paths: -------------- trunk/navit/navit/maptool/osm.c Modified: trunk/navit/navit/maptool/osm.c =================================================================== --- trunk/navit/navit/maptool/osm.c 2015-01-31 23:28:41 UTC (rev 6011) +++ trunk/navit/navit/maptool/osm.c 2015-02-14 16:14:20 UTC (rev 6012) @@ -1900,6 +1900,7 @@ { struct country_table *result=NULL, *lookup; char *tok,*dup=g_strdup(is_in),*buf=dup; + int conflict=0; int find_town_name = 0; @@ -1917,8 +1918,7 @@ lookup=g_hash_table_lookup(country_table_hash,tok); if (lookup) { if (result && result->countryid != lookup->countryid) { - char *label=item_bin_get_attr(ib, attr_town_name, NULL); - osm_warning("node",item_bin_get_nodeid(ib),0,"conflict for %s is_in=%s country %d vs %d\n", label, is_in, lookup->countryid, result->countryid); + conflict=1; } result=lookup; } @@ -1926,6 +1926,11 @@ } g_free(dup); + if(conflict) { + char *label=item_bin_get_attr(ib, attr_town_name, NULL); + osm_warning("node",item_bin_get_nodeid(ib),0,"Country conflict for %s is_in=%s, choosen country %d (%s)\n", label, is_in, result->countryid, result->names); + } + return result; } @@ -1940,9 +1945,9 @@ struct boundary *b=l->data; if (b->country) { if (match && match->country->countryid!=b->country->countryid) { - osm_warning("node",item_bin_get_nodeid(ib),0,"node (0x%x,0x%x) conflict country ", c->x, c->y); - osm_warning("relation",boundary_relid(match),1,"country %d vs ",match->country->countryid); - osm_warning("relation",boundary_relid(b),1,"country %d\n",b->country->countryid); + osm_warning("node",item_bin_get_nodeid(ib),0,"node (0x%x,0x%x) country conflict: ", c->x, c->y); + osm_warning("relation",boundary_relid(match),1,"replacing country %d (%s) with ",match->country->countryid, match->country->names); + osm_warning("relation",boundary_relid(b),1,"country %d (%s)\n",b->country->countryid, b->country->names); } match=b; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |