14 files changed, 15 insertions, 15 deletions
diff --git a/grc/blocks/parameter.xml b/grc/blocks/parameter.xml
index 95d03e1412..dcbf9b5bc5 100644
--- a/grc/blocks/parameter.xml
+++ b/grc/blocks/parameter.xml
@@ -101,7 +101,7 @@ This block represents a parameter to the flow graph. \
 A parameter can be used to pass command line arguments into a top block. \
 Or, parameters can pass arguments into an instantiated hierarchical block.
 
-The paramater value cannot depend on any variables.
+The parameter value cannot depend on any variables.
 
 Leave the label blank to use the parameter id as the label.
 
diff --git a/grc/core/Block.py b/grc/core/Block.py
index f8179b113f..4be83b1304 100644
--- a/grc/core/Block.py
+++ b/grc/core/Block.py
@@ -686,7 +686,7 @@ class Block(Element):
 
     def resolve_dependencies(self, tmpl):
         """
-        Resolve a paramater dependency with cheetah templates.
+        Resolve a parameter dependency with cheetah templates.
 
         Args:
             tmpl: the string with dependencies
diff --git a/grc/core/Constants.py b/grc/core/Constants.py
index 61a44d0c78..9e0a3f04b1 100644
--- a/grc/core/Constants.py
+++ b/grc/core/Constants.py
@@ -72,7 +72,7 @@ COMPLEX_TYPES = tuple(COMPLEX_TYPES + REAL_TYPES + INT_TYPES)
 REAL_TYPES = tuple(REAL_TYPES + INT_TYPES)
 INT_TYPES = tuple(INT_TYPES)
 
-# Updating colors. Using the standard color pallette from:
+# Updating colors. Using the standard color palette from:
 #  http://www.google.com/design/spec/style/color.html#color-color-palette
 # Most are based on the main, primary color standard. Some are within
 # that color's spectrum when it was deemed necessary.
diff --git a/grc/core/Platform.py b/grc/core/Platform.py
index 258f38cc62..c977a04275 100644
--- a/grc/core/Platform.py
+++ b/grc/core/Platform.py
@@ -229,7 +229,7 @@ class Platform(Element):
 
         key = n.find('key')
         if not key:
-            print >> sys.stderr, 'Warning: Domain with emtpy key.\n\tIgnoring: {0}'.format(xml_file)
+            print >> sys.stderr, 'Warning: Domain with empty key.\n\tIgnoring: {0}'.format(xml_file)
             return
         if key in self.domains:  # test against repeated keys
             print >> sys.stderr, 'Warning: Domain with key "{0}" already exists.\n\tIgnoring: {1}'.format(key, xml_file)
diff --git a/grc/core/utils/odict.py b/grc/core/utils/odict.py
index 9d69082600..e0ea0cc94f 100644
--- a/grc/core/utils/odict.py
+++ b/grc/core/utils/odict.py
@@ -66,7 +66,7 @@ class odict(DictMixin):
     def insert_before(self, pos_key, key, val):
         """
         Insert the new key, value entry before the entry given by the position key.
-        If the positional key is None, insert at the begining.
+        If the positional key is None, insert at the beginning.
 
         Args:
             pos_key: the positional key
diff --git a/grc/gui/Actions.py b/grc/gui/Actions.py
index 6eccab75fb..5e728a350f 100644
--- a/grc/gui/Actions.py
+++ b/grc/gui/Actions.py
@@ -87,7 +87,7 @@ class _ActionBase(object):
             # set the accelerator group, and accelerator path
             # register the key name and mod mask with the accelerator path
             if label is None:
-                continue  # dont register accel
+                continue  # don't register accel
             accel_path = '<main>/' + self.get_name()
             self.set_accel_group(get_accel_group())
             self.set_accel_path(accel_path)
diff --git a/grc/gui/Block.py b/grc/gui/Block.py
index 39c6993a37..e3de04961d 100644
--- a/grc/gui/Block.py
+++ b/grc/gui/Block.py
@@ -54,7 +54,7 @@ class Block(Element, _Block):
 
     def __init__(self, flow_graph, n):
         """
-        Block contructor.
+        Block constructor.
         Add graphics related params to the block.
         """
         _Block.__init__(self, flow_graph, n)
