summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Herlant <aerostitch@users.noreply.github.com>2018-03-31 06:06:26 -0700
committerjkoan <jkoan@users.noreply.github.com>2018-03-31 15:06:26 +0200
commit52fb7cb287eeabf24db31a1100270e470460010b (patch)
treef81776dd3c241352303b290fd64424ef9f6672f3
parent9d9a8ae0e1364910e580c507fcc365045856b84b (diff)
downloadnavit-52fb7cb287eeabf24db31a1100270e470460010b.tar.gz
Fix:typo:Fix various mispells (#421)
* doc/comments: fix typo: chosen not choosen * doc/comments: fix typo: truncated not trucated * doc/comments: fix typo: unknown not unkown * doc/comments: fix typo: attribute not atribute * doc/comments: fix typo: Convenience not Convinience * doc/comments: fix typo: forbidden not forbiden * doc/comments: fix typo: government not goverment
-rw-r--r--README.md2
-rw-r--r--navit/android/android_layout_default_new.xml2
-rw-r--r--navit/command.c2
-rw-r--r--navit/gui/internal/gui_internal.c2
-rw-r--r--navit/icons/forbidden_area.svg (renamed from navit/icons/forbiden_area.svg)4
-rw-r--r--navit/icons/government_building.svg (renamed from navit/icons/goverment_building.svg)2
-rw-r--r--navit/linguistics.c2
-rw-r--r--navit/map/csv/csv.c2
-rw-r--r--navit/map/garmin/garmintypes.txt6
-rw-r--r--navit/navit_shipped.xml14
-rw-r--r--navit/script/osm/Geo/OSM/Planet.pm2
-rw-r--r--navit/vehicle/file/vehicle_file.c4
12 files changed, 22 insertions, 22 deletions
diff --git a/README.md b/README.md
index 152419378..8cd281814 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ destination by assigning a value to each point directly connected to
destination point. The value represents the estimated time needed to
pass this distance.
-Now the point with the lowest value is choosen using the Fibonacci
+Now the point with the lowest value is chosen using the Fibonacci
heap and a value is assigned to connected points whos are
unevaluated or whos current value ist greater than the new one.
diff --git a/navit/android/android_layout_default_new.xml b/navit/android/android_layout_default_new.xml
index d36659f1e..8433ad6a2 100644
--- a/navit/android/android_layout_default_new.xml
+++ b/navit/android/android_layout_default_new.xml
@@ -834,7 +834,7 @@
<icon src="danger_16_16.png"/>
</itemgra>
<itemgra item_types="poi_forbidden_area" order="13-">
- <icon src="forbiden_area.png"/>
+ <icon src="forbidden_area.png"/>
</itemgra>
<itemgra item_types="poi_tunnel" order="12-">
<icon src="tunnel.png"/>
diff --git a/navit/command.c b/navit/command.c
index 4208c575c..3a7d8b154 100644
--- a/navit/command.c
+++ b/navit/command.c
@@ -621,7 +621,7 @@ result_op(struct context *ctx, enum op_type op_type, const char *op, struct resu
default:
break;
}
- dbg(lvl_error,"Unkown op %d %s\n",op_type,op);
+ dbg(lvl_error,"Unknown op %d %s\n",op_type,op);
ctx->error=internal;
}
diff --git a/navit/gui/internal/gui_internal.c b/navit/gui/internal/gui_internal.c
index 0a62ae010..a571a827c 100644
--- a/navit/gui/internal/gui_internal.c
+++ b/navit/gui/internal/gui_internal.c
@@ -634,7 +634,7 @@ gui_internal_cmd_insert_destination_do(struct gui_priv *this, struct widget *wm,
* function passed as {@code cmd} will be called.
*
* Widget passed as wm parameter of the called cmd function will have item set to user chosen waypoint item. Its data will be set
- * to zero-based choosen waypoint number, counting from the route end. Coordinates to wm->c will be copied from wm_->c if wm_ is not null. Otherwise,
+ * to zero-based chosen waypoint number, counting from the route end. Coordinates to wm->c will be copied from wm_->c if wm_ is not null. Otherwise,
* waypoint coordinates will be copied to wm->c.
*
* @param this gui context
diff --git a/navit/icons/forbiden_area.svg b/navit/icons/forbidden_area.svg
index bc1f96028..1daf0aa0d 100644
--- a/navit/icons/forbiden_area.svg
+++ b/navit/icons/forbidden_area.svg
@@ -13,11 +13,11 @@
id="svg2"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
- sodipodi:docname="forbiden_area.svg"
+ sodipodi:docname="forbidden_area.svg"
sodipodi:version="0.32"
version="1.0"
width="200"
- inkscape:export-filename="C:\Users\jeremy\Pictures\svg\forbiden_area.png"
+ inkscape:export-filename="C:\Users\jeremy\Pictures\svg\forbidden_area.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<defs
diff --git a/navit/icons/goverment_building.svg b/navit/icons/government_building.svg
index d01f4842b..f12adf04b 100644
--- a/navit/icons/goverment_building.svg
+++ b/navit/icons/government_building.svg
@@ -13,7 +13,7 @@
id="svg2"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
- sodipodi:docname="goverment_building.svg"
+ sodipodi:docname="government_building.svg"
sodipodi:version="0.32"
version="1.0"
width="200">
diff --git a/navit/linguistics.c b/navit/linguistics.c
index 549f90e17..82513b016 100644
--- a/navit/linguistics.c
+++ b/navit/linguistics.c
@@ -317,7 +317,7 @@ linguistics_casefold(const char *in)
}
*dest=0;
if(*src)
- dbg(lvl_error,"Casefolded string for '%s' needs extra space, result is trucated to '%s'.\n",in,ret);
+ dbg(lvl_error,"Casefolded string for '%s' needs extra space, result is truncated to '%s'.\n",in,ret);
return ret;
}
diff --git a/navit/map/csv/csv.c b/navit/map/csv/csv.c
index 2726e8ab9..0477f7fdf 100644
--- a/navit/map/csv/csv.c
+++ b/navit/map/csv/csv.c
@@ -131,7 +131,7 @@ save_map_csv(struct map_priv *m)
tmpstr=g_strdup("");
}
} else {
- dbg(lvl_debug,"No value defined for the atribute %s, assuming empty string\n",attr_to_name(*at));
+ dbg(lvl_debug,"No value defined for the attribute %s, assuming empty string\n",attr_to_name(*at));
tmpstr=g_strdup("");
}
}
diff --git a/navit/map/garmin/garmintypes.txt b/navit/map/garmin/garmintypes.txt
index ce8b0d495..1fca9ddfa 100644
--- a/navit/map/garmin/garmintypes.txt
+++ b/navit/map/garmin/garmintypes.txt
@@ -46,7 +46,7 @@ POINT
0, 0x2000-0x203F = highway_exit, Exit
0, 0x2100-0x213F = highway_exit, Exit with Services
0, 0x2200-0x223F = highway_exit, Exit with Restroom
-0, 0x2300-0x233F = highway_exit, Exit with Convinience Store
+0, 0x2300-0x233F = highway_exit, Exit with Convenience Store
0, 0x2400-0x243F = highway_exit, Exit with Weight Station
0, 0x2500-0x253F = highway_exit, Exit with Toolbooth Booth
0, 0x2600-0x263F = highway_exit, Exit with Information
@@ -155,7 +155,7 @@ POINT
0, 0x3004 = poi_justice, Justice
0, 0x3005 = poi_concert, Concert hall(point)
0, 0x3006 = poi_border_station, Border Station(point)
-0, 0x3007 = poi_goverment_building, Goverment Building
+0, 0x3007 = poi_government_building, Government Building
0, 0x3008 = poi_firebrigade, FireFighters Station
0, 0x4000-0x403F = poi_golf, Golf
@@ -181,7 +181,7 @@ POINT
0, 0x5400-0x543F = poi_swimming, Swimming
0, 0x5500-0x553F = poi_dam, Dam
-0, 0x5600-0x563F = poi_forbidden_area, Forbiden Area
+0, 0x5600-0x563F = poi_forbidden_area, Forbidden Area
0, 0x5700-0x573F = poi_danger_area, Danger Area
0, 0x5800-0x583F = poi_restricted_area, Restricted Area
diff --git a/navit/navit_shipped.xml b/navit/navit_shipped.xml
index feedc8d18..c605a4408 100644
--- a/navit/navit_shipped.xml
+++ b/navit/navit_shipped.xml
@@ -2117,7 +2117,7 @@ Waypoint</text></img>
<icon src="fish.xpm"/>
</itemgra>
<itemgra item_types="poi_forbidden_area" order="12-">
- <icon src="forbiden_area.xpm"/>
+ <icon src="forbidden_area.xpm"/>
</itemgra>
<itemgra item_types="poi_shop_bicycle" order="12-">
<icon src="bicycle_shop.png"/>
@@ -2129,7 +2129,7 @@ Waypoint</text></img>
<icon src="golf.png"/>
</itemgra>
<itemgra item_types="poi_government_building" order="12-">
- <icon src="goverment_building.xpm"/>
+ <icon src="government_building.xpm"/>
</itemgra>
<itemgra item_types="poi_height" order="12-">
<icon src="height.xpm"/>
@@ -3856,7 +3856,7 @@ Waypoint</text></img>
<icon src="fish.xpm"/>
</itemgra>
<itemgra item_types="poi_forbidden_area" order="0-">
- <icon src="forbiden_area.xpm"/>
+ <icon src="forbidden_area.xpm"/>
</itemgra>
<itemgra item_types="poi_shop_gps" order="0-">
<icon src="garmin.xpm"/>
@@ -3865,7 +3865,7 @@ Waypoint</text></img>
<icon src="golf.png"/>
</itemgra>
<itemgra item_types="poi_government_building" order="0-">
- <icon src="goverment_building.xpm"/>
+ <icon src="government_building.xpm"/>
</itemgra>
<itemgra item_types="poi_height" order="0-">
<icon src="height.xpm"/>
@@ -5032,7 +5032,7 @@ Waypoint</text></img>
<icon src="danger_16_16.png" />
</itemgra>
<itemgra item_types="poi_forbidden_area" order="13-">
- <icon src="forbiden_area.png" />
+ <icon src="forbidden_area.png" />
</itemgra>
<itemgra item_types="poi_tunnel" order="12-">
<icon src="tunnel.png" />
@@ -5245,7 +5245,7 @@ Waypoint</text></img>
<icon src="fish.png" />
</itemgra>
<itemgra item_types="poi_forbidden_area" order="12-">
- <icon src="forbiden_area.png" />
+ <icon src="forbidden_area.png" />
</itemgra>
<itemgra item_types="poi_shop_gps" order="15-">
<icon src="garmin.png" />
@@ -5254,7 +5254,7 @@ Waypoint</text></img>
<icon src="golf.png" />
</itemgra>
<itemgra item_types="poi_government_building" order="12-">
- <icon src="goverment_building.png" />
+ <icon src="government_building.png" />
</itemgra>
<itemgra item_types="poi_height" order="12-">
<icon src="height.png" />
diff --git a/navit/script/osm/Geo/OSM/Planet.pm b/navit/script/osm/Geo/OSM/Planet.pm
index bedfdffc8..25c533eb7 100644
--- a/navit/script/osm/Geo/OSM/Planet.pm
+++ b/navit/script/osm/Geo/OSM/Planet.pm
@@ -196,7 +196,7 @@ sub mirror_planet(){
$current_file = $files[0];
if ( $DEBUG) {
- print STDERR "Choosen File: $current_file\n";
+ print STDERR "Chosen File: $current_file\n";
}
return undef unless $current_file;
diff --git a/navit/vehicle/file/vehicle_file.c b/navit/vehicle/file/vehicle_file.c
index 5a3be743a..868af4f57 100644
--- a/navit/vehicle/file/vehicle_file.c
+++ b/navit/vehicle/file/vehicle_file.c
@@ -842,7 +842,7 @@ vehicle_file_destroy(struct vehicle_priv *priv)
* @param type Attribute type called
* @param attr Structure to return the attribute value
*
-* @return 1 if ok, 0 for unkown or invalid attribute
+* @return 1 if ok, 0 for unknown or invalid attribute
*/
static int
vehicle_file_position_attr_get(struct vehicle_priv *priv,
@@ -920,7 +920,7 @@ vehicle_file_position_attr_get(struct vehicle_priv *priv,
* @param type Attribute type called
* @param attr Structure to return the attribute value
*
-* @return 1 if ok, 0 for unkown attribute
+* @return 1 if ok, 0 for unknown attribute
*/
static int
vehicle_file_sat_attr_get(void *priv_data, enum attr_type type, struct attr *attr)