Skip to content

Commit

Permalink
Spell checking: fixed typos (#2862)
Browse files Browse the repository at this point in the history
Fixed typos in entire source code tree using `utils/fix_typos.sh`:

- typos fixed in C/CPP, Python, HTML, Markdown, other text files
- gettext messages updated accordingly to not break translations
- gettext `.pot` files regenerated:
    -  `cd locale/po/`
    - `make pot`
- `.po` files trimmed for (now) duplicate messages and unused fuzzy messages:
    -  `cd locale/po/`
    - `for i in `ls gr*.po` ; do POFILE=$i ; msgattrib --output-file=$i --no-obsolete $POFILE ; done`
- updated `utils/fix_typos.sh`
  • Loading branch information
neteler committed Feb 27, 2023
1 parent abcba9a commit a82501d
Show file tree
Hide file tree
Showing 575 changed files with 194,226 additions and 115,871 deletions.
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ confidence=
# can either give multiple identifiers separated by comma (,) or put this
# option multiple times (only on the command line, not in the configuration
# file where it should appear only once). You can also use "--disable=all" to
# disable everything first and then reenable specific checks. For example, if
# disable everything first and then re-enable specific checks. For example, if
# you want to run only the similarities checker, you can use "--disable=all
# --enable=similarities". If you want to run only the classes checker, but have
# no Warning level messages displayed, use "--disable=all --enable=classes
Expand Down
2 changes: 1 addition & 1 deletion aclocal.m4
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ AC_DEFUN([SC_ENABLE_SHARED], [
# into a shared C++ library. Make sure "IS_CXX = yes"
# is set in the library's Makefile.
# SHLIB_LD_FLAGS -Flags to pass when building a shared library. This
# differes from the SHLIB_CFLAGS as it is not used
# differs from the SHLIB_CFLAGS as it is not used
# when building object files or executables.
# SHLIB_LD_LIBS - Dependent libraries for the linker to scan when
# creating shared libraries. This symbol typically
Expand Down
2 changes: 1 addition & 1 deletion db/drivers/odbc/describe.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ dbTable **table;
SQLRETURN ret;
SQLCHAR charval[100];

/* get the number of colummns */
/* get the number of columns */
ret = SQLNumResultCols(stmt, &ncols);
if ((ret != SQL_SUCCESS) && (ret != SQL_SUCCESS_WITH_INFO)) {
db_d_append_error("SQLNumResultCols()");
Expand Down
2 changes: 1 addition & 1 deletion display/d.colortable/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ int main(int argc, char **argv)

/* Color ramp box */
/* get separate color for each pixel */
/* fisrt 5 pixels draw null color */
/* first 5 pixels draw null color */
y_box[1] = -1;
y_box[3] = 1;
x_box[2] = (dots_per_col - 6);
Expand Down
2 changes: 1 addition & 1 deletion display/d.grid/plot.c
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ int plot_geogrid(double size, struct pj_info *info_in, struct pj_info *info_out,
}

/******************************************************
* initialze projection stuff and return proj structures
* initialize projection stuff and return proj structures
********************************************************/
void init_proj(struct pj_info *info_in, struct pj_info *info_out,
struct pj_info *info_trans, int wgs84)
Expand Down
2 changes: 1 addition & 1 deletion display/d.legend.vect/draw.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* draw.c:
*
* With do_bg=1 compute position of all legend graphic item and draw only
* background. Eith do_bg=0 compute position of all legend graphic item and draw
* background. With do_bg=0 compute position of all legend graphic item and draw
* all.
*
* Copyright (C) 2016 by Adam Laza, GSoC 2016, and the GRASS Development Team
Expand Down
4 changes: 2 additions & 2 deletions display/d.legend/draw.c
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines,
}

/* center really tiny legends */
if (opt_at->answer == NULL) { /* if defualt scaling */
if (opt_at->answer == NULL) { /* if default scaling */
if (!do_smooth &&
(dots_per_line < 4)) /* if so small that there's no box */
if ((b - (dots_per_line * lines)) / (b * 1.0) >
Expand Down Expand Up @@ -1086,7 +1086,7 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines,
titsiz = tit_fontsize;

/* scale text to fit in window if position not manually set */
if (opt_at->answer == NULL) { /* ie defualt scaling */
if (opt_at->answer == NULL) { /* ie default scaling */
ScaleFactor = ((true_r - true_l) /
((MaxLabelLen + 3) * txsiz *
0.81)); /* ?? txsiz*.81=actual text width. */
Expand Down
2 changes: 1 addition & 1 deletion display/d.linegraph/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ int main(int argc, char **argv)
y_range_opt = G_define_option();
y_range_opt->key = "y_range";
y_range_opt->description =
_("Minimum and maximun value for Y axis (min,max)");
_("Minimum and maximum value for Y axis (min,max)");
y_range_opt->type = TYPE_DOUBLE;
y_range_opt->key_desc = "min,max";
y_range_opt->required = NO;
Expand Down
4 changes: 2 additions & 2 deletions display/d.rast.num/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
*
* This program used Dgrid's sources as a beginning. Purpose of Dnumber
* is to read the cell layer displayed on the graphics monitor and number
* them, if the cell value is other than 0 in an acending order.
* them, if the cell value is other than 0 in an ascending order.
* d.rast.num draws a number on the graphic display
* of each cell, so the cell number could be identified when using hydrologic
* models such AGNPS which uses the cell number for all its correspondance.
* models such AGNPS which uses the cell number for all its correspondence.
*
*/

Expand Down
2 changes: 1 addition & 1 deletion display/d.vect.thematic/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ int main(int argc, char **argv)

nclass = atoi(nbclass_opt->answer);
nbreaks = nclass - 1; /* we need one less classbreaks (min and
* max exluded) than classes */
* max excluded) than classes */

breakpoints = (double *)G_malloc((nbreaks) * sizeof(double));
for (i = 0; i < nbreaks; i++)
Expand Down
2 changes: 1 addition & 1 deletion display/d.vect/shape.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ int display_shape(struct Map_info *Map, int type, struct cat_list *Clist,
db_set_error_handler_driver(driver);
}

/* fisrt search for color table */
/* first search for color table */
have_colors =
Vect_read_colors(Vect_get_name(Map), Vect_get_mapset(Map), &colors);
if (have_colors && rgb_column) {
Expand Down
2 changes: 1 addition & 1 deletion doc/development/rfc/PSC_guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ exists for the purpose of PSC discussions. When a
decision is required of the PSC, it will be presented by any member to the
mailing list in the form of a proposal. A decision will then be achieved
by discussion of the proposal on the mailing list until a consensus is
reached. Voting on issues is also permissable and may be used as a means
reached. Voting on issues is also permissible and may be used as a means
to reach a consensus or, only in case of extreme cases of disagreement, to
force a decision. Any member may call a vote on any proposal. The voting
procedure is outlined in a separate document:
Expand Down
2 changes: 1 addition & 1 deletion doc/development/submitting/docs.md
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ pages as raster images (i.e. PNGs) for portability but the original format

Adding the image to the HTML page (r.viewshed example, the screenshot is shown
with a width of 600 pixel but it is clickable in the manual page). If a larger
image is displayed as shrinked, both **width** and **height** HTML parameters
image is displayed as shrunk, both **width** and **height** HTML parameters
(values must be calculated according to the picture size!) should be set:

```html
Expand Down
2 changes: 1 addition & 1 deletion doc/development/submitting/python.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ to do both Black formatting and Flake8 file validation.
The correct editor settings for Python indentation

- [​Geany](https://www.geany.org/) editor:
- Edit > Preferences > Editor > Intentation tab > Type: Spaces
- Edit > Preferences > Editor > Indentation tab > Type: Spaces
- [​PyCharm](https://www.jetbrains.com/pycharm/) IDE:
- already fine and includes code-linting
- [​atom](https://atom.io/) IDE:
Expand Down
2 changes: 1 addition & 1 deletion doc/development/submitting/submitting_c.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ first)
Use function names which fulfill the official GNU naming convention:
<https://www.gnu.org/prep/standards/html_node/Names.html#Names>

Instead of naming a function like: MyNewFunction() use underscores for seperation
Instead of naming a function like: MyNewFunction() use underscores for separation
and lower case letters: my_new_function()`.

### Comments
Expand Down
2 changes: 1 addition & 1 deletion doc/gui/wxpython/example/frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ def ComputeStatitistics(self):
return gcore.parse_key_val(res, val_type=float)

def UpdateStatistics(self):
"""!Upadate statistic information.
"""!Update statistic information.
Called after changing raster map.
"""
Expand Down
2 changes: 1 addition & 1 deletion doc/infrastructure.md
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ Procedure building of binaries (Windows):

* Addons module are compiled on build server, currently at the CTU in Prague) and
publishing their manual pages on publishing server, i.e. grass.osgeo.org.
* A new compilation is triggered everytime when a commit is done in the Addons-SVN.
* A new compilation is triggered every time when a commit is done in the Addons-SVN.
* Logs:
* Linux log files: <https://grass.osgeo.org/addons/grass7/logs> (compiled on
`grasslxd` on `osgeo7`)
Expand Down
2 changes: 1 addition & 1 deletion doc/python/raster_example_ctypes.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

# FIXME: as an example it should make extensive use of code comments and document
# each and every step along the way. (e.g. explain c_char_p().value memory pointer
# to string conversion for Python programmers not familar with C pointers)
# to string conversion for Python programmers not familiar with C pointers)
#
# FIXME: explain at a basic level what ctypes is & does.

Expand Down
12 changes: 6 additions & 6 deletions doc/vector/TODO
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ was thinking for example about completely new vector library based on
OGC standard, using either OGR directly or an abstraction layer and
OGR as an option (driver). That does not mean that I prefer simple
feature specification over current GRASS implementation, I am not sure
which one is better. In any case it would be pitty to drop current
which one is better. In any case it would be pity to drop current
topological format with all its flexibility. Each approach has
advantages and disadvantages. I think that it the best to have in OS
GIS all alternatives file/database and topology/simple feature.
Expand Down Expand Up @@ -77,7 +77,7 @@ The space which was occupied by a line in coor file is lost after call
to Vect_delete_line(). A list of the free positions be kept and
Vect_write_line() should write in that free space if possible instead
of to append a new line to the end of the file. There is already empty
structure 'recycle' in 'dig_head' where the list could be imlemented
structure 'recycle' in 'dig_head' where the list could be implemented
(without changing 'dig_head' size, to keep binary compatibility).

* Note: currently wxGUI vector digitizer 'undo' depends on this 'feature'
Expand Down Expand Up @@ -142,7 +142,7 @@ display a shapefile or PostGIS layers directly:
d.vect map=./shapefiles/@OGR layer=roads # display shapefile ./shapefiles/roads.shp
d.vect map=PG:dbname=test@OGR layer=roads # display table roads from database test

* Update: in progess,
* Update: in progress,
see http://trac.osgeo.org/grass/wiki/Grass7/VectorLib/OGRInterface#DirectOGRreadaccess

Simple feature API and sequential reading
Expand Down Expand Up @@ -212,7 +212,7 @@ DBF driver
----------
Add on the fly index for select/update.

Implent db_copy_table() in drivers
Implement db_copy_table() in drivers
----------------------------------
db_copy_table() is implement in client library and it always reads and
writes all the data which is slow. It would be better to send this
Expand All @@ -225,7 +225,7 @@ Load drivers as dynamic libraries
---------------------------------
Database drivers are implemented as executables which communicate with
modules via pipes. This implementation creates some problems with
portability (especially on Windows) and it makes comunication slow (I
portability (especially on Windows) and it makes communication slow (I
am not sure how much). It would be probably desirable to implement
drivers as loadable modules (dlopen() and equivalents).

Expand All @@ -244,7 +244,7 @@ v.pack/v.unpack
Write it. New modules to pack/unpack a vector to/from single file
(probably tar). I am not sure about format. Originally I was thinking
about ASCII+DBF as it can be read also without GRASS but ASCII and DBF
can lose precision and DBF has other limitations. It whould be
can lose precision and DBF has other limitations. It would be
probably better to use copy of 'coor' file and attributes written to
SQLite database.

Expand Down
2 changes: 1 addition & 1 deletion doc/vector/v.example/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ int main(int argc, char *argv[])
G_fatal_error(_("Database connection not defined for layer %d"), 1);
}

/* Output information useful for debuging
/* Output information useful for debugging
include/vect/dig_structs.h
*/
G_debug(1,
Expand Down
2 changes: 1 addition & 1 deletion general/g.mkfontcap/g.mkfontcap.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<h2>DESCRIPTION</h2>

<em>g.mkfontcap</em> is a utilty to generate a GRASS font configuration file
<em>g.mkfontcap</em> is a utility to generate a GRASS font configuration file
("fontcap") containing details of the fonts available on the current system.
If <a href="http://freetype.sourceforge.net/">Freetype</a> is not installed,
the font list will be limited to the set of Hershey stroke fonts supplied
Expand Down
4 changes: 2 additions & 2 deletions general/g.setproj/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ int main(int argc, char *argv[])
else if (G_strcasecmp(proj_out, "OB_TRAN") == 0) {
/* Hard coded to use "Equidistant Cylincrical"
* until g.setproj has been changed to run
* recurively, to allow input of options for
* recursively, to allow input of options for
* a second projection, MHu991010 */
G_set_key_value("o_proj", "eqc", out_proj_keys);
sph_check = 2;
Expand All @@ -284,7 +284,7 @@ int main(int argc, char *argv[])
strcpy(spheroid, buf);
G_strip(spheroid);
if (G_get_spheroid_by_name(spheroid, &aa, &e2, &f)) {
/* if legal ellips. exist, ask wether or not to change
/* if legal ellips. exist, ask whether or not to change
* it */
G_message(_("The current ellipsoid is %s"), spheroid);
if (G_yes(
Expand Down
2 changes: 1 addition & 1 deletion gui/wxpython/animation/toolbars.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ def SetReplayMode(self, mode):
self.ToggleTool(self.bothDirectionReplay, both)

def EnableAnimTools(self, enable):
"""Enable or diable animation tools"""
"""Enable or disable animation tools"""
self.EnableTool(self.playForward, enable)
self.EnableTool(self.playBack, enable)
self.EnableTool(self.pause, enable)
Expand Down
4 changes: 2 additions & 2 deletions gui/wxpython/core/gconsole.py
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ def __init__(self, guiparent=None, giface=None, ignoredCmdPattern=None):
r"""
:param guiparent: parent window for created GUI objects
:param lmgr: layer manager window (TODO: replace by giface)
:param ignoredCmdPattern: regular expression specifying commads
:param ignoredCmdPattern: regular expression specifying commands
to be ignored (e.g. @c '^d\..*' for
display commands)
"""
Expand Down Expand Up @@ -717,7 +717,7 @@ def OnCmdDone(self, event):
"sec": int(ctime - (mtime * 60)),
}
except KeyError:
# stopped deamon
# stopped daemon
stime = _("unknown")

if event.aborted:
Expand Down
2 changes: 1 addition & 1 deletion gui/wxpython/core/globalvar.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def CheckForWx():
# not defined UBUNTU_MENUPROXY on linux means standard menu,
# so the probably problem
# UBUNTU_MENUPROXY= means ubuntu with disabled global menu [1]
# use UBUNTU_MENUPROXY=0 to disbale global menu on ubuntu but in the same time
# use UBUNTU_MENUPROXY=0 to disable global menu on ubuntu but in the same time
# to get smaller lmgr
# [1] https://wiki.ubuntu.com/DesktopExperienceTeam/ApplicationMenu#Troubleshooting
if sys.platform in ("win32", "darwin") or os.environ.get("UBUNTU_MENUPROXY"):
Expand Down
12 changes: 6 additions & 6 deletions gui/wxpython/core/render.py
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ def SetName(self, name):
self.name = name

def SetActive(self, enable=True):
"""Active or deactive layer"""
"""Active or deactivate layer"""
self.active = bool(enable)

def SetHidden(self, enable=False):
Expand Down Expand Up @@ -557,7 +557,7 @@ def _checkRenderedSizes(self, env, layers):
for layer in layers:
size = layer.GetRenderedSize()
if size:
# is rendered but its size differes from current env
# is rendered but its size differs from current env
if not layer.forceRender and (size[0] != w or size[1] != h):
layer.forceRender = True
# Force render cmd (e.g. d.mon start=wx0 && d.rast elevation)
Expand Down Expand Up @@ -1130,7 +1130,7 @@ def GetRegion(
else:
message = _(
"Unable to get current geographic extent. "
"Force quiting wxGUI. Please manually run g.region to "
"Force quitting wxGUI. Please manually run g.region to "
"fix the problem."
)
GError(message)
Expand Down Expand Up @@ -1329,7 +1329,7 @@ def GetListOfLayers(
def Render(self, force=False, windres=False):
"""Creates final image composite
This function can conditionaly use high-level tools, which
This function can conditionally use high-level tools, which
should be available in wxPython library
:param force: force rendering
Expand Down Expand Up @@ -1585,7 +1585,7 @@ def RemoveLayer(self, name=None, id=None):
def GetLayerIndex(self, layer, overlay=False):
"""Get index of layer in layer list.
:param layer: layer instace in layer tree
:param layer: layer instance in layer tree
:param overlay: use list of overlays instead
:return: layer index
Expand Down Expand Up @@ -1639,7 +1639,7 @@ def AddOverlay(
return overlay

def ChangeOverlay(self, id, **kargs):
"""Change overlay properities
"""Change overlay properties
Add new overlay if overlay with 'id' doesn't exist.
Expand Down
2 changes: 1 addition & 1 deletion gui/wxpython/core/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def _defaultSettings(self):
"changeOpacityLevel": {"enabled": False},
# ask when removing layer from layer tree
"askOnRemoveLayer": {"enabled": True},
# ask when quiting wxGUI or closing display
# ask when quitting wxGUI or closing display
"askOnQuit": {"enabled": True},
# hide tabs
"hideTabs": {
Expand Down
2 changes: 1 addition & 1 deletion gui/wxpython/core/toolboxes.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ def getMenudataFile(userRootFile, newFile, fallback):
if generateNew:
try:
# The case when user does not have custom root
# file but has toolboxes requieres regeneration.
# file but has toolboxes requires regeneration.
# Unfortunately, this is the case can be often: defined
# toolboxes but undefined module tree file.
_debug(2, "toolboxes.getMenudataFile: creating a tree")
Expand Down
4 changes: 2 additions & 2 deletions gui/wxpython/core/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def normalize_whitespace(text):


def split(s):
"""Platform spefic shlex.split"""
"""Platform specific shlex.split"""
try:
if sys.platform == "win32":
return shlex.split(s.replace("\\", r"\\"))
Expand Down Expand Up @@ -1098,7 +1098,7 @@ def isInRegion(regionA, regionB):
:param regionB: input region B as dictionary
:return: True if region A is inside of region B
:return: False othewise
:return: False otherwise
"""
if (
regionA["s"] >= regionB["s"]
Expand Down
2 changes: 1 addition & 1 deletion gui/wxpython/datacatalog/g.gui.datacatalog.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h2>DESCRIPTION</h2>
<li>browse GRASS 2D/3D raster and vector maps</li>
<li>rename, copy, move and delete GRASS maps including reprojection between different locations</li>
<li>drag and drop maps for copying and moving</li>
<li>searching and fitering maps using regular expressions</li>
<li>searching and filtering maps using regular expressions</li>
<li>display map in current location</li>
<li>show metadata of maps</li>
</ul>
Expand Down

0 comments on commit a82501d

Please sign in to comment.