diff --git a/grc/gui/Dialogs.py b/grc/gui/Dialogs.py
index 83ad9651b2..4c89810bb6 100644
--- a/grc/gui/Dialogs.py
+++ b/grc/gui/Dialogs.py
@@ -251,7 +251,7 @@ def ChooseEditorDialog(config):
         'Would you like to choose the editor to use?', gtk.RESPONSE_YES, buttons
     )
 
-    # Handle the inital default/choose/cancel response
+    # Handle the initial default/choose/cancel response
     # User wants to choose the editor to use
     if response == gtk.RESPONSE_YES:
         file_dialog = gtk.FileChooserDialog(
diff --git a/grc/gui/DrawingArea.py b/grc/gui/DrawingArea.py
index 6a1df27a8c..64862ce6d8 100644
--- a/grc/gui/DrawingArea.py
+++ b/grc/gui/DrawingArea.py
@@ -33,7 +33,7 @@ class DrawingArea(gtk.DrawingArea):
 
     def __init__(self, flow_graph):
         """
-        DrawingArea contructor.
+        DrawingArea constructor.
         Connect event handlers.
 
         Args:
diff --git a/grc/gui/Executor.py b/grc/gui/Executor.py
index f91a341541..bab23dfdb8 100644
--- a/grc/gui/Executor.py
+++ b/grc/gui/Executor.py
@@ -39,7 +39,7 @@ class ExecFlowGraphThread(threading.Thread):
         """
         threading.Thread.__init__(self)
 
-        self.page = flow_graph_page  # store page and dont use main window calls in run
+        self.page = flow_graph_page  # store page and don't use main window calls in run
         self.xterm_executable = xterm_executable
         self.update_callback = callback
 
diff --git a/grc/gui/FileDialogs.py b/grc/gui/FileDialogs.py
index 9d047b1ffd..30978bbf9d 100644
--- a/grc/gui/FileDialogs.py
+++ b/grc/gui/FileDialogs.py
@@ -90,7 +90,7 @@ class FileDialogHelper(gtk.FileChooserDialog):
 
     def __init__(self, action, title):
         """
-        FileDialogHelper contructor.
+        FileDialogHelper constructor.
         Create a save or open dialog with cancel and ok buttons.
         Use standard settings: no multiple selection, local files only, and the * filter.
 
diff --git a/grc/gui/Port.py b/grc/gui/Port.py
index 6314b7ede8..690b1087e3 100644
--- a/grc/gui/Port.py
+++ b/grc/gui/Port.py
@@ -40,7 +40,7 @@ class Port(_Port, Element):
 
     def __init__(self, block, n, dir):
         """
-        Port contructor.
+        Port constructor.
         Create list of connector coordinates.
         """
         _Port.__init__(self, block, n, dir)
diff --git a/grc/gui/StateCache.py b/grc/gui/StateCache.py
index 3cdb5f30ce..12ec9305b0 100644
--- a/grc/gui/StateCache.py
+++ b/grc/gui/StateCache.py
@@ -32,7 +32,7 @@ class StateCache(object):
         StateCache constructor.
 
         Args:
-            initial_state: the intial state (nested data)
+            initial_state: the initial state (nested data)
         """
         self.states = [None] * STATE_CACHE_SIZE #fill states
         self.current_state_index = 0
diff --git a/grc/scripts/freedesktop/README b/grc/scripts/freedesktop/README
index 0857ecc224..a467d72568 100644
--- a/grc/scripts/freedesktop/README
+++ b/grc/scripts/freedesktop/README
@@ -6,8 +6,8 @@ This directory contains icons, a mime type, and menu files for grc.
 Installation of these files requires a set of tools called xdg-utils.
 xdg-utils will install files in a standard way according to the freedesktop.org standards.
 
-Desktop enviroments that implement these standards are gnome, kde, xfce, and others.
-If you have one of these desktop enviroments, xdg-utils should come installed.
+Desktop environments that implement these standards are gnome, kde, xfce, and others.
+If you have one of these desktop environments, xdg-utils should come installed.
 If xdg-utils is not installed, then this directory will be ignored by the build.
 
 The gtk IconTheme module locates the installed icons for use inside the grc app.