Fixed typos (thanks to Benjamin Weis)

CHANGELOG.md

@@ -825,7 +825,7 @@ In this release they were merged 6 pull requests
 * Fixed Home/End key behaviour inconsistency on MacOS X (See [Issue 495](../../issues/495))
 * Internal console: new option "Pop up internal console when errors were intercepted" -- default: False, which avoids loosing focus when a traceback is shown in the internal console... but features may also fail silently! (bugs could stay hidden a while before being taken care of) -- See [Issue 1016](../../issues/1016)
 * Fixed "TypeError: file_saved(long,long).emit(): argument 1 has unexpected type 'long'" error occuring on some Linux 32-bit platforms -- See [Issue 1094](../../issues/1094)
-* Console: find/replace widget "Search next/previous occurence" feature was broken
+* Console: find/replace widget "Search next/previous occurrence" feature was broken
 
 ### Other changes
 
@@ -939,7 +939,7 @@ In this release they were merged 6 pull requests
     * Selecting a part of a word raises an IndexError exception
     * Revert option was prompting for user input even on an unmodified buffer
     * Added missing .f77 file extensions for Fortran files filter
-    * Occurence highlighting was not working when cursor was at the left side of a word and if the next character was ':', ',' or '(' (or any other character not matching the "word regexp")
+    * Occurrence highlighting was not working when cursor was at the left side of a word and if the next character was ':', ',' or '(' (or any other character not matching the "word regexp")
 * Console:
     * Console was unusable (endless tracebacks) when monitor was disabled
     * File drag'n drop was not working (should execute dropped file)
@@ -1223,7 +1223,7 @@ Since version 2.1:
 * Object inspector:
     * Rich text mode was failing for non-ascii docstrings
 * Find/Replace widget:
-    * Combo box history was populated only when pressing Enter (now pressing F3 to find next occurence will add the current entry to history)
+    * Combo box history was populated only when pressing Enter (now pressing F3 to find next occurrence will add the current entry to history)
 
 
 ----

doc/overview.rst

@@ -39,7 +39,7 @@ Key features:
     * *calltips*
     * *go-to-definition*: go to object (any symbol: function, class, attribute, etc.) definition by pressing Ctrl+Left mouse click on word or Ctrl+G (default shortcut)
 
-  * *occurence highlighting*
+  * *occurrence highlighting*
   * typing helpers (optional):
 
     * automatically insert closing parentheses, braces and brackets
@@ -70,7 +70,7 @@ Key features:
   * documentation may be displayed as an html page thanks to the rich text mode (powered by `sphinx`)
 
 * :doc:`onlinehelp`: automatically generated html documentation on installed Python modules
-* :doc:`findinfiles`: find string occurences in a directory, a mercurial repository or directly in PYTHONPATH (support for regular expressions and  included/excluded string lists)
+* :doc:`findinfiles`: find string occurrences in a directory, a mercurial repository or directly in PYTHONPATH (support for regular expressions and  included/excluded string lists)
 * :doc:`explorer`
 * :doc:`projectexplorer` (support Pydev project import)
 

spyderlib/config/main.py

@@ -39,7 +39,7 @@
     (_("Patch and diff files"), ('.patch', '.diff', '.rej')),
     (_("Batch files"), ('.bat', '.cmd')),
     (_("Text files"), ('.txt',)),
-    (_("reStructured Text files"), ('.txt', '.rst')),
+    (_("reStructuredText files"), ('.txt', '.rst')),
     (_("gettext files"), ('.po', '.pot')),
     (_("NSIS files"), ('.nsi', '.nsh')),
     (_("Web page files"), ('.scss', '.css', '.htm', '.html',)),
@@ -354,8 +354,8 @@ def is_gtk_desktop():
               'intelligent_backspace': True,
               'highlight_current_line': True,
               'highlight_current_cell': True,
-              'occurence_highlighting': True,
-              'occurence_highlighting/timeout': 1500,
+              'occurrence_highlighting': True,
+              'occurrence_highlighting/timeout': 1500,
               'always_remove_trailing_spaces': False,
               'fullpath_sorting': True,
               'show_tab_bar': True,
@@ -593,7 +593,7 @@ def is_gtk_desktop():
               'emacs/background':  "#000000",
               'emacs/currentline': "#2b2b43",
               'emacs/currentcell': "#1c1c2d",
-              'emacs/occurence':   "#abab67",
+              'emacs/occurrence':   "#abab67",
               'emacs/ctrlclick':   "#0000ff",
               'emacs/sideareas':   "#555555",
               'emacs/matched_p':   "#009800",
@@ -611,7 +611,7 @@ def is_gtk_desktop():
               'idle/background':   "#ffffff",
               'idle/currentline':  "#f2e6f3",
               'idle/currentcell':  "#feefff",
-              'idle/occurence':    "#e8f2fe",
+              'idle/occurrence':    "#e8f2fe",
               'idle/ctrlclick':    "#0000ff",
               'idle/sideareas':    "#efefef",
               'idle/matched_p':    "#99ff99",
@@ -629,7 +629,7 @@ def is_gtk_desktop():
               'monokai/background':   "#2a2b24",
               'monokai/currentline':  "#484848",
               'monokai/currentcell':  "#3d3d3d",
-              'monokai/occurence':    "#666666",
+              'monokai/occurrence':    "#666666",
               'monokai/ctrlclick':    "#0000ff",
               'monokai/sideareas':    "#2a2b24",
               'monokai/matched_p':    "#688060",
@@ -647,7 +647,7 @@ def is_gtk_desktop():
               'pydev/background':  "#ffffff",
               'pydev/currentline': "#e8f2fe",
               'pydev/currentcell': "#eff8fe",
-              'pydev/occurence':   "#ffff99",
+              'pydev/occurrence':   "#ffff99",
               'pydev/ctrlclick':   "#0000ff",
               'pydev/sideareas':   "#efefef",
               'pydev/matched_p':   "#99ff99",
@@ -665,7 +665,7 @@ def is_gtk_desktop():
               'scintilla/background':  "#ffffff",
               'scintilla/currentline': "#e1f0d1",
               'scintilla/currentcell': "#edfcdc",  
-              'scintilla/occurence':   "#ffff99",
+              'scintilla/occurrence':   "#ffff99",
               'scintilla/ctrlclick':   "#0000ff",
               'scintilla/sideareas':   "#efefef",
               'scintilla/matched_p':   "#99ff99",
@@ -683,7 +683,7 @@ def is_gtk_desktop():
               'spyder/background':  "#ffffff",
               'spyder/currentline': "#f7ecf8",
               'spyder/currentcell': "#fdfdde",              
-              'spyder/occurence':   "#ffff99",
+              'spyder/occurrence':   "#ffff99",
               'spyder/ctrlclick':   "#0000ff",
               'spyder/sideareas':   "#efefef",
               'spyder/matched_p':   "#99ff99",
@@ -701,7 +701,7 @@ def is_gtk_desktop():
               'spyder/dark/background':  "#131926",
               'spyder/dark/currentline': "#2b2b43",
               'spyder/dark/currentcell': "#31314e",
-              'spyder/dark/occurence':   "#abab67",
+              'spyder/dark/occurrence':   "#abab67",
               'spyder/dark/ctrlclick':   "#0000ff",
               'spyder/dark/sideareas':   "#282828",
               'spyder/dark/matched_p':   "#009800",
@@ -719,7 +719,7 @@ def is_gtk_desktop():
               'zenburn/background':  "#3f3f3f",
               'zenburn/currentline': "#333333",
               'zenburn/currentcell': "#2c2c2c",
-              'zenburn/occurence':   "#7a738f",
+              'zenburn/occurrence':   "#7a738f",
               'zenburn/ctrlclick':   "#0000ff",
               'zenburn/sideareas':   "#3f3f3f",
               'zenburn/matched_p':   "#688060",

spyderlib/locale/es/LC_MESSAGES/spyderlib.po

@@ -82,7 +82,7 @@ msgid "Text files"
 msgstr "Archivos de Texto"
 
 #: spyderlib/config/main.py:42
-msgid "reStructured Text files"
+msgid "reStructuredText files"
 msgstr "Archivos de Texto reStructurado"
 
 #: spyderlib/config/main.py:43
@@ -320,7 +320,7 @@ msgid "Current cell:"
 msgstr "Celda seleccionada:"
 
 #: spyderlib/plugins/configdialog.py:914
-msgid "Occurence:"
+msgid "Occurrence:"
 msgstr "Ocurrencia:"
 
 #: spyderlib/plugins/configdialog.py:915
@@ -549,7 +549,7 @@ msgid "Highlight current cell"
 msgstr "Resaltar la celda actual"
 
 #: spyderlib/plugins/editor.py:131
-msgid "Highlight occurences after"
+msgid "Highlight occurrences after"
 msgstr "Resaltar ocurrencias después de"
 
 #: spyderlib/plugins/editor.py:142 spyderlib/plugins/history.py:52

spyderlib/locale/fr/LC_MESSAGES/spyderlib.po

@@ -80,7 +80,7 @@ msgid "Text files"
 msgstr "Fichiers texte"
 
 #: spyderlib/config/main.py:42
-msgid "reStructured Text files"
+msgid "reStructuredText files"
 msgstr "Fichiers reST"
 
 #: spyderlib/config/main.py:43
@@ -319,8 +319,8 @@ msgid "Current cell:"
 msgstr "Cellule actuelle :"
 
 #: spyderlib/plugins/configdialog.py:914
-msgid "Occurence:"
-msgstr "Occurence :"
+msgid "Occurrence:"
+msgstr "Occurrence :"
 
 #: spyderlib/plugins/configdialog.py:915
 msgid "Link:"
@@ -549,8 +549,8 @@ msgid "Highlight current cell"
 msgstr "Surligner la cellule en cours d'édition"
 
 #: spyderlib/plugins/editor.py:131
-msgid "Highlight occurences after"
-msgstr "Surligner les occurences après"
+msgid "Highlight occurrences after"
+msgstr "Surligner les occurrences après"
 
 #: spyderlib/plugins/editor.py:142 spyderlib/plugins/history.py:52
 #: spyderlib/plugins/inspector.py:183

spyderlib/locale/pt_BR/LC_MESSAGES/spyderlib.po

@@ -82,7 +82,7 @@ msgid "Text files"
 msgstr "Arquivos de texto"
 
 #: spyderlib/config/main.py:42
-msgid "reStructured Text files"
+msgid "reStructuredText files"
 msgstr "Arquivos de texto reeStruturado"
 
 #: spyderlib/config/main.py:43
@@ -319,7 +319,7 @@ msgid "Current cell:"
 msgstr "Célula selecionada:"
 
 #: spyderlib/plugins/configdialog.py:914
-msgid "Occurence:"
+msgid "Occurrence:"
 msgstr "Ocorrência:"
 
 #: spyderlib/plugins/configdialog.py:915
@@ -548,7 +548,7 @@ msgid "Highlight current cell"
 msgstr "Realçar célula atual"
 
 #: spyderlib/plugins/editor.py:131
-msgid "Highlight occurences after"
+msgid "Highlight occurrences after"
 msgstr "Realçar ocorrências depois de"
 
 #: spyderlib/plugins/editor.py:142 spyderlib/plugins/history.py:52

spyderlib/locale/spyderlib.pot

@@ -77,7 +77,7 @@ msgid "Text files"
 msgstr ""
 
 #: spyderlib/config/main.py:42
-msgid "reStructured Text files"
+msgid "reStructuredText files"
 msgstr ""
 
 #: spyderlib/config/main.py:43
@@ -306,7 +306,7 @@ msgid "Current cell:"
 msgstr ""
 
 #: spyderlib/plugins/configdialog.py:914
-msgid "Occurence:"
+msgid "Occurrence:"
 msgstr ""
 
 #: spyderlib/plugins/configdialog.py:915
@@ -535,7 +535,7 @@ msgid "Highlight current cell"
 msgstr ""
 
 #: spyderlib/plugins/editor.py:131
-msgid "Highlight occurences after"
+msgid "Highlight occurrences after"
 msgstr ""
 
 #: spyderlib/plugins/editor.py:142 spyderlib/plugins/history.py:52

spyderlib/plugins/configdialog.py

@@ -916,7 +916,7 @@ def setup_page(self):
                       "background":     _("Background:"),
                       "currentline":    _("Current line:"),
                       "currentcell":    _("Current cell:"),
-                      "occurence":      _("Occurence:"),
+                      "occurrence":      _("Occurrence:"),
                       "ctrlclick":      _("Link:"),
                       "sideareas":      _("Side areas:"),
                       "matched_p":      _("Matched parentheses:"),

spyderlib/plugins/editor.py

@@ -128,13 +128,13 @@ def setup_page(self):
                                 'highlight_current_line')
         currentcell_box = newcb(_("Highlight current cell"),
                                 'highlight_current_cell')
-        occurence_box = newcb(_("Highlight occurences after"),
-                              'occurence_highlighting')
-        occurence_spin = self.create_spinbox("", " ms",
-                                             'occurence_highlighting/timeout',
+        occurrence_box = newcb(_("Highlight occurrences after"),
+                              'occurrence_highlighting')
+        occurrence_spin = self.create_spinbox("", " ms",
+                                             'occurrence_highlighting/timeout',
                                              min_=100, max_=1000000, step=100)
-        occurence_box.toggled.connect(occurence_spin.setEnabled)
-        occurence_spin.setEnabled(self.get_option('occurence_highlighting'))
+        occurrence_box.toggled.connect(occurrence_spin.setEnabled)
+        occurrence_spin.setEnabled(self.get_option('occurrence_highlighting'))
 
         wrap_mode_box = newcb(_("Wrap lines"), 'wrap')
         names = CONF.get('color_schemes', 'names')
@@ -150,9 +150,9 @@ def setup_page(self):
         display_layout.addWidget(edgeline_spin.slabel, 2, 2)
         display_layout.addWidget(currentline_box, 3, 0)
         display_layout.addWidget(currentcell_box, 4, 0)
-        display_layout.addWidget(occurence_box, 5, 0)
-        display_layout.addWidget(occurence_spin.spinbox, 5, 1)
-        display_layout.addWidget(occurence_spin.slabel, 5, 2)
+        display_layout.addWidget(occurrence_box, 5, 0)
+        display_layout.addWidget(occurrence_spin.spinbox, 5, 1)
+        display_layout.addWidget(occurrence_spin.slabel, 5, 2)
         display_layout.addWidget(wrap_mode_box, 6, 0)
         display_layout.addWidget(cs_combo.label, 7, 0)
         display_layout.addWidget(cs_combo.combobox, 7, 1)
@@ -1132,8 +1132,8 @@ def register_editorstack(self, editorstack):
             ('set_intelligent_backspace_enabled',   'intelligent_backspace'),
             ('set_highlight_current_line_enabled',  'highlight_current_line'),
             ('set_highlight_current_cell_enabled',  'highlight_current_cell'),
-            ('set_occurence_highlighting_enabled',  'occurence_highlighting'),
-            ('set_occurence_highlighting_timeout',  'occurence_highlighting/timeout'),
+            ('set_occurrence_highlighting_enabled',  'occurrence_highlighting'),
+            ('set_occurrence_highlighting_timeout',  'occurrence_highlighting/timeout'),
             ('set_checkeolchars_enabled',           'check_eol_chars'),
             ('set_fullpath_sorting_enabled',        'fullpath_sorting'),
             ('set_tabbar_visible',                  'show_tab_bar'),
@@ -2216,10 +2216,10 @@ def apply_plugin_settings(self, options):
             currentline_o = self.get_option(currentline_n)
             currentcell_n = 'highlight_current_cell'
             currentcell_o = self.get_option(currentcell_n)            
-            occurence_n = 'occurence_highlighting'
-            occurence_o = self.get_option(occurence_n)
-            occurence_timeout_n = 'occurence_highlighting/timeout'
-            occurence_timeout_o = self.get_option(occurence_timeout_n)
+            occurrence_n = 'occurrence_highlighting'
+            occurrence_o = self.get_option(occurrence_n)
+            occurrence_timeout_n = 'occurrence_highlighting/timeout'
+            occurrence_timeout_o = self.get_option(occurrence_timeout_n)
             focus_to_editor_n = 'focus_to_editor'
             focus_to_editor_o = self.get_option(focus_to_editor_n)
 
@@ -2240,11 +2240,11 @@ def apply_plugin_settings(self, options):
                 if currentcell_n in options:
                     editorstack.set_highlight_current_cell_enabled(
                                                                 currentcell_o)              
-                if occurence_n in options:
-                    editorstack.set_occurence_highlighting_enabled(occurence_o)
-                if occurence_timeout_n in options:
-                    editorstack.set_occurence_highlighting_timeout(
-                                                           occurence_timeout_o)
+                if occurrence_n in options:
+                    editorstack.set_occurrence_highlighting_enabled(occurrence_o)
+                if occurrence_timeout_n in options:
+                    editorstack.set_occurrence_highlighting_timeout(
+                                                           occurrence_timeout_o)
                 if focus_to_editor_n in options:
                     editorstack.set_focus_to_editor(focus_to_editor_o)
 

spyderlib/plugins/help.py

@@ -265,7 +265,7 @@ def set_color_scheme(self, color_scheme):
 
     def set_text(self, text, is_code):
         self.editor.set_highlight_current_line(is_code)
-        self.editor.set_occurence_highlighting(is_code)
+        self.editor.set_occurrence_highlighting(is_code)
         if is_code:
             self.editor.set_language('py')
         else:

spyderlib/utils/help/tutorial.rst

@@ -700,7 +700,7 @@ Documentation string formatting
 
 If you want to add documentation for the code you are developing, we recommend
 you to write documentation strings (or *docstrings*) for it, using a special 
-format called restructured text (`quick reference
+format called reStructuredText (`quick reference
 <http://docutils.sourceforge.net/docs/user/rst/quickref.html>`__). This format
 also needs to follow a set of conventions called the `Numpydoc standard
 <https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt#id5>`__

spyderlib/utils/stringmatching.py

@@ -21,7 +21,7 @@ def get_search_regex(query, ignore_case=True):
     Parameters
     ----------
     query : str
-        String to search in another string (in order of character occurence).
+        String to search in another string (in order of character occurrence).
     ignore_case : True
         Optional value perform a case insensitive search (True by default).
 

spyderlib/utils/syntaxhighlighters.py

@@ -37,7 +37,7 @@
 #==============================================================================
 # Constants
 #==============================================================================
-COLOR_SCHEME_KEYS = ("background", "currentline", "currentcell", "occurence",
+COLOR_SCHEME_KEYS = ("background", "currentline", "currentcell", "occurrence",
                      "ctrlclick", "sideareas", "matched_p", "unmatched_p",
                      "normal", "keyword", "builtin", "definition",
                      "comment", "string", "number", "instance")
@@ -106,7 +106,7 @@ def __init__(self, parent, font=None, color_scheme='Spyder'):
         self.background_color = None
         self.currentline_color = None
         self.currentcell_color = None
-        self.occurence_color = None
+        self.occurrence_color = None
         self.ctrlclick_color = None
         self.sideareas_color = None
         self.matched_p_color = None
@@ -130,8 +130,8 @@ def get_currentline_color(self):
     def get_currentcell_color(self):
         return QColor(self.currentcell_color)
 
-    def get_occurence_color(self):
-        return QColor(self.occurence_color)
+    def get_occurrence_color(self):
+        return QColor(self.occurrence_color)
 
     def get_ctrlclick_color(self):
         return QColor(self.ctrlclick_color)
@@ -164,7 +164,7 @@ def setup_formats(self, font=None):
         self.background_color = colors.pop("background")
         self.currentline_color = colors.pop("currentline")
         self.currentcell_color = colors.pop("currentcell")
-        self.occurence_color = colors.pop("occurence")
+        self.occurrence_color = colors.pop("occurrence")
         self.ctrlclick_color = colors.pop("ctrlclick")
         self.sideareas_color = colors.pop("sideareas")
         self.matched_p_color = colors.pop("matched_p")