Fix various typos

Add svn:ignore property to locale/templates


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@33598 15284696-431f-4ddb-bdfa-cd5b030d7da7

db/base/copy.c

@@ -34,7 +34,7 @@ int main(int argc, char **argv)
     module->keywords = _("database, attribute table, SQL");
     module->label = _("Copy a table.");
     module->description =
-	_("Either 'from_table' (optionaly with 'where') can be used "
+	_("Either 'from_table' (optionally with 'where') can be used "
 	  "or 'select' option, but not 'from_table' and 'select' at the same time.");
     
     from_driver = G_define_standard_option(G_OPT_DB_DRIVER);

display/d.grid/main.c

@@ -151,7 +151,7 @@ int main(int argc, char **argv)
 
     mark_type = MARK_GRID;
     if (cross->answer && fiducial->answer)
-	G_fatal_error(_("Chose a single mark style"));
+	G_fatal_error(_("Choose a single mark style"));
     if (cross->answer)
 	mark_type = MARK_CROSS;
     if (fiducial->answer)

display/d.thematic.area/main.c

@@ -75,7 +75,7 @@ int main(int argc, char **argv)
     module = G_define_module();
     module->keywords = _("display");
     module->description =
-	_("Displays a thematic vector area map in the active"
+	_("Displays a thematic vector area map in the active "
 	  "frame on the graphics monitor.");
 
     map_opt = G_define_standard_option(G_OPT_V_MAP);

doc/vector/v.example/main.c

@@ -164,7 +164,7 @@ int main(int argc, char *argv[])
 	    /* Now execute query */
 	    if (db_open_select_cursor(driver, &dbsql, &cursor, DB_SEQUENTIAL)
 		!= DB_OK)
-		G_warning(_("Unabale to get attribute data for cat %d"), cat);
+		G_warning(_("Unable to get attribute data for cat %d"), cat);
 	    else {
 		/* Result count */
 		nrows = db_get_num_rows(&cursor);

general/g.mapset/main.c

@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
     /* Check if the mapset is in use */
     gis_lock = getenv("GIS_LOCK");
     if (!gis_lock)
-	G_fatal_error(_("Unable to read GIS_LOCK enviroment variable"));
+	G_fatal_error(_("Unable to read GIS_LOCK environment variable"));
 
     G_asprintf(&lock_prog, "%s/etc/lock", G_gisbase());
 

general/g.proj/datumtrans.c

@@ -86,7 +86,7 @@ int set_datumtrans(int datumtrans, int force)
 
 	    if (datumtrans > paramsets)
 		G_fatal_error
-		    ("Invalid tranformation number %d; valid range is 1 to %d",
+		    ("Invalid transformation number %d; valid range is 1 to %d",
 		     datumtrans, paramsets);
 
 	    list = GPJ_get_datum_transform_by_name(datum);

gui/wxpython/gui_modules/menudata.py

@@ -1835,7 +1835,7 @@ class Data:
                                 ("","","", ""),
 
                                 (_("Copy table"),
-                                 _("Copy a table. Either 'from_table' (optionaly with 'where') can be used or 'select' option, but not 'from_table' and 'select' at the same time."),
+                                 _("Copy a table. Either 'from_table' (optionally with 'where') can be used or 'select' option, but not 'from_table' and 'select' at the same time."),
                                  "self.OnMenuCmd",
                                  "db.copy"),
 

gui/wxpython/gui_modules/nviz_tools.py

@@ -578,9 +578,9 @@ class NvizToolWindow(wx.Frame):
         gridSizer.Add(item=display, flag=wx.ALIGN_CENTER_VERTICAL,
                       pos=(0, 7))
 
-        # hight
+        # height
         gridSizer.Add(item=wx.StaticText(parent=panel, id=wx.ID_ANY,
-                                         label=_("Hight above surface:")),
+                                         label=_("Height above surface:")),
                       pos=(1, 0), flag=wx.ALIGN_CENTER_VERTICAL,
                       span=(1, 2))
         
@@ -685,7 +685,7 @@ class NvizToolWindow(wx.Frame):
 
         # high
         gridSizer.Add(item=wx.StaticText(parent=panel, id=wx.ID_ANY,
-                                         label=_("Hight above surface:")),
+                                         label=_("Height above surface:")),
                       pos=(1, 0), flag=wx.ALIGN_CENTER_VERTICAL,
                       span=(1, 2))
         
@@ -1211,7 +1211,7 @@ class NvizToolWindow(wx.Frame):
 
         # icon width
         gridSizer.Add(item=wx.StaticText(parent=panel, id=wx.ID_ANY,
-                                         label=_("Witdh:")),
+                                         label=_("Width:")),
                       pos=(row, 2), flag=wx.ALIGN_CENTER_VERTICAL)
         
         iwidth = wx.SpinCtrl(parent=panel, id=wx.ID_ANY, size=(65, -1),

gui/wxpython/gui_modules/render.py

@@ -360,7 +360,7 @@ class Map(object):
         #
         # environment settings
         #
-        # enviroment variables, like MAPSET, LOCATION_NAME, etc.
+        # environment variables, like MAPSET, LOCATION_NAME, etc.
         self.env         = {}
         # path to external gisrc
         self.gisrc = gisrc
@@ -560,7 +560,7 @@ class Map(object):
         """
         Get region settings (g.region -upgc)
 
-        Optionaly extent, raster or vector map layer can be given.
+        Optionally extent, raster or vector map layer can be given.
 
         @param rast raster name or None
         @param vect vector name or None

gui/wxpython/gui_modules/toolbars.py

@@ -413,7 +413,7 @@ class VDigitToolbar(AbstractToolbar):
         # only one dialog can be open
         self.settingsDialog   = None
 
-        # create toolbars (two rows optionaly)
+        # create toolbars (two rows optionally)
         self.toolbar = []
         self.numOfRows = 1 # number of rows for toolbar
         for row in range(0, self.numOfRows):
@@ -1144,7 +1144,7 @@ class VDigitToolbar(AbstractToolbar):
         Update list of available vector map layers.
         This list consists only editable layers (in the current mapset)
 
-        Optionaly also update toolbar
+        Optionally also update toolbar
         """
 
         Debug.msg (4, "VDigitToolbar.UpdateListOfLayers(): updateTool=%d" % \

gui/wxpython/gui_modules/toolbox.py

@@ -14,7 +14,7 @@ test_config = """
 </qgisgrass>
 """
 test_modules = {"g.gisenv":"""
-<qgisgrassmodule label="GRASS enviroment variables" module="g.gisenv">
+<qgisgrassmodule label="GRASS environment variables" module="g.gisenv">
 </qgisgrassmodule>
 ""","r.to.vect.area":"""
 <qgisgrassmodule label="Convert a raster to vector areas" module="r.to.vect">

imagery/i.ortho.photo/photo.2image/main.c

@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
 	group.photo_points.count = 0;
     G_suppress_warnings(0);
 
-    /* determine tranformation equation */
+    /* determine transformation equation */
     Compute_equation();
 
     signal(SIGINT, SIG_IGN);

imagery/i.ortho.photo/photo.2image/where.c

@@ -57,7 +57,7 @@ static int where_am_i(View * view, int x, int y, Window * w1, double *E,
     sprintf(buf, "North: %10.2f", n1);
     Curses_write_window(w1, 4, 3, buf);
 
-    /* if tranformation equation is useable, determine point via equation */
+    /* if transformation equation is useable, determine point via equation */
     if (group.ref_equation_stat <= 0)
 	return 1;
 

imagery/i.ortho.photo/photo.2target/main.c

@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
 	    G_warning(msg);
 	}
 
-    /* get target info and enviroment */
+    /* get target info and environment */
     G_suppress_warnings(1);
     get_target();
     find_target_files();
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
     }
     G_suppress_warnings(0);
 
-    /* determine tranformation equation */
+    /* determine transformation equation */
     Compute_ref_equation();
 
     /* read group control points, format: image x,y,cfl; target E,N,Z */
@@ -169,7 +169,7 @@ int main(int argc, char *argv[])
 			 &group.control_points, group.E12, group.N12);
     ********/
 
-    /* determine tranformation equation */
+    /* determine transformation equation */
     fprintf(stderr, "Computing equations ...\n");
     if (group.control_points.count > 0)
 	Compute_ortho_equation();

imagery/i.ortho.photo/photo.2target/where.c

@@ -51,7 +51,7 @@ static int where_am_i(View * view, int x, int y, Window * w1, double *E,
     sprintf(buf, "IMAGE Y: %10.2f", n1);
     Curses_write_window(w1, 4, 3, buf);
 
-    /* if tranformation equation is useable, determine point via equation */
+    /* if transformation equation is useable, determine point via equation */
     if (group.ref_equation_stat <= 0)
 	return 1;
 

imagery/i.points/main.c

@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
     /* write group files to group list file */
     prepare_group_list();
 
-    /* get target info and enviroment */
+    /* get target info and environment */
     get_target();
     find_target_files();
 
@@ -113,7 +113,7 @@ int main(int argc, char *argv[])
 	group.points.count = 0;
     G_suppress_warnings(0);
 
-    /* determine tranformation equation */
+    /* determine transformation equation */
     Compute_equation();
 
 

imagery/i.vpoints/drawvect.c

@@ -46,7 +46,7 @@ int warpvect(double E[], double N[], int trans_order)
 
 static int drawvect(int zoomit,	/* -1 = refresh, 0 = new image, 1 = zoom, 2 = warp */
 		    View * zoom_view, double E[], double N[], int trans_order)
-{				/* order of tranformation if warping vectors */
+{				/* order of transformation if warping vectors */
     int stat = 0;
     int i;
     char name[GNAME_MAX], mapset[GMAPSET_MAX];

imagery/i.vpoints/main.c

@@ -98,7 +98,7 @@ int main(int argc, char *argv[])
     /* write group files to group list file */
     prepare_group_list();
 
-    /* get target info and enviroment */
+    /* get target info and environment */
     get_target();
     find_target_files();
 
@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
 	group.points.count = 0;
     G_suppress_warnings(0);
 
-    /* determine tranformation equation */
+    /* determine transformation equation */
     CRS_Compute_equation(1);
 
     signal(SIGINT, SIG_IGN);

imagery/i.vpoints/where.c

@@ -54,7 +54,7 @@ static int where_am_i(View * view, int x, int y, Window * w1,
     sprintf(buf, "N = %10.2f", n1);
     Curses_write_window(INFO_WINDOW, 18, 3, buf);
 
-    /* if tranformation equation is useable, determine point via equation */
+    /* if transformation equation is useable, determine point via equation */
     if (group.equation_stat <= 0 || windnum == 2) {
 	Curses_write_window(INFO_WINDOW, 15, 18, "           ");
 	Curses_write_window(INFO_WINDOW, 17, 18, "                 ");

lib/db/dbmi_client/copy_tab.c

@@ -154,7 +154,7 @@ int db__copy_table(const char *from_drvname, const char *from_dbname,
 	const char *tblname = db_get_string(&tblnames[i]);
 
 	if (strcmp(to_tblname, tblname) == 0) {
-	    G_warning(_("Table <%s> already existsin database <%s>"),
+	    G_warning(_("Table <%s> already exists in database <%s>"),
 		      to_dbname, to_dbname);
 	    db_close_database_shutdown_driver(to_driver);
 	    if (from_driver != to_driver)

lib/db/dbmi_client/start.c

@@ -56,7 +56,7 @@ dbDriver *db_start_driver(const char *name)
     int stdin_fd, stdout_fd;
 #endif
 
-    /* Set some enviroment variables which are later read by driver.
+    /* Set some environment variables which are later read by driver.
      * This is necessary when application is running without GISRC file and all
      * gis variables are set by application. 
      * Even if GISRC is set, application may change some variables during runtime,
@@ -82,7 +82,7 @@ dbDriver *db_start_driver(const char *name)
     }
     else {
 	/* Warning: GISRC_MODE_MEMORY _must_ be set to G_GISRC_MODE_FILE, because the module can be 
-	 *          run from an application which previously set enviroment variable to G_GISRC_MODE_MEMORY */
+	 *          run from an application which previously set environment variable to G_GISRC_MODE_MEMORY */
 	sprintf(ebuf, "%d", G_GISRC_MODE_FILE);
 	G_putenv("GRASS_DB_DRIVER_GISRC_MODE", ebuf);
     }

lib/db/dbmi_driver/driver.c

@@ -44,7 +44,7 @@ int db_driver(int argc, char *argv[])
     FILE *send, *recv;
     char *modestr;
 
-    /* Read and set enviroment variables, see dbmi_client/start.c */
+    /* Read and set environment variables, see dbmi_client/start.c */
     if ((modestr = getenv("GRASS_DB_DRIVER_GISRC_MODE"))) {
 	int mode;
 

lib/gis/cats.c

@@ -52,7 +52,7 @@
  *       a blank line for the fmt will effectively suppress automatic
  *       label generation
  *
- * Note: quant rules of Categories structures are heavily dependant
+ * Note: quant rules of Categories structures are heavily dependent
  * on the fact that rules are stored in the same order they are entered.
  * since i-th rule and i-th label are entered at the same time, we
  * know that i-th rule maps fp range to i, thus we know for sure

lib/gis/env.c

@@ -256,7 +256,7 @@ static FILE *open_env(const char *mode, int loc)
 }
 
 /**
-   \brief Get enviroment variable
+   \brief Get environment variable
 
    Calls G_fatal_error() if name not set.
 

lib/gis/error.c

@@ -67,7 +67,7 @@ static int vfprint_error(int type, const char *template, va_list ap)
 /*!
  * \brief Print a message to stderr
  *
- * The output format depends on enviroment variable GRASS_MESSAGE_FORMAT
+ * The output format depends on environment variable GRASS_MESSAGE_FORMAT
  *
  * \param msg string (cannot be NULL)
  */
@@ -87,7 +87,7 @@ void G_message(const char *msg, ...)
 /*!
  * \brief Print a message to stderr but only if module is in verbose mode
  *
- * The output format depends on enviroment variables
+ * The output format depends on environment variables
  *  GRASS_MESSAGE_FORMAT and GRASS_VERBOSE
  *
  * \param msg string (cannot be NULL)
@@ -111,7 +111,7 @@ void G_verbose_message(const char *msg, ...)
  * Ususally just G_percent()/G_clicker() would be shown at this level.
  * This allows important non-error/warning messages to display as well.
  *
- * The output format depends on enviroment variables
+ * The output format depends on environment variables
  *  GRASS_MESSAGE_FORMAT and GRASS_VERBOSE
  *
  * \param msg string (cannot be NULL)
@@ -132,7 +132,7 @@ void G_important_message(const char *msg, ...)
 /*!
  * \brief Print a fatal error message to stderr
  * 
- * The output format depends on enviroment variable
+ * The output format depends on environment variable
  * GRASS_MESSAGE_FORMAT
  *
  * By default, the message is handled by an internal routine which
@@ -161,7 +161,7 @@ int G_fatal_error(const char *msg, ...)
 /*!
  * \brief Print a warning message to stderr
  * 
- * The output format depends on enviroment variable
+ * The output format depends on environment variable
  * GRASS_MESSAGE_FORMAT
  *
  * A warning message can be suppressed by G_suppress_warnings()
@@ -246,7 +246,7 @@ int G_unset_error_routine(void)
     return 0;
 }
 
-/* Print info to stderr and optionaly to log file and optionaly send mail */
+/* Print info to stderr and optionally to log file and optionally send mail */
 static int print_error(const char *msg, const int type)
 {
     static char *prefix_std[3];

lib/gis/get_window.c

@@ -50,7 +50,7 @@ int G_get_window(struct Cell_head *window)
     static struct Cell_head dbwindow;
     char *regvar;
 
-    /* Optionaly read the region from enviroment variable */
+    /* Optionally read the region from environment variable */
     regvar = getenv("GRASS_REGION");
 
     if (regvar) {

lib/gis/gisinit.c

@@ -135,7 +135,7 @@ static int gisinit(void)
     /* Set masking flag unknown */
     G__.auto_mask = -1;
 
-    /* set architecture dependant bit patterns for embeded null vals */
+    /* set architecture dependent bit patterns for embeded null vals */
     G__init_null_patterns();
 
     initialized = 1;

lib/gpde/N_arrays_io.c

@@ -224,17 +224,17 @@ void N_write_array_2d_to_rast(N_array_2d * array, char *name)
 	if (type == CELL_TYPE)
 	    if (!G_put_c_raster_row(map, rast)) {
 		G_unopen_cell(map);	/*unopen the new raster map */
-		G_fatal_error(_("Unable to write rast row %i"), y);
+		G_fatal_error(_("Unable to write raster row %i"), y);
 	    }
 	if (type == FCELL_TYPE)
 	    if (!G_put_f_raster_row(map, frast)) {
 		G_unopen_cell(map);	/*unopen the new raster map */
-		G_fatal_error(_("Unable to write rast row %i"), y);
+		G_fatal_error(_("Unable to write raster row %i"), y);
 	    }
 	if (type == DCELL_TYPE)
 	    if (!G_put_d_raster_row(map, drast)) {
 		G_unopen_cell(map);	/*unopen the new raster map */
-		G_fatal_error(_("Unable to write rast row %i"), y);
+		G_fatal_error(_("Unable to write raster row %i"), y);
 	    }
     }
 

lib/ogsf/gsd_legend.c

@@ -520,7 +520,7 @@ GLuint gsd_put_legend(const char *name, GLuint fontbase, int size, int *flags,
 		    G_get_color((CELL) tdcell, &red, &green, &blue, &colors);
 
 		RGB_TO_INT(red, green, blue, colr);
-		if (discrete) {	/* draw black-white-black seperator */
+		if (discrete) {	/* draw black-white-black separator */
 		    if (k > 0) {
 			*dv1 -= 2. * incr;
 			*dv2 -= 2. * incr;

lib/proj/convert.c

@@ -437,7 +437,7 @@ int GPJ_osr_to_grass(struct Cell_head *cellhd, struct Key_Value **projinfo,
 				   "You may want to look into this."), datum);
 		    else if (datumtrans > paramsets) {
 
-			G_warning(_("Invalid tranformation number %d; valid range is 1 to %d. "
+			G_warning(_("Invalid transformation number %d; valid range is 1 to %d. "
 				   "Leaving datum transform parameters unspecified."),
 				  datumtrans, paramsets);
 			datumtrans = 0;

lib/sites/sites.c

@@ -1041,7 +1041,7 @@ FILE *G_oldsites_open_new(const char *name)
 /*********************************************/
 
 char *G_site_format(const Site * s, const char *fs, int id)
-/* sprintf analog to G_site_put with the addition of a field seperator fs 
+/* sprintf analog to G_site_put with the addition of a field separator fs 
    and option of printing site attribute identifiers
  */
 {

lib/vector/Vlib/area.c

@@ -50,7 +50,7 @@ Vect_get_area_points(struct Map_info *Map,
     Area = Plus->Area[area];
 
     if (Area == NULL) {		/* dead area */
-	G_warning(_("Attempt to read points of nonexisting area"));
+	G_warning(_("Attempt to read points of nonexistent area"));
 	return -1;		/* error , because we should not read dead areas */
     }
 

lib/vector/Vlib/break_lines.c

@@ -46,7 +46,7 @@ Vect_break_lines(struct Map_info *Map, int type, struct Map_info *Err,
    \brief Break selected lines in vector map at each intersection.
 
    Breaks selected lines specified by type in vector map. Points at
-   intersections may be optionaly written to error map. Input vector map
+   intersections may be optionally written to error map. Input vector map
    must be opened on level 2 for update at least on GV_BUILD_BASE.
 
    The function also breaks lines forming collapsed loop, for example

lib/vector/Vlib/break_polygons.c

@@ -44,7 +44,7 @@ void srch(int id, int *arg)
 /*!
    \brief Break polygons in vector map.
 
-   Breaks lines specified by type in vector map. Points at intersections may be optionaly 
+   Breaks lines specified by type in vector map. Points at intersections may be optionally 
    written to error map. Input map must be opened on level 2 for update at least on GV_BUILD_BASE.
 
    Function is optimized for closed polygons rigs (e.g. imported from OGR) but with clean geometry -

lib/vector/Vlib/bridges.c

@@ -32,7 +32,7 @@ remove_bridges(struct Map_info *Map, int chtype, struct Map_info *Err,
    Remove bridges (type boundary) connecting areas to islands or 2 islands.
    Islands and areas must be already clean, i.e. without dangles.
    Bridge may be formed by more lines.
-   Optionaly deleted bridges are written to error map. 
+   Optionally deleted bridges are written to error map. 
    Input map must be opened on level 2 for update at least on level GV_BUILD_BASE
 
    \param Map input map where bridges are deleted
@@ -54,7 +54,7 @@ Vect_remove_bridges(struct Map_info *Map, struct Map_info *Err, FILE * msgout)
    Change the type of bridges (type boundary) connecting areas to islands or 2 islands.
    Islands and areas must be already clean, i.e. without dangles.
    Bridge may be formed by more lines.
-   Optionaly changed bridges are written to error map. 
+   Optionally changed bridges are written to error map. 
    Input map must be opened on level 2 for update at least on level GV_BUILD_BASE.
 
    \param Map input map where bridges are changed

lib/vector/Vlib/buffer.c

@@ -117,7 +117,7 @@ static int point_in_buf(struct line_pnts *Points, double px, double py,
 /* clean_parallel - clean parallel line created by parallel_line:
  ** - looking for loops and if loop doesn't contain any other loop
  **   and centroid of loop is in buffer removes this loop (repeated)
- ** - optionaly removes all end points in buffer
+ ** - optionally removes all end points in buffer
  *    parameters:
  *      Points - parallel line
  *      origPoints - original line

lib/vector/Vlib/build.c

@@ -93,7 +93,7 @@ int Vect_get_built(struct Map_info *Map)
 
    Should only be used in special cases of vector processing.
 
-   This functions optionaly builds only some parts of topology. Highest level is specified by build
+   This functions optionally builds only some parts of topology. Highest level is specified by build
    parameter which may be:
    - GV_BUILD_NONE - nothing is build;
    - GV_BUILD_BASE - basic topology, nodes, spatial index;

lib/vector/Vlib/build_nat.c

@@ -148,7 +148,7 @@ int Vect_isle_find_area(struct Map_info *Map, int isle)
     plus = &(Map->plus);
 
     if (plus->Isle[isle] == NULL) {
-	G_warning(_("Request to find area outside nonexisting isle"));
+	G_warning(_("Request to find area outside nonexistent isle"));
 	return 0;
     }
 

lib/vector/Vlib/dangles.c

@@ -39,7 +39,7 @@ static void dangles(struct Map_info *, int, int, double,
    such string of lines is taken as one dangle and either deleted are
    all parts or nothing.
 
-   Optionaly deleted dangles are written to error map. 
+   Optionally deleted dangles are written to error map. 
 
    Input map must be opened on level 2 for update.
 
@@ -67,7 +67,7 @@ Vect_remove_dangles(struct Map_info *Map, int type, double maxlength,
    no other boundary.  If a dangle is formed by more boundaries, such
    string of boundaries is taken as one dangle.
 
-   Optionaly deleted dangles are written to error map. 
+   Optionally deleted dangles are written to error map. 
 
    Input map must be opened on level 2 for update at least on GV_BUILD_BASE.
 
@@ -114,9 +114,9 @@ Vect_select_dangles(struct Map_info *Map, int type, double maxlength,
    Line is considered to be a dangle if on at least one end node is no
    other line of given type(s). If a dangle is formed by more lines,
    such string of lines is taken as one dangle and either deleted are
-   all parts or nothing.  Optionaly, if chtype is set to 1, only
+   all parts or nothing.  Optionally, if chtype is set to 1, only
    GV_BOUNDARY are checked for dangles, and if dangle is found lines
-   are not deleted but rewritten with type GVLINE.  Optionaly deleted
+   are not deleted but rewritten with type GVLINE.  Optionally deleted
    dangles are written to error map.  Input map must be opened on level
    2 for update at least on GV_BUILD_BASE.
 

lib/vector/Vlib/remove_duplicates.c

@@ -25,7 +25,7 @@
 /*!
    \brief Remove duplicate lines from vector map.
 
-   Remove duplicate lines of given types from vector map. Duplicate lines may be optionaly 
+   Remove duplicate lines of given types from vector map. Duplicate lines may be optionally 
    written to error map. Input map must be opened on level 2 for update. Categories are merged.
 
    \param Map vector map where duplicate lines will be deleted

lib/vector/Vlib/snap.c

@@ -55,7 +55,7 @@ int add_item(int id, struct ilist *list)
  * 
  * \warning Lines are not necessarily snapped to nearest vertex, but to vertex in threshold! 
  *
- * Lines showing how vertices were snapped may be optionaly written to error map. 
+ * Lines showing how vertices were snapped may be optionally written to error map. 
  * Input map must be opened on level 2 for update at least on GV_BUILD_BASE.
  *
  * \param[in] Map input map where vertices will be snapped

lib/vector/diglib/plus_struct.c

@@ -25,7 +25,7 @@
  * if you dont want it written out, then dont call these routines
  * ie  check for deleted status before calling a write routine
  * in as much as it would be nice to hide that code in here,
- * this is a library routine and we chose to make it dependant on
+ * this is a library routine and we chose to make it dependent on
  * as few external files as possible 
  */
 

raster/r.gwflow/main.c

@@ -147,7 +147,7 @@ void set_params(void)
     param.river_bed->type = TYPE_STRING;
     param.river_bed->required = NO;
     param.river_bed->gisprompt = "old,raster,raster";
-    param.river_bed->description = _("The hight of the river bed in [m]");
+    param.river_bed->description = _("The height of the river bed in [m]");
 
     param.river_head = G_define_option();
     param.river_head->key = "river_head";
@@ -170,7 +170,7 @@ void set_params(void)
     param.drain_bed->type = TYPE_STRING;
     param.drain_bed->required = NO;
     param.drain_bed->gisprompt = "old,raster,raster";
-    param.drain_bed->description = _("The hight of the drainage bed in [m]");
+    param.drain_bed->description = _("The height of the drainage bed in [m]");
 
     param.drain_leak = G_define_option();
     param.drain_leak->key = "drain_leak";

raster/r.le/r.le.patch/patch.c

@@ -1594,7 +1594,7 @@ int in_group(double att, float *group, int r)
 
     /*Variables
        EXTERNAL
-       recl_count = an array containg the number of elements in each
+       recl_count = an array containing the number of elements in each
        row of the reclass table
        IN
        att     = the attribute value

raster/r.out.arc/main.c

@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
     flag.noheader->key = 'h';
     flag.noheader->description = _("Suppress printing of header information");
 
-    /* Added to optionaly produce a single line output.     -- emes -- 12.10.92 */
+    /* Added to optionally produce a single line output.     -- emes -- 12.10.92 */
     flag.singleline = G_define_flag();
     flag.singleline->key = '1';
     flag.singleline->description =

raster/r.out.gdal/main.c

@@ -336,12 +336,12 @@ int import_band(GDALDatasetH hMEMDS, int band, const char *name,
 
     if (n_nulls > 0) {
 	if (maptype == CELL_TYPE)
-	    G_warning(_("Input raster map constains cells with NULL-value (no-data). "
+	    G_warning(_("Input raster map contains cells with NULL-value (no-data). "
 		       "The value %d was used to represent no-data values in the input map."
 		       "You can specify nodata value by %s parameter."),
 		      (int)nodataval, nodatakey);
 	else
-	    G_warning(_("Input raster map constains cells with NULL-value (no-data). "
+	    G_warning(_("Input raster map contains cells with NULL-value (no-data). "
 		       "The value %g was used to represent no-data values in the input map."
 		       "You can specify nodata value by %s parameter."),
 		      nodataval, nodatakey);

raster/r.to.vect/main.c

@@ -243,7 +243,7 @@ int main(int argc, char *argv[])
 	Vect_build(&Map, stderr);
 
 
-    /* insert cats and optionaly labels if raster cats were used */
+    /* insert cats and optionally labels if raster cats were used */
     if (driver && value_flag) {
 	char buf[1000];
 	int c, i, cat, fidx, ncats, lastcat, tp, id;

scripts/d.vect.thematic/d.vect.thematic

@@ -17,7 +17,7 @@
 
 
 #%Module
-#%  description: Displays thematic vectormap
+#%  description: Displays thematic vector map
 #%  keywords: display, legend
 #%End
 #%option

scripts/r.tileset/r.tileset

@@ -107,7 +107,7 @@
 #%option
 #% key: fs
 #% type: string
-#% description: Output field seperator
+#% description: Output field separator
 #% answer:|
 #%end
 #%option

scripts/v.what.vect/v.what.vect

@@ -51,7 +51,7 @@
 #%option
 #% key: qlayer
 #% type: integer
-#% description: Layer of the query vector containg data
+#% description: Layer of the query vector containing data
 #% answer: 1
 #% required : no
 #%end

scripts/v.what.vect/v.what.vect.py

@@ -50,7 +50,7 @@
 #%option
 #% key: qlayer
 #% type: integer
-#% description: Layer of the query vector containg data
+#% description: Layer of the query vector containing data
 #% answer: 1
 #% required : no
 #%end

vector/v.clean/proto.h

@@ -10,7 +10,7 @@
 #define TOOL_PRUNE   10		/* remove vertices in threshold from lines and boundaries */
 #define TOOL_RMAREA  11		/* remove small areas */
 #define TOOL_RMSA    12		/* remove small angles between lines at nodes */
-#define TOOL_RMLINE  13		/* remove all line or boudaries of zero length */
+#define TOOL_RMLINE  13		/* remove all line or boundaries of zero length */
 
 #define SEP \
     "--------------------------------------------------"

vector/v.distance/main.c

@@ -426,7 +426,7 @@ int main(int argc, char *argv[])
 		     && (fctype == DB_C_TYPE_STRING ||
 			 fctype == DB_C_TYPE_DATETIME))
 		    ) {
-		    G_fatal_error(_("Incomatible column types"));
+		    G_fatal_error(_("Incompatible column types"));
 		}
 	    }
 	}

vector/v.edit/a2b.c

@@ -274,7 +274,7 @@ int read_head(FILE * dascii, struct Map_info *Map)
 }
 
 /**
-   \brief Close lines (boudaries)
+   \brief Close lines (boundaries)
    
    Using threshold distance (-1 for no limit)
    

vector/v.edit/args.c

@@ -170,7 +170,7 @@ int parser(int argc, char *argv[], struct GParams *params,
 	_("For 'shorter' use negative threshold value, "
 	  "positive value for 'longer'");
     params->query->descriptions =
-	_("length;Select only lines or boudaries shorter"
+	_("length;Select only lines or boundaries shorter"
 	  "/longer than threshold distance;"
 	  "dangle;Select dangles shorter/longer than " "threshold distance");
     params->query->guisection = _("Query");

vector/v.label.sa/main.c

@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
 
     p.hlcolor = G_define_option();
     p.hlcolor->key = "hcolor";
-    p.hlcolor->description = _("Hilight color for text");
+    p.hlcolor->description = _("Highlight color for text");
     p.hlcolor->type = TYPE_STRING;
     p.hlcolor->answer = "none";
     p.hlcolor->options =