[spyder] 01/04: Imported Upstream version 2.2.4+dfsg

Frédéric-Emmanuel Picca picca at alioth.debian.org
Fri Sep 6 20:01:02 UTC 2013


This is an automated email from the git hooks/post-receive script.

picca pushed a commit to branch master
in repository spyder.

commit d3aaede1996fe981d2f19caf72d5e9431c98dcb6
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Fri Sep 6 21:22:09 2013 +0200

    Imported Upstream version 2.2.4+dfsg
---
 CHANGELOG                                          |  819 +++++++++++
 LICENSE                                            |  334 +++++
 MANIFEST.in                                        |    2 +
 PKG-INFO                                           |   64 +-
 spyderlib/__init__.py                              |    2 +-
 spyderlib/baseconfig.py                            |   19 +-
 spyderlib/config.py                                |   10 +-
 spyderlib/images/editor/breakpoint_small.png       |  Bin 815 -> 562 bytes
 spyderlib/locale/es/LC_MESSAGES/spyderlib.mo       |  Bin 90036 -> 92547 bytes
 spyderlib/locale/es/LC_MESSAGES/spyderlib.po       | 1487 +++++++++++---------
 spyderlib/locale/fr/LC_MESSAGES/spyderlib.mo       |  Bin 85934 -> 84192 bytes
 spyderlib/locale/fr/LC_MESSAGES/spyderlib.po       |  996 ++++++-------
 spyderlib/locale/spyderlib.pot                     |  929 ++++++------
 spyderlib/plugins/editor.py                        |  122 +-
 spyderlib/plugins/externalconsole.py               |   46 +-
 spyderlib/plugins/history.py                       |    4 +
 spyderlib/plugins/inspector.py                     |    7 +-
 spyderlib/plugins/ipythonconsole.py                |   75 +-
 spyderlib/spyder.py                                |   36 +-
 spyderlib/utils/codeanalysis.py                    |    6 +-
 spyderlib/utils/programs.py                        |    8 +-
 spyderlib/utils/qthelpers.py                       |    7 +
 spyderlib/widgets/externalshell/pythonshell.py     |   15 +-
 spyderlib/widgets/externalshell/sitecustomize.py   |    8 +-
 .../widgets/externalshell/start_ipython_kernel.py  |   59 +-
 spyderlib/widgets/ipython.py                       |   25 +-
 spyderlib/widgets/projectexplorer.py               |    2 +-
 spyderlib/windows/spyder.ico                       |  Bin 100763 -> 0 bytes
 spyderlib/windows/spyder_light.ico                 |  Bin 99495 -> 0 bytes
 .../locale/es/LC_MESSAGES/p_breakpoints.mo         |  Bin 752 -> 752 bytes
 spyderplugins/locale/es/LC_MESSAGES/p_profiler.mo  |  Bin 790 -> 790 bytes
 spyderplugins/locale/es/LC_MESSAGES/p_pylint.mo    |  Bin 1090 -> 1228 bytes
 .../locale/fr/LC_MESSAGES/p_breakpoints.mo         |  Bin 731 -> 731 bytes
 spyderplugins/locale/fr/LC_MESSAGES/p_profiler.mo  |  Bin 2191 -> 2191 bytes
 spyderplugins/locale/fr/LC_MESSAGES/p_pylint.mo    |  Bin 2458 -> 2458 bytes
 spyderplugins/p_breakpoints.py                     |    2 +-
 36 files changed, 3274 insertions(+), 1810 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..5103fca
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,819 @@
+= History of changes =
+
+== Version 2.2.4 ==
+
+=== Bug fixes (since v2.2.3) ===
+
+  * Issue  347  Matplotlib hangs on Mac if using PySide
+  * Issue  1265  Create a Debug menu to easily show how to set breakpoints
+  * Issue  1489  Project Explorer does not load all projects in workspace.
+  * Issue  1516  Make Spyder compatible with both IPython 0.13 and 1.0
+  * Issue  1531  Pyflakes version check is looking for 0.5.0 only
+  * Issue  1539  /tmp/spyder is owned by the first user on the server to launch spyder
+
+=== Other Changes (since v2.2.3) ===
+
+  * Make Spyder compatible with SymPy 0.7.3+
+  * Add shortcuts to the tooltips of all toolbars
+  * Make IPython Console work better if Matplotlib is not installed
+
+----
+
+== Version 2.2.3 ==
+
+=== Bug fixes (since v2.2.2) ===
+
+  * Issue  634  Debugging: Lingering break points
+  * Issue  639  Project Explorer: horizontal size issue (added an optional horizontal scrollbar. This option may be enabled/disabled in the widget context menu)
+  * Issue  749  Outline Explorer: Duplicate entries
+  * Issue  852  Implement matlab-like cell features
+  * Issue  1388  Add an "About Spyder dependencies" dialog box
+  * Issue  1438  "runfile" doesn't work correctly if unicode_literals has been imported (replaced backslashes by slashes in paths)
+  * Issue  1515  Add an option to use the same interpreter Spyder is running on as "Python executable" for external consoles
+  * Issue  1522  licenses of the images (especially the .png)
+  * Issue  1526  Build script (setup.py) includes the wrong version of pyflakes/rope in Windows installer
+  * Issue  1527  please include the LICENSE file in the source package
+
+=== Other Changes (since v2.2.2) ===
+
+  * New "Run selection" (F9), "Run cell" (Ctrl+Enter) and "Run cell and advance" (Shift+Enter) actions in "Run" menu entry, as a replacement to the old "Run selection or block" and "Run block and advance" actions.
+  * Added "Optional Dependencies" dialog box in "?" menu.
+  * Editor: added Monokai and Zenburn syntax coloring schemes.
+  * Keyboard shortcuts: removing deprecated shortcuts at startup. Otherwise, when renaming the name of a registered shortcut (in the code), the old shortcut will stay in Spyder configuration file and opening the Preferences dialog will show a shortcut conflict dialog box. In other words, shortcuts were added to configuration file when registered but never removed if they were removed from the registered shortcuts in the code (or if their context or name was renamed).
+  * External console tabs: fixed history browsing with Ctrl+Tab and added Shift+Ctrl+Tab support.
+  * Preferences>Console>Advanced: new option to switch between the default Python executable (i.e. the one used to run Spyder itself) and the custom Python executable that the user may choose freely. This change avoid side-effects when switching from a Python distribution to another on the same OS (with the same Spyder configuration file): many users do not change the Python executable and because of the way it was written in externalconsole.py, changing from a distribution of Python to  [...]
+  * Run Icons: removed deprecated images, updated other images to the new design
+  * setup.py/Windows installers: now building CHM documentation for Windows
+  * SPYDER_DEBUG environment variable now supports 3 levels of debug mode:
+    * SPYDER_DEBUG=0 or False: debug mode is off
+    * SPYDER_DEBUG=1 or True: debug level 1 is on (internal console is disconnected)
+    * SPYDER_DEBUG=2: debug level 2 is on (+ logging coms with external Python processes)
+    * SPYDER_DEBUG=3: debug level 3 is on (+ enabling -v option in external Python processes and debugging editor)
+
+----
+
+== Version 2.2.2 ==
+
+=== Bug fixes (since v2.2.1) ===
+
+  * Issue  1497  Spyder 2.2.1 does not work with Python < 2.7
+  * Issue  1498  TypeError thrown by IPython Console when the pager is off
+  * Issue  1499  Console (Terminal) throws NotImplementedError for Home/End keys
+  * Issue  1509  Add support for javascript syntax highlighting
+  * Issue  1510  Problems with zooming in/out
+
+=== Other Changes (since v2.2.1) ===
+
+  * Add new icons to the Run, Debug and Main toolbars
+  * Update Pylint plugin to work with pylint 1.0
+  * Add Ctrl/Cmd+[+,-] to zoom in/out in the Editor
+  * Disable Crtl+MouseWheel to zoom in/out in Mac (See Issue 1509)
+  * Update Pandas and Matplotlib in our Mac application
+
+----
+
+== Version 2.2.1 ==
+
+=== Bug fixes (since v2.2.0) ===
+
+  * Issue  1231  Some strange messages are printed in the terminal when Spyder is running
+  * Issue  1318  Mac app - Unable to use the keyboard when completion widget is displayed and the app loses focus
+  * Issue  1331  Git Bash: Spyder's script has wrong shebang
+  * Issue  1333  Spyder is unable to detect git if installed with msysgit (Microsoft Windows PC's)
+  * Issue  1370  Unit tests exceptions in IPython are displayed in its kernel tab
+  * Issue  1395  Mac App - Importing matplotlib fails on Snow Leopard due to incompatible version of libpng
+  * Issue  1399  Recommend to use pip instead of easy_install
+  * Issue  1426  Background colour of Object Inspector (docstring) in Rich Text mode is same as the window's
+  * Issue  1439  Update pil_patch to be compatible with Pillow
+  * Issue  1449  Spyder --light is not functioning
+  * Issue  1470  Preferences size is not saved when using PySide
+  * Issue  1472  matplotlib plot's docstring is not rendered correctly in the Object Inspector
+
+=== Other Changes (since v2.2.0) ===
+
+  * All scientific libraries in our Mac application were updated to their latest releases.
+  * The _Run Settings_ dialog has now its own icon. Before it was the same as the _Preferences_ pane one.
+  * Update and improve our _Installation_ instructions for all platforms.
+  * Add support for Google TODO comments: "TODO(username at domain.com): blabla"
+
+----
+
+== Version 2.2.0 ==
+
+=== New features since v2.1 ===
+
+  * Better integration with IPython.
+    * A dedicated preferences page from which you can set its most important options
+    * An easy way to manage IPython kernels inside Spyder (i.e. interrupts and restarts).
+    * Each console can be configured separately (which is not possible in IPython-qtconsole)
+    * Each console is now connected to the Object Inspector and the History log.
+    * Learn how to use IPython reading its documentation on the Object Inspector.
+    * Find text in the console and pager using our Find Widget.
+  * A new MacOS X Application
+    * We now provide a DMG for simple drag and drop installation.
+    * The App comes with its own interpreter, which has the main Python scientific libraries preinstalled: Numpy, SciPy, Matplotlib, IPython, Pandas, Sympy, Scikit-learn and Scikit-image.
+  * A much improved debugging experience
+    * A new debugger toolbar, quite similar in spirit to the one present in Matlab. It works with both Python and IPython consoles.
+    * A new breakpoints widget, which lists all active breakpoints set in  open or closed files.
+    * Breakpoints are updated in the Python and IPython consoles after being added or removed from the Editor.
+  * Several Editor improvements
+    * Faster and more accurate code completions for the most important scientific packages
+    * Zoom in and out with Ctrl + the mouse wheel
+    * A new dark theme
+    * Automatic insertion of colons
+    * Automatic insertion of quotes
+    * New syntax highlighters for Matlab, batch, ini, NSIS and IDL files.
+  * A better looking and faster Object Inspector
+    * Several improvements to its style.
+    * It can now show mathematical equations written in Latex, using the MathJax Sphinx plugin.
+    * Rich text docs are now rendered in a thread to avoid UI lookup.
+  * Single instance mode
+    * Users can now open Python scripts from their file explorer on the currently available instance.
+    * Linux users can also open their files from the terminal.
+  * Spanish translation of the interface
+
+=== Bug fixes (since v2.1) ===
+
+  * Issue  318  Create a widget to list all breakpoints
+  * Issue  349  Add "Run selection or current block" action to Editor's context menu
+  * Issue  448  Editor: disable code-related features inside comments (code completion, auto-indentation, ...)
+  * Issue  466  Can't use Spyder to open python scripts (.py files) from the terminal or the file explorer
+  * Issue  554  Improved debugger integration
+  * Issue  609  Debugging: Unsetting a breakpoint in the editor isn't reflected until you restart debugging entirely
+  * Issue  650  After deleting a directory set as working directory and changing to a new working directory the script won't run
+  * Issue  687  Indentation error when trying to "run selection" on simple indented code
+  * Issue  697  Create a DMG package for Spyder
+  * Issue  764  Jump to the next result when pressing Enter in search field
+  * Issue  836  Spyder is sometimes not detecting file changes from external editors
+  * Issue  849  Breakpoints are ignored sometimes
+  * Issue  853  Problems with code completion after adding submodules to ROPE_PREFS/extension_modules
+  * Issue  865  Run selection (F9) in IPython console 0.11+: problem with indented blank lines
+  * Issue  940  open_in_spyder not defined
+  * Issue  955  Breakpoints in debugger do not move correctly when editing code
+  * Issue  971  Add "Open with Spyder" entry to Windows File Explorer's context menu
+  * Issue  994  mathjax does not get installed properly
+  * Issue  997  Some docstrings are getting truncated in the object inspector
+  * Issue  1008  Fail on context menu call in project explorer when project files are inside symlinked dir
+  * Issue  1018  Menu locations, "Run Configurations" &  "Preferences"
+  * Issue  1026  Decide the best strategy to comment selections on the Editor
+  * Issue  1032  Running a script from editor does not send runfile() correctly to IPython Qt plugin
+  * Issue  1050  First implementation of the "IPython Console" plugin (single instance version)
+  * Issue  1051  New IPython Console (Spyder 2.2+): add support for the %edit magic command
+  * Issue  1054  New IPython Console (Spyder 2.2+): update variable explorer after new prompt
+  * Issue  1055  New IPython Console (Spyder 2.2+): add support for history management
+  * Issue  1056  New IPython Console (Spyder 2.2+): add an option to customize In/Out prompts
+  * Issue  1057  New IPython Console (Spyder 2.2+): Add our FindReplace widget to every console
+  * Issue  1058  New IPython Console (Spyder 2.2+): Add Ctrl+I keyboard shortcut to send an object the Object Inspector
+  * Issue  1059  New IPython Console (Spyder 2.2+): drop support for IPython in external console
+  * Issue  1061  New IPython Console (Spyder 2.2+): add support for "Find in files" plugin
+  * Issue  1062  New IPython Console (Spyder 2.2+): add a dedicated section in documentation
+  * Issue  1064  Editor performance issue since revision d98df4092e16
+  * Issue  1069  Focus goes to kernel not client with pdb in IPython client
+  * Issue  1078  IPython Console: Cannot interrupt started processes
+  * Issue  1079  Can't input Unicode in Internal Console
+  * Issue  1081  ipython-qtconsole not listed as optional dependency in Ubuntu
+  * Issue  1083  Make Ipython qtconsole widget more intuitive
+  * Issue  1085  IPython console: sometimes files are executed in wrong IPython
+  * Issue  1094  Error message when trying to save a file
+  * Issue  1095  Preferences Dialog doesn't remember size
+  * Issue  1101  Interrupt (Ctrl+C) in the console does not work in Spyder on Mac Os X
+  * Issue  1106  Spyder console crashes when trying to type in console after running script
+  * Issue  1112  Opening a file from the linux command line
+  * Issue  1128  please remove pyflakes and rope from the .zip files
+  * Issue  1136  IPython console: cannot connect to external kernels
+  * Issue  1138  Rich text in object inspector mishandles some scipy docstrings
+  * Issue  1163  Improve the spyder.desktop file fo easier integration into Linux
+  * Issue  1169  Saving variables does not retain uppercase letters of variable names
+  * Issue  1179  Pylint "go to line" does not work with the additional dot in filename
+  * Issue  1186  scipy.weave doesn't work in the Mac app
+  * Issue  1191  Inconsistent behaviour of the Editor on code completion and object introspection
+  * Issue  1199  spyderlib/utils/windows.py has incorrect encoding
+  * Issue  1201  Let the user set the default filter when opening file
+  * Issue  1210  Enhancement: Create sphinx rich text docstrings in QThread
+  * Issue  1226  MacOS X App - Can't import libraries from other Python interpreters
+  * Issue  1227  Auto inserted colon causes pylint error
+  * Issue  1229  Which version of ipython is needed for Spyder 2.2.0?
+  * Issue  1230  Better handle for mathjax and jquery embeded libraries on linux systems
+  * Issue  1232  Cmd-Space is not showing code-completion options
+  * Issue  1233  ERROR and WARNING when compiling the documentation
+  * Issue  1234  Edit .enaml files as text file
+  * Issue  1236  Fix Qt Network Access warning messages that appear on the terminal
+  * Issue  1241  'Remove block comment' is not working
+  * Issue  1242  Can't start spyder2.2 on Win 7, crashes upon saving .spyder.ini
+  * Issue  1249  "Run block" and "Run File" are not working for external IPython kernels
+  * Issue  1250  Spyder crashes on launch if the project explorer is used
+  * Issue  1252  Expansion of nodes on tree view undoes itself
+  * Issue  1253  Spyder is not detecting the presence of iPython 0.13.1rc2 nor IPython 1.0dev
+  * Issue  1258  Focusing the "Replace with:" Text Box causes the editor to jump to the next instance of the item that's in the find box
+  * Issue  1261  IPython kernel/clients: error when closing an IPython console
+  * Issue  1266  Let the user eliminate breakpoints from the "Breakpoints widget"
+  * Issue  1269  Dataloss when Spyder gets confused about which file goes with which editor tab
+  * Issue  1271  Find and replace by empty string
+  * Issue  1272  Fix code completion speed issues on the Editor
+  * Issue  1275  Spyderlib fails to start new IPython consoles, raises socket exception
+  * Issue  1277  Enthought Python Distribution and Spyder DMG are not working well on Mac OS X
+  * Issue  1281  Mac App - Spyder swallows AssertionErrors while executing a file
+  * Issue  1285  Object Inspector Crashes when Reloading Page
+  * Issue  1286  Broken links in Help
+  * Issue  1287  Saving file under different file name in split-window mode lets non-focused window jump to first file
+  * Issue  1288  Some rope_patch improvements
+  * Issue  1296  Clickable tracebacks in console are not working in PySide
+  * Issue  1298  Mac App - matplotlib is not detecting ffmpeg to create animations
+  * Issue  1299  pylint keeps opening same file at startup
+  * Issue  1309  Clicking on filename in structure widget sets the cursor at the beginning of the file
+  * Issue  1314  QPainter warnings when moving/undocking widgets in main window
+  * Issue  1315  Project not closing files associated with after closing it
+  * Issue  1325  Spyder cannot be re-opened on Windows if parent console is closed
+  * Issue  1327  Allow global options for Run Configuration
+  * Issue  1344  Mac App - Spyder crashed and can't be open again
+  * Issue  1345  Code Review Request: Update breakpoints during pdb sessions
+  * Issue  1347  The spyder.desktop has an wrong line
+  * Issue  1353  Error messages in internal console when rope is not installed
+  * Issue  1363  2.2rc installation takes a long time because of sphinx dependency
+  * Issue  1364  No spyder.ico after installation on Windows
+  * Issue  1369  Using the subprocess.check_output function breaks compatibility with Python 2.5 and 2.6
+  * Issue  1371  Crash when adding text to multiline comment is CSS
+  * Issue  1372  SphinxThread might return AttributeError
+
+
+----
+
+
+== Version 2.1.13.1 ==
+
+=== Bug fixes (since v2.1.13) ===
+
+  * Spyder startup: fixed PyQt minimum version requirement test (the old poor comparison algorithm was considering that v4.10 was older than v4.4...) (See issue 1291)
+  * Console: Matplotlib was always imported even when the Matplotlib's Patch option was not available (i.e. the Matplotlib installed version was not compatible with the patch). As a consequence, even when disabling every console advanced option in preferences, the preloaded module list was huge
+  * Editor:
+    * When closing Spyder with unsaved modified files, Spyder was asking confirmation as many times as there were editor windows. Only one confirmation is necessary because, with current editor design, all editor windows are synced.
+    * When creating two new files, saving one of them will lead to temporarily mask the leading '`*`' indicating the fact that the other untitled file was not already saved. This is simply a display issue: internally, it is clear that the file is in a non-saved state and Spyder will ask for it to be saved when trying to close the file
+    * Multiple windows: when saving a new untitled file, other editor windows were getting confused on file list order -- eventually leading to data loss
+    * Open file dialog: default file type filter now matches the current file (See Issue 1201)
+  * Fixed "PyQt Reference Guide" link
+
+=== Other changes (since v2.1.13) ===
+
+  * Editor: Ctrl+MouseWheel is now zooming in/out the editor text size (see Issue 1270)
+  * About dialog box: changed the "This project is part of Python(x,y)" part to more general words (which are also closer to the initial meaning of this sentence) including a citation of WinPython
+
+----
+
+== Version 2.1.13 ==
+
+=== Bug fixes (since v2.1.12) ===
+
+  * Fixed issue 1158: "pip install spyder" fails on non-Windows platforms due to a bug in pip installation process (missing spyderlib_win_postinstall.py script)
+  * File Explorer/Windows/Fixed "remove tree" feature: added an error handler in shutil.rmtree to be able to remove a non-empty folder with shutil.rmtree is not working on Windows when it contains read-only files
+  * (See Issue 1106) Fixed "error: unpack requires a string argument of length 8" related to socket communication between Spyder and the remote Python process
+  * Editor:
+    * After splitting horizontally or vertically the editor window, filenames were not synchronized when saving a file as another name (see Issue 1120)
+    * Fixed error when trying to "Save as..." a file with extension to a file without any extension (see Issue 1183)
+    * pep8 code analysis: a new line character was abusively added by Spyder to source code before analyzing it because it's necessary for pyflakes but it's not for pep8! (see Issue 1123)
+    * Fixed UnboundLocalError when clicking on "Search/Replace" button if both search pattern and replace pattern fields are empty (see Issue 1188)
+  * Pylint plugin/tree widget: "go to line" was not working when filename contained additionnal dots (see Issue 1179)
+  * Fixed critical bug when an invalid/unsupported version of pyflakes is installed (see Issue 1181)
+  * Editor/block comments: fixed remaining PyQt API v2 compatibility issues (see Issue 905)
+  * Variable explorer: more flexible name fixing algorithm (even if it's not a good practice to use reference names with upper case letters, we do not remove them anymore) -- See Issue 1169
+
+=== Other changes (since v2.1.12) ===
+
+  * Spyder about dialog box: added Python build architecture (32 or 64 bits)
+  * Find in files: fixed default 'exclude pattern' which was accidently excluding all files starting with 'build' instead of simply excluding 'build' folders as intended
+  * For the sake of consistency, now using single-clicks for activating entries of all tree widgets in Spyder ("Find in files" and "Pylint" are now consistent with the "Outline" explorer) -- See Issue 1180
+
+----
+
+== Version 2.1.12 ==
+
+=== Bug fixes (since v2.1.11) ===
+
+  * Spyder settings: sometimes (virus protection?) the .ini file can't be written, and removing the .ini file before writing seems to help, as suggested here: https://groups.google.com/forum/#!msg/spyderlib/a_P9JBJEZeE/gOK_Pr2WbE8J (see Issue 1086)
+  * Fixed Home/End key behaviour inconsistency on MacOS X (See Issue 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
+  * Fixed "TypeError: file_saved(long,long).emit(): argument 1 has unexpected type 'long'" error occuring on some Linux 32-bit platforms -- See Issue 1094
+  * Console: find/replace widget "Search next/previous occurence" feature was broken
+
+=== Other changes (since v2.1.11) ===
+
+  * Portable version of Spyder (inside WinPython):
+    * Spyder '?' menu: added documentation detection (.chm, .pdf) in sys.prefix\Doc (Windows-only)
+    * Project explorer:
+      * Handling errors when opening a workspace which has been moved
+      * Workspace is now configured with relative paths, so it can be moved from a location to another and still be opened in Spyder
+  * Windows: moved the functions hiding parent console to spyderlib/utils/windows.py
+
+----
+
+== Version 2.1.11 ==
+
+=== Bug fixes (since v2.1.10) ===
+
+  * Critical bugs:
+    * Editor (Issue 960): cannot open/save files from GUI (QFileDialog issue with !PyQt4 v4.6)
+  * General:
+    * Spyder menu bar: fixed menu ordering issue with Ubuntu/Unity
+    * All console widgets: Shell widget: fixed "Clear terminal" (Ctrl+L) shortcut
+  * Console:
+    * Cleaned up widget interactions after Python script execution (before this changeset, it was possible to send data to console, which not only was not needed but was generating disturbing errors in the internal console...)
+  * Editor:
+    * If user accept to fix "mixed end-of-line characters", when opening file, the current editor was set as "modified" (the tab title had a `*` at the end) instead of the newly created editor
+    * "occurrence highlighting" was highlighting previous word even if there was a whitespace between cursor and this word
+    * Code analysis thread manager: handling errors while executing threads
+    * "Replace all" was not regrouping changes into a single undo/redo step
+    * "Find/Replace": replacements were not done for case unsensitive searches
+    * Position of the 79-chars edge line is now more accurate on Linux, the older processed position was inaccurate with some font size of the classic "!DejaVu Sans Mono" monospace font
+  * !IPython:
+    * Version detection was broken so Preferences...Console...External Modules was incorreclty hiding the command line options line edit
+    * Because the detection was not working correctly, it was not possible to start an !IPython kernel with the just released !IPython 0.13
+  * Project explorer was sometimes producing !AttributeError when loading because of the workspace was not defined at the beginning of the class constructor
+  * pyflakes code analysis function:
+    * Handling files with invalid \x or null chars
+    * This fixes a part of Issue 1016 by handling the following pyflakes bugs:
+      * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=674796
+      * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=674797
+
+=== Other changes (since v2.1.10) ===
+
+Installer for Windows (bdist_wininst/bdist_msi):
+  * added Start Menu shortcuts
+  * added 'pyflakes' and 'rope' (if available in the repository) to the package list (this is not conventional but Spyder really need those tools and there is not decent package manager on Windows platforms, so...)
+
+This change will make the Spyder building process simpler for Windows as the Python(x,y) won't be needed anymore to provide Start Menu shortcuts or to install 'rope' and 'pyflakes' at the same time. Now, there is no significative difference between the standard installers built with distutils (bdist_wininst or bdist_msi options) and the Python(x,y) plugin, except for the "package upgrade" ability (uninstall previous version) which is still not (and won't be) supported by distutils.
+
+----
+
+== Version 2.1.10 ==
+
+=== Bug fixes (since v2.1.9) ===
+
+  * Critical bugs:
+    * Spyder crashed at startup/!TypeError: `_isdir()` takes exactly 1 argument (0 given). Affects only Windows platforms with Python 3.2.2+ or 2.7.3+)
+    * Spyder was freezing when working with netCDF4 objects in the interactive console
+    * Console: h5py was systematically imported to avoid crashes with the HDF5 plugin (Variable Explorer's I/O plugin). These ugly workarounds introduced with revision 3affc82ce081 were removed in this changeset to avoid side effects like DLL version conflict on Windows platforms. The main risk of this change is to break the HDF5 plugin on some configurations. But this is the best compromise.
+  * General:
+    * Fixed regression: when no Qt library is installed (!PyQt/!PySide), warning the user with a Tkinter dialog box (if possible)
+    * Fixed Preferences Dialog flickering issue introduced with revision a4e1565e93c5
+    * Run configuration dialog: fixed Tab focus order behavior
+    * Fixed "Run > Configure..." and "PYTHONPATH management" entry locations on MacOSX
+    * Updated bootstrap script and Qt library selection logic to accomodate launch of Spyder using PySide while PyQt is also installed (Issue 1013, see Issue 975 for additional background).
+    * Fixed several encoding problems preventing Spyder from launching when the user's home directory contains non-ASCII characters (Issue 812, Issue 1027).
+    * Debugging: Issue 684: Debug with winpdb will now use the command line options and working directory specified in the General Setting section of the Run Configuration dialog
+  * Console:
+    * Changed "Clear shell" shortcut to "Ctrl+L" to avoid conflict with the Windows Task Manager shortcut on Windows platforms
+    * Preferences/Advanced options: added option to start an IPython kernel at startup
+  * Editor:
+    * When multiple files were open, close-clicking 1 file was closing 2 files on 64-bits OS
+    * Conditional breakpoint could not be changed to regular breakpoint
+    * Outline Explorer: removed obsolete decorated methods icon (a decorated method is now shown exactly as a regular method)
+    * Top-left corner menu (file list): fixed common prefix removal feature
+    * "Outline" item selection opened in incorrect split panel due to a lost signal when focus changed from an editor to another
+    * when splitting window after changing a shortcut, old shortcut was still active
+  * Internal console/fixed an old regression: re-added help(), raw_input() support
+  * Profiler: tree was sometimes empty + fixed error when file path contained "&"
+  * File/Project explorer: fixed [by shchelokovskyy] Git commit/browse support
+  * Find in files: fixed crash due to a bug in the common prefix finder function
+
+=== Other changes (since v2.1.9) ===
+
+  * Checked Spyder's `rope` patch compatibility with rope v0.9.4
+  * IPython plugin (experimental):
+    * added support for "Execute in current interpreter"
+    * added support for "Execute selection or block (F9)"
+    * imports from local directory did not work
+    * when a new kernel is started in Console, tabifying the frontend to the Console (for the first created frontend) and the next frontends to the previously created frontend
+    * clients (frontends) may now really be closed (see context menu). The associated kernel and related clients may be closed as well (a message box dialog ask the user about this)
+    * added support for the "Object Inspector to/from IPython kernel" link
+    * improved reliability of the "Editor to/from IPython kernel" link
+    * fixed focus management issue (link with variable explorer and object inspector)
+
+----
+
+== Version 2.1.9 ==
+
+=== Bug fixes (since v2.1.8) ===
+
+  * Run configuration/bugfix: command line options were not properly parsed
+  * Preferences dialog was not showing up with !PySide installed *and* without !PyQt4
+  * Editor:
+    * Closing additional editor window produced traceback and primary editor breakdown
+    * File/Open: embedded editor popped up even if there is one in a separate window
+    * 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")
+  * Console:
+    * Console was unusable (endless tracebacks) when monitor was disabled
+    * File drag'n drop was not working (should execute dropped file)
+  * (Experimental) IPython plugin:
+    * Fixed compatibility issues with !PyQt4 and IPython 0.12
+    * Fixed multiple instances issue (it was not possible to open more than one IPython frontend) and other issues
+    * IPython kernel connections were unpredictable (Issue 977)
+  * Dictionary editor (Variable explorer): fixed !UnboundLocalError when context menu is called on an empty table
+  * Object inspector failed to show an error message due to unicode error
+  * Project Explorer:
+    * "Show all files" option was broken after restarting Spyder
+    * It was impossible to create a project from an existing directory located outside the workspace
+
+----
+
+== Version 2.1.8 ==
+
+=== Bug fixes (since v2.1.7) ===
+
+  * Editor/Source code toolbar:
+    * "Show task list" and "Go to the next task" actions: the "Show TODO/FIXME/XXX/HINT/TIP comments list" button was not working
+    * "Show warning/error list" and "Go to the next warning/error" actions: the "Show code analysis warnings/errors" button was not working
+
+----
+
+== Version 2.1.7 ==
+
+=== Bug fixes (since v2.1.6) ===
+
+  * Main window:
+    * Detached dockwidgets were not painted after restarting Spyder (Issue 880)
+  * Console:
+    * Enhanced Python interpreter: %clear command was broken since v2.1.5
+  * Object inspector's rich text mode: fixed unexpected indent error
+  * !IPython plugin: fixed compatibility issue with latest v0.12dev (thanks to Boris Gorelik)
+
+=== Other changes (since v2.1.6) ===
+
+  * Variable explorer/Array editor: added support for masked arrays
+  * Showing Spyder's internal console automatically when there is a traceback
+  * Do not crash when a 3rd party plugin failed to import
+  * Editor:
+    * Automatic insertion of single, double and triple quotes
+    * Automatically colons insertion when pressing Enter after 'if', 'def', etc
+    * Don't trigger code completion on comments if text ends with a dot
+    * Added keyboard shortcut (Ctrl+Shift+Escape) to clear the console
+    * Added keyboard shortcut (Ctrl+P) to print current file (thanks to fheday at gmail dot com for the contribution)
+    * Code introspection features (code completion, calltips, go-to-definition) are now working even if script has syntax errors
+
+----
+
+== Version 2.1.6 ==
+
+=== Bug fixes (since v2.1.5) ===
+
+  * Critical bug on certain Windows platforms (not sure yet if it's related to a particular version of PyQt or something else): all plugins (dockwidgets) were shown detached (or hidden) from the mainwindow at startup (this is related to the attempt fixing Issue 880)
+
+----
+
+== Version 2.1.5 ==
+
+=== Bug fixes (since v2.1.4) ===
+
+  * [This bugfix was removed on v2.1.6 due to side-effects](Fixed on Windows platforms with !PyQt v4.8+ only) Detached dockwidgets (Console, ...) were not painted after restarting Spyder
+  * Editor/Outline-bugfix: duplicate entries were shown when the editor was synchronizing file contents with disk
+  * File/Project explorer:
+    * Fixed regression regarding Issue 740 (fixed in v2.1.0, re-introduced in v2.1.2): couldn't open files with non-ascii characters in their names
+    * SCM support: commit/log actions were not working when right-clicking on a file instead of a folder
+  * Console:
+    * Monitor/Introspection: fixed socket communication issue due to a !MemoryError -- This error was mixing communication messages, causing various problems described in Issue 857 and Issue 858. This bug was reported by ruoyu0088, who also tried (and succeeded) to fix it and suggested a workaround which is implemented in this release
+    * Fix critical console hang on OS X when using the "Run selection or current block feature" (see Issue 502)
+    * Apply the right scheme color to the !IPython console when there weren't any options provided by the user or when the only option was "-colors LightBG"
+  * Windows platforms:
+    * "Preferences" dialog was not shown if account username contained non-ASCII characters
+  * Object Inspector:
+    * Show signatures for docstrings sent from the Editor (see Issue 690)
+
+=== Other changes (since v2.1.4) ===
+
+  * Debugging: when a non-empty SPYDER_DEBUG environment variable exists, Spyder switch to debug mode (log files are created in user's home directory and debug prints are available in the terminal)
+  * Variable explorer/Dictionary editor: added option to plot histogram from a 1-D array
+  * Console:
+    * standard Python interpreter is now a real Python interactive session: the older implementation was running a startup script and tried to emulate a standard Python interactive session (changing attributes like __name__, running the PYTHONSTARTUP script, etc.). But this implementation was not close enough to the standard Python interactive session, i.e. when you execute `python` outside Spyder, without any argument. A recent bug report confirmed this: the PYTHONSTARTUP script was exe [...]
+    * when running a standard Python interpreter, instead of running the startup script (spyderlib/widgets/externalshell/startup.py), the shell widget (ExternalPythonShell) simply runs the python executable with -u -i options, that's all. So now, the PYTHONSTARTUP script is executed as expected.
+    * Scientific startup script (default PYTHONSTARTUP in Spyder): added floating point division (from __future__ import division)
+    * PySide support:
+      * Added new "Qt (PyQt/PySide)" settings group in "External modules" tab
+      * It is now possible to select the Qt-Python bindings library: default (i.e. depends on the QT_API environment variable), PyQt or PySide
+      * The PyQt input hook has been adapted for PySide, so it is now possible to do interactive (non-blocking) plotting with PySide
+    * New options for standard Python interpreters (no effect on !IPython):
+      * "Merge process standard output/error channels": merging the output channels of the process means that the standard error won't be written in red anymore, but this has the effect of speeding up display
+      * "Colorize standard error channel using ANSI escape codes": this method is the only way to have colorized standard error channel when the output channels have been merged
+  * Internal console (Issue 868): output is now immediately available
+  * "Maximize current plugin" action: now automatically shows the "Outline" plugin when maximizing the "Editor" plugin
+  * Editor/Outline comment separators: allow space betwee hash and dash, e.g "# --- Outline Separator"
+
+----
+
+== Version 2.1.4 ==
+
+=== Bug fixes (since v2.1.3) ===
+
+  * Console:
+    * *Critical bugfix* for IPython support: variable explorer link was broken (regression introduced with v2.1.3)
+
+=== Other changes (since v2.1.3) ===
+
+  * Console:
+    * option "Open an IPython interperter at startup" is now *explicitely* disabled for IPython v0.11+ (these versions of IPython are not fully supported through Spyder's console plugin)
+
+----
+
+== Version 2.1.3 ==
+
+=== Enhancements (since v2.1.2) ===
+
+  * Variable explorer performance were improved, especially when dealing with very long sequences -- See this discussion: http://groups.google.com/group/spyderlib/browse_thread/thread/3a7ef892695e417a
+  * Variable explorer / dictionary editor: added support for unknown objects -- this allows browsing any object attributes -- This is still experimental.
+
+=== Bug fixes (since v2.1.2) ===
+
+  * General:
+    * Spyder preferences/bugfix: comboboxes with keys other than strings (e.g. the PyQt API selection combo box) were not initialized properly
+    * Fixed memory leaks (QThread objects) in the "Editor" and "Find in files" plugins. In those two plugins, QThread objects were created, then started but were never garbage-collected after they finished their execution
+  * Editor:
+    * Supported file types: added missing C++ file extensions (.cc,
+.hh, .hxx)
+  * Variable explorer:
+    * Debugging: added support for editing objects within functions
+    * Debugging: when debugging, variable explorer link was broken after restarting program
+    * handling errors when trying to enable/disable autorefresh (if one of the running console has no monitor enabled)
+  * Project explorer:
+    * when the workspace has not yet been defined, creating a new project not only warns the user but also proposes to set it right away
+
+----
+
+== Version 2.1.2 ==
+
+=== Bug fixes (since v2.1.1) ===
+
+  * General:
+    * Patched external path library to avoid a crash with a user HOME directory with non-ascii characters
+    * Doc/README: warning the user about the fact that the 'python setup.py install' method does not uninstall a previous version
+  * Console:
+    * Fixed "!AccessInit: hash collision: 3 for both 1 and 1" error (see Issue 595)
+  * Project explorer:
+    * empty workspace/critical bugfix: impossible to create/import projects from context menu (this bug was introduced with a recent revision and stayed unnoticed until then because one has to test this from an empty workspace)
+    * it is now possible to rename projects (safely)
+    * now handling the I/O errors (e.g. read-only configuration files) occuring when loading/saving projects or the workspace: warning the user when an !IOError exception was raised and mention the projects which could not be saved properly
+  * File/Project explorer:
+    * keyboard shortcut 'F2' (rename file/directory) was broken
+    * the "Open" action (context menu) was failing silently for directories (expected behavior: open an external file explorer to browse the directory)
+    * programs.start_file/bugfix: feature was not working on Windows 7
+  * Editor:
+    * Fix empty username in new file template on OS X (patch by Christoph Gohle)
+  * Object inspector:
+    * Rich text mode was not showing headings when invoked from editor (Issue 690)
+
+=== Enhancements (since v2.1.1) ===
+
+  * File/Project explorer:
+    * Added "Delete" keyboard shortcut to remove selected file(s)/folder(s)
+    * SCM integration: added support for !TortoiseHg v2 (only v1 was supported)
+  * Console/Matplotlib options: the backend may now be set separately from the Matplotlib patch
+
+=== Other changes (since v2.1.1) ===
+
+  * Console:
+    * The Matplotlib patch is only applied for Matplotlib <=v1.0
+    * !PyQt API version issues (error like "!ValueError: API 'QString' has already been set to version 1"): the "ignore setapi errors" option is disabled by default, to avoid masking these errors and associated tracebacks
+
+----
+
+== Version 2.1.1 ==
+
+_Note:_ v2.1.1 is a minor update of v2.1.0 (licence issues and minor bug fixes -- see the [http://code.google.com/p/spyderlib/source/list?name=v2.1.1 Mercurial changelog]).
+
+Follow Spyder news on our official blog:
+http://spyder-ide.blogspot.com/
+
+=== Compatibility/Requirements ===
+
+Since version 2.1:
+  * Spyder is now compatible with:
+    * !PyQt's API v1 (i.e. compatible with !PyQt 4.4 and 4.5), the default Python 2 API
+    * *and* !PyQt's API v2 (this is the future: default Python 3 API and !PySide-compatible API)
+    * *and* with !PySide (!PySide support is still experimental as this library is still young but its stability is evolving rapidly)
+  * Editor/code analysis: Spyder now requires *pyflakes v0.5.0* (included in Windows installers).
+
+=== New features since v2.0.12 ===
+
+*New major features*:
+  * New *Profiler* plugin (thanks to Santiago Jaramillo)
+  * New experimental *IPython* plugin embedding IPython's Qt console: see [http://spyder-ide.blogspot.com/2011/08/preview-of-new-ipython-plugin-for.html here]
+  * General:
+    * Main window:
+      * added "Custom window layouts" management (see menu "View")/handling 3 custom layouts: default shortcuts Shift+Alt+FX to switch to/from layout #X and Ctrl+Shift+Alt+FX to set layout #X
+      * "General" preferences page: added option to set the Qt windows style, depending on platform (Plastique, Cleanlooks, CDE, Windows...)
+      * Menu "?": added menu entry to report Spyder issues, filling automatically informations on your configuration
+      * Reorganized "Run"/"Source" menu, added "Interpreters" menu
+      * Fixed application name for Gnome 3/Fedora 15
+    * Command line options: added option "--defaults" to reset settings (stored in .spyder.ini) to defaults (a lot of settings are preserved: shortcuts, window layouts, ...) -- this is less brutal than "--reset" which reset all settings by removing all configuration files related to Spyder
+
+  * *Outline* (function/class browser) is now a plugin in itself, embedded in its own dockwidget: Spyder's window layout is even more customizable than before
+  * *Code completion*
+    * (Editor/Console): entries starting with an underscore character are now placed to the end of the suggested list
+    * (Editor/Console): Import statements are now completed correctly
+  * *Console*:
+    * Major code cleaning: running Python applications in Spyder has never been cleaner and is very close to a simple Python interpreter
+    * Added built-in function `open_in_spyder` to open a file in Spyder's source code editor from the console
+    * Standard Python interpreter:
+      * now refresh the variable explorer at each new prompt (even if auto-refresh is disabled -- actually, this is the typical use case)
+      * added support for basic special commands (%pwd, %ls, %clear) and system commands (starting with '!', e.g. !dir or !ls)
+      * added [http://spyder-ide.blogspot.com/2011/09/new-enhanced-scientific-python.html "scientific" startup script] with support for numpy, scipy and matplotlib
+    * Preferences (External modules tab):
+      * added an option to set !PyQt API to v1 or v2 -- this avoids issues with Enthought Tool Suite or any other library/program using !PyQt API v2 which is *not* the default API for Python 2
+      * changed matplotlib patch to fix compatiblity issue with !PyQt API v2
+    * Preferences (Advanced Settings tab): added option "Python executable" to customize path to Python interpreter executable binary
+  * *Variable explorer*:
+    * New HDF5 plugin ([http://code.google.com/u/DavidAnthonyPowell/ DavidAnthonyPowell]): import/export HDF5 files to/from the variable explorer
+    * Dictionary editor/Variable explorer:
+      * Added support for more NumPy data types
+      * Added action "Resize rows to contents" (partially implements feature requested with Issue 807)
+  * *Editor*:
+    * find/replace:
+      * added support for *multiline* regular expression search pattern
+      * added support for *multiline* regular expression text replacement
+      * added button "Highlight matches" to highlight all found results
+    * syntax highlighting: added support for OpenCL, gettext files, patch/diff files, CSS and HTML files
+    * support for "2 spaces" and "tabs" indentation characters
+    * new code analysis feature: added support for the [http://pypi.python.org/pypi/pep8 pep8] style guide checker
+    * "Comment" and "Uncomment" actions were replaced by a single "Comment/Uncommment" toggle action
+    * (Fixes  Issue 811 ) "Run configuration": added "Run in an external system terminal" option
+  * *File explorer* and *Project explorer*:
+    * great performance improvement (using a multithreaded file system model)
+    * Added minimalist SCM support (Mercurial and git are currently supported)
+  * *File explorer*: added an option to "Show current directory only"
+  * *Project explorer*: this plugin was entirely rewritten to improve performances and usability
+  * *Pylint plugin*:
+    * added option to save file before analyzing it
+
+Spyder's console embedded in your application (spyderlib.widgets.internalshell):
+  * in traceback, a clickable link now opens the associated file in Spyder (if application was launched from Spyder with monitor enabled)
+  * Application sample embedding Spyder's internal shell: upgraded to guidata v1.4+ (simplified build script a lot!)
+
+Windows platforms specific changes:
+  * (requires pywin32) Hiding the attached console window:
+    * allow running Spyder with 'python.exe' without visible console (this avoid using 'pythonw.exe' which does not attach a console to the process, hence preventing standard I/O to be redirected in a subprocess executed within Spyder, e.g. in your own program)
+    * the attached console may be shown/hidden from menu entry "View > Attached console window (debugging)"
+  * Major change for Windows/!PyQt users: standard Python interpreter now supports interactive GUI manipulations thanks to a new Spyder-specific input hook (replacing !PyQt's input hook which is not working within Spyder on Windows platforms) -- the input hook works even better than !PyQt's builtin input hook (with a Python interpreter opened outside Spyder)!
+  * Spyder's stand-alone version building process was improved. This version is now available on project's download page.
+
+=== Bug fixes (since v2.0.12) ===
+
+*Spyder's main window*:
+  * !QtDesigner and !QtLinguist were not detected on Fedora
+  * Console/Editor: code completion widget was partially hidden when working on two monitors and if Spyder's window was on the right screen
+  * Fixed bugs due to too early/frequent calls to plugin refresh methods during startup
+
+*Console*:
+  * IPython Interpreter: Turn off autoindent magic to avoid indentation errors with code with inline comments
+
+*Editor*:
+  * Fortran syntax highlighter was made case insensitive
+  * Fixed !IndentationError when running first line of a file
+  * Read only files allowed ".", "[", "(", etc. to be entered into the text editor
+  * Fixed segmentation faults occuring after using the vertical-horizontal splitting feature
+  * If a file name had non-ascii characters then code completion
+(and all other rope-based features) in the editor stopped working
+  * Code analysis: fixed tasks pattern (for example, previous one was matching "TIP" in "MULTIPLICATION"... now it will match only single "TIP:" or "TIP ")
+  * (Fixes  Issue 704 ) Outline was showing the delimiters of block comments ('#------...-'), causing nesting inconsistencies because block comments are not indented properly with respect to the code around
+  * Fixed several bugs with the "Run selection or current block" feature.
+
+*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)
+
+----
+
+== Version 2.0.12 ==
+
+=== Bug fixes (since v2.0.11) ===
+
+  * (Fixes Issue 476) Editor/bugfix: print preview was not working
+  * Completion widget/bugfix (editor/console): combo box was truncated by main window depending on its size
+  * widgets.sourcecode.base.TextEditBaseWidget/bugfix: parenting to None was not working
+  * Console/Text wrap mode: character wrapping was not implemented since we switched from QTextEdit to QPlainTextEdit
+  * (Fixes Issue 649) Patch submitted by [http://code.google.com/u/DavidAnthonyPowell/ DavidAnthonyPowell] - Syntax highlighter does not recognise imaginary, binary or octal numbers
+  * Spyder's layout: fixed window position/size issues when maximized/fullscreen mode was active
+  * Object inspector: fixed minor bug (simple traceback in the internal console) when handling a sphinx error
+  * (Fixes Issue 667) Editor/bugfix: Shift+Enter inserted lines that did not get line numbers
+  * (Fixes Issue 672) Editor: TODO/FIXME were not detected if not followed by ':' (HINT/TIP were properly detected)
+
+=== Enhancements (since v2.0.11) ===
+
+  * (Fixes Issue 655) Editor/pyflakes-powered code analysis: warnings are now ignored for lines containing "pyflakes:ignore"
+
+=== Other changes (since v2.0.11) ===
+
+  * Internal console (Spyder debugging only): turned off the multithreaded mode
+
+----
+
+== Version 2.0.11 ==
+
+=== Bug fixes (since v2.0.9) ===
+
+  * (Fixes Issue 616) Pylint plugin: tree widget header text was not updated when analyizing a new script (the last analyzed script name was still shown)
+  * Editor/completion widget/bugfix: pressing shift was hiding the completion combo box
+  * (Fixes Issue 630) Added missing default settings for "Spyder light" (only necessary when installing from scratch and without any remaining .spyder.ini file)
+  * Editor/Console-bugfix: info tooltips (calltips) were hidden right after being shown (i.e. when typing any character after the left parenthesis)
+  * (Fixes Issue 631) Drag and drop of files into editor on Linux was pasting path instead of opening the file
+  * (Fixes Issue 640) Editor: block comment was not working correctly at end of file
+  * Code completion widget (Editor/Console) - bugfix: parenting to the ancestor widget was necessary on Linux
+  * (Fixes Issue 546) (Contributor: [http://code.google.com/u/alex.fargus/ Alex Fargus]) C/Cpp syntax highlighting bugfix
+  * (Fixes Issue 646) IPython integration: fixed pyreadline monkey-patch for pyreadline v1.7
+
+=== Enhancements (since v2.0.9) ===
+
+  * File explorer widget/plugin: improved performances (widget is now populated in a separate thread)
+  * Spyder crash dialog: warning the user about the '--reset' option (this will remove all configuration files)
+
+----
+
+== Version 2.0.9 ==
+
+=== Bug fixes (since v2.0.8) ===
+
+  * Console: added option to ignore PyQt/sip errors when trying to set sip API (fixed Enthought Tool Suite 3.6.0 compatibility issue)
+  * utils.dochelpers.getargtxt/bugfix: retrieving builtin function arguments was no longer working
+  * (Fixes Issue 499) Editor-related keyboard shortcuts were not applied after opening files
+  * (Fixes Issue 575) Tab scroll buttons were not shown on OS X resulting in clamped/changing window sizes
+  * (Fixes Issue 574) Debugging: Spyder only synced at debugger breakpoints
+  * (Fixes Issue 576) "Source / Remove trailing spaces" was removing newline at the end of file (+ added support for "undo")
+  * (Fixes Issue 582) Console: changing font preferences was requiring a restart to be fully taken into account
+  * (Fixes Issue 562) Spyder was unable to restore editor's outline explorer tree when mixed ' and " characters were found in tree entries
+  * (Fixes Issue 590) Shell/"Clear line" shortcut was not correct: this is actually "Shift+Escape" (not "Escape")
+  * (Fixes Issue 591) History log was systematically erased when updating Spyder version
+  * Outline explorer/bugfix: when opening file, the 'show/hide all files' option was not applied (this was then applied when switching from a file to another)
+  * (Fixes Issue 602) Backported from v2.1 a couple of bugfixes related to Editor and multiple panels
+  * Object inspector: when raised automatically above other dockwidgets, plugin refresh was unnecessarily triggered
+  * Editor/code completion-bugfix: some key events (e.g. Ctrl+V) were lost during code completion-related hang-up
+  * (Fixes Issue 599) Multiline text pasting was not working in a newly opened console (i.e. first prompt)
+
+=== Enhancements (since v2.0.8) ===
+
+  * Major change/Translations: moved from 'QtLinguist' to 'gettext' (localizing Spyder should now be easier)
+  * Console: increased default maximum line count (buffer depth) up to 10,000 lines (instead of only 300 lines)
+  * Editor's rope-based introspection features (code completion, calltips, go to definition): new rope monkey-patch providing major performance improvements
+  * File explorer/Project explorer - opening file with associated application: now supported on all platforms
+  * Added action "Reset window layout" in "View" menu to reset main window layout to default
+  * Documentation: added page on debugging
+  * Editor: added syntax highlighters for diff/patch files (.diff, .patch, .rej) and gettext files (.po, .pot)
+  * (Fixes Issue 537) Global working directory toolbar: removed label considering the fact that the toolbar widgets are quite explicit on its role (and the combo box tooltip is explaining it in detail)
+  * (Fixes Issue 598) Added a .desktop file in source package
+  * (Fixes Issue 87) Editor plugin's title now show the current script filename
+
+----
+
+== Version 2.0.8 ==
+
+=== Bug fixes (since v2.0.6) ===
+
+  * Consoles/bugfix: saving history log (see context menu) was not working following a recent code cleaning/refactoring
+  * On non-Windows platforms, the file selection dialog "All files (*.*)" filter was not matching files without extension
+  * dochelpers.isdefined/bugfix: ignoring syntax errors while evaluating object
+  * Preferences Dialog (dialog box + keyboard shortcut page): improved size/resize behavior
+  * Editor: when cursor was on the very last line, Duplicate/Delete line features were getting stuck in an infinite loop
+  * Editor/duplicate line feature - fixed unexpected behavior: when duplicating selected text, text selection was extended to duplicated part
+  * Editor/bugfix with multiple editor windows: when opening file on one editor window, the top-left corner menu (file list) was not updated correctly in other editor windows
+  * Editor/fixed unexpected behavior: when clicking on the main window's outline explorer while a separate editor window had focus, the latter was used to show the associated line of code
+  * Project explorer: added new debugging options (profiling 'rope' calls)
+  * Console/Advanced settings/UMD module list: removing all entries (empty module list) was not working
+  * Editor/File list management dialog (Ctrl+E): double clicking/pressing Return on a listwidget item will switch to the associated file
+  * Editor/Tab bar: fixed missing tooltips issue (and missing file switch menu entries)
+  * Code completion/bugfix: list widget was not hiding as expected when pressing ':'
+  * Editor/fixed unexpected behavior: when some text was selected, "Ctrl+Left mouse click" was trying to "go to definition" instead of doing the standard drag n'drop feature
+  * Editor/bugfix: disabling code completion/calltips for non-Python source code (was not working -as expected- but was taking time to simply not work...)
+  * Editor/go to line: fixed unicode error
+  * Code editor/bugfix: cursor position was not restored when undoing an indent operation with "tab always indent" feature turned on *and* the cursor at the end of the line
+  * Tab behavior when "tab always indents" is turned off: inserting 4-(len(leading_text) % 4) spaces (instead of 4)
+  * Object inspector/bugfix: ignoring unknown objects when called automatically from editor/console, i.e. do not log, do not show 'no doc available'
+
+=== Other changes (since v2.0.6) ===
+
+  * Code editor syntax highlighting: added more keywords to Cython syntax highlighter (cpdef, inline, cimport and DEF)
+  * Added example of application using the Spyder's internal shell as a debugging console (demonstrates also the py2exe deployment procedure)
+  * Object inspector: added "Source" combo box (Console/Editor) -> object inspected from editor are now analyzed only with rope (if available) and then shown in object inspector
+  * Added keyboard shortcut to open Preferences Dialog (default: Ctrl+Alt+Shift+P)
+  * Editor: added "Copy line" feature (Ctrl+Alt+Down), similar to "Duplicate line" (Ctrl+Alt+Up) but paste text before the current line/selected text (instead of after)
+  * Array editor: added option to set row/col labels (resp. ylabels and xlabels)
+  * Editor/rope: improved performance for calltips/doc feature
+
+----
+
+== Version 2.0.6 ==
+
+=== Bug fixes (since v2.0.5) ===
+
+  * Console: menu entries "Environment variables", "Current working directory" and "Show sys.path" were not disabled when the Monitor was turned off
+  * Preferences dialog box/Keyboard shortcuts:
+    * conflicts are now ignored if shortcuts have different contexts *except* if one of this context is '`_`' (i.e. global context)
+    * conflict warnings are now also shown when showing the preferences dialog box (not only when modifying shortcuts and applying changes)
+  * Drag/drop Python script to console: fixed TypeError (TypeError: start() got an unexpected keyword argument 'ask_for_arguments')
+  * Console base widget: added support for FF (Form Feed) ANSI sequence - Fixes bug in IPython console: 'cls' and 'clear' magic commands were inactive in IPython consoles
+  * Editor: code completion was sometimes very slow when editing files within a Spyder project
+  * Code editor: fixed "Delete line" feature (Ctrl+D) / was not working with multiline selection
+
+=== Other changes (since v2.0.5) ===
+
+  * Editor/80-column vertical edge line: added options to show/hide this line and change the column number
+  * Editor: added "Comment"/"Uncomment" actions to context menu
+  * Source code and shell editor widgets: code refactoring/cleaning (this should help people using these widgets outside Spyder)
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..f7fdd11
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,334 @@
+Spyder License Agreement (MIT License)
+--------------------------------------
+
+Copyright (c) 2009-2013 Pierre Raybaut
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+
+Included software
+-----------------
+
+License terms are included in any software used inside Spyder's source code.
+
+
+Included images (spyderlib/images)
+----------------------------------
+
+[1] Spyder License Agreement (see above)
+
+spyderlib/images/arredit.png
+spyderlib/images/dictedit.png
+spyderlib/images/none.png
+spyderlib/images/not_found.png
+spyderlib/images/matplotlib.png
+spyderlib/images/options.svg
+spyderlib/images/set_workdir.png
+spyderlib/images/splash.png
+spyderlib/images/spyder.svg
+spyderlib/images/spyder_light.svg
+spyderlib/images/whole_words.png
+spyderlib/images/win_env.png
+spyderlib/images/actions/hist.png
+spyderlib/images/actions/window_nofullscreen.png
+spyderlib/images/editor/filelist.png
+spyderlib/images/editor/function.png
+spyderlib/images/editor/method.png
+spyderlib/images/editor/private1.png
+spyderlib/images/editor/private2.png
+spyderlib/images/editor/refactor.png
+spyderlib/images/console/ipython_console.png
+spyderlib/images/console/ipython_console_t.png
+
+
+[2] Crystal Project Icons
+    Author: Everaldo Coelho
+    Site: http://www.everaldo.com
+    Contact: everaldo at everaldo.com
+    Copyright (c) 2006-2007 Everaldo Coelho.
+
+spyderlib/images/advanced.png
+spyderlib/images/arrow.png
+spyderlib/images/bold.png
+spyderlib/images/browser.png
+spyderlib/images/ext_tools.png
+spyderlib/images/font.png
+spyderlib/images/genprefs.png
+spyderlib/images/inspector.png
+spyderlib/images/italic.png
+spyderlib/images/pythonpath_mgr.png
+spyderlib/images/upper_lower.png
+spyderlib/images/vcs_browse.png
+spyderlib/images/vcs_commit.png
+spyderlib/images/actions/1downarrow.png
+spyderlib/images/actions/1uparrow.png
+spyderlib/images/actions/2downarrow.png
+spyderlib/images/actions/2uparrow.png
+spyderlib/images/actions/auto_reload.png
+spyderlib/images/actions/browse_tab.png
+spyderlib/images/actions/check.png
+spyderlib/images/actions/cmdprompt.png
+spyderlib/images/actions/configure.png
+spyderlib/images/actions/copywop.png
+spyderlib/images/actions/delete.png
+spyderlib/images/actions/edit.png
+spyderlib/images/actions/edit24.png
+spyderlib/images/actions/editcopy.png
+spyderlib/images/actions/editcut.png
+spyderlib/images/actions/editdelete.png
+spyderlib/images/actions/editpaste.png
+spyderlib/images/actions/edit_add.png
+spyderlib/images/actions/edit_remove.png
+spyderlib/images/actions/eraser.png
+spyderlib/images/actions/exit.png
+spyderlib/images/actions/filter.png
+spyderlib/images/actions/find.png
+spyderlib/images/actions/findf.png
+spyderlib/images/actions/findnext.png
+spyderlib/images/actions/findprevious.png
+spyderlib/images/actions/folder_new.png
+spyderlib/images/actions/hide.png
+spyderlib/images/actions/home.png
+spyderlib/images/actions/imshow.png
+spyderlib/images/actions/insert.png
+spyderlib/images/actions/lock.png
+spyderlib/images/actions/lock_open.png
+spyderlib/images/actions/magnifier.png
+spyderlib/images/actions/next.png
+spyderlib/images/actions/options_less.png
+spyderlib/images/actions/options_more.png
+spyderlib/images/actions/plot.png
+spyderlib/images/actions/previous.png
+spyderlib/images/actions/redo.png
+spyderlib/images/actions/reload.png
+spyderlib/images/actions/rename.png
+spyderlib/images/actions/replace.png
+spyderlib/images/actions/show.png
+spyderlib/images/actions/special_paste.png
+spyderlib/images/actions/stop.png
+spyderlib/images/actions/synchronize.png
+spyderlib/images/actions/tooloptions.png
+spyderlib/images/actions/undo.png
+spyderlib/images/actions/up.png
+spyderlib/images/actions/zoom_in.png
+spyderlib/images/actions/zoom_out.png
+spyderlib/images/console/clear.png
+spyderlib/images/console/cmdprompt_t.png
+spyderlib/images/console/console.png
+spyderlib/images/console/environ.png
+spyderlib/images/console/history.png
+spyderlib/images/console/history24.png
+spyderlib/images/console/kill.png
+spyderlib/images/console/prompt.png
+spyderlib/images/console/restart.png
+spyderlib/images/console/syspath.png
+spyderlib/images/console/terminate.png
+spyderlib/images/editor/bug.png
+spyderlib/images/editor/close_panel.png
+spyderlib/images/editor/comment.png
+spyderlib/images/editor/error.png
+spyderlib/images/editor/file.png
+spyderlib/images/editor/fromcursor.png
+spyderlib/images/editor/gotoline.png
+spyderlib/images/editor/highlight.png
+spyderlib/images/editor/horsplit.png
+spyderlib/images/editor/indent.png
+spyderlib/images/editor/last_edit_location.png
+spyderlib/images/editor/newwindow.png
+spyderlib/images/editor/next_cursor.png
+spyderlib/images/editor/next_wng.png
+spyderlib/images/editor/outline_explorer.png
+spyderlib/images/editor/outline_explorer_vis.png
+spyderlib/images/editor/prev_cursor.png
+spyderlib/images/editor/prev_wng.png
+spyderlib/images/editor/select.png
+spyderlib/images/editor/selectall.png
+spyderlib/images/editor/todo_list.png
+spyderlib/images/editor/uncomment.png
+spyderlib/images/editor/unindent.png
+spyderlib/images/editor/versplit.png
+spyderlib/images/editor/wng_list.png
+spyderlib/images/file/fileclose.png
+spyderlib/images/file/filecloseall.png
+spyderlib/images/file/fileimport.png
+spyderlib/images/file/filenew.png
+spyderlib/images/file/fileopen.png
+spyderlib/images/file/filesave.png
+spyderlib/images/file/filesaveas.png
+spyderlib/images/file/print.png
+spyderlib/images/file/save_all.png
+spyderlib/images/filetypes/bat.png
+spyderlib/images/filetypes/bmp.png
+spyderlib/images/filetypes/c.png
+spyderlib/images/filetypes/cc.png
+spyderlib/images/filetypes/cfg.png
+spyderlib/images/filetypes/chm.png
+spyderlib/images/filetypes/cl.png
+spyderlib/images/filetypes/cmd.png
+spyderlib/images/filetypes/cpp.png
+spyderlib/images/filetypes/css.png
+spyderlib/images/filetypes/cxx.png
+spyderlib/images/filetypes/diff.png
+spyderlib/images/filetypes/doc.png
+spyderlib/images/filetypes/exe.png
+spyderlib/images/filetypes/f.png
+spyderlib/images/filetypes/f77.png
+spyderlib/images/filetypes/f90.png
+spyderlib/images/filetypes/gif.png
+spyderlib/images/filetypes/h.png
+spyderlib/images/filetypes/hh.png
+spyderlib/images/filetypes/hpp.png
+spyderlib/images/filetypes/htm.png
+spyderlib/images/filetypes/html.png
+spyderlib/images/filetypes/hxx.png
+spyderlib/images/filetypes/inf.png
+spyderlib/images/filetypes/ini.png
+spyderlib/images/filetypes/jpeg.png
+spyderlib/images/filetypes/jpg.png
+spyderlib/images/filetypes/js.png
+spyderlib/images/filetypes/log.png
+spyderlib/images/filetypes/nt.png
+spyderlib/images/filetypes/patch.png
+spyderlib/images/filetypes/pdf.png
+spyderlib/images/filetypes/png.png
+spyderlib/images/filetypes/pps.png
+spyderlib/images/filetypes/properties.png
+spyderlib/images/filetypes/ps.png
+spyderlib/images/filetypes/pxd.png
+spyderlib/images/filetypes/pxi.png
+spyderlib/images/filetypes/pyx.png
+spyderlib/images/filetypes/rar.png
+spyderlib/images/filetypes/readme.png
+spyderlib/images/filetypes/reg.png
+spyderlib/images/filetypes/rej.png
+spyderlib/images/filetypes/session.png
+spyderlib/images/filetypes/tar.png
+spyderlib/images/filetypes/tex.png
+spyderlib/images/filetypes/tgz.png
+spyderlib/images/filetypes/tif.png
+spyderlib/images/filetypes/tiff.png
+spyderlib/images/filetypes/txt.png
+spyderlib/images/filetypes/xls.png
+spyderlib/images/filetypes/xml.png
+spyderlib/images/filetypes/zip.png
+spyderlib/images/projects/add_to_path.png
+spyderlib/images/projects/folder.png
+spyderlib/images/projects/package.png
+spyderlib/images/projects/pp_folder.png
+spyderlib/images/projects/pp_package.png
+spyderlib/images/projects/pp_project.png
+spyderlib/images/projects/project.png
+spyderlib/images/projects/project_closed.png
+spyderlib/images/projects/pythonpath.png
+spyderlib/images/projects/remove_from_path.png
+spyderlib/images/projects/show_all.png
+
+
+[3] GNU Lesser General Public License (Version 2.1)
+
+spyderlib/images/qt.png
+spyderlib/images/qtassistant.png
+spyderlib/images/qtdesigner.png
+spyderlib/images/qtlinguist.png
+spyderlib/images/filetypes/ts.png
+spyderlib/images/filetypes/ui.png
+
+
+[4] GNU General Public License version 3 
+
+spyderlib/images/pythonxy.png
+spyderlib/images/vitables.png
+
+
+[5] MIT License
+
+spyderlib/images/winpython.svg
+
+
+[6] BSD License
+
+spyderlib/images/scipy.png
+
+
+[7] Creative Commons Attribution 2.5 License
+(FamFamFam Silk icon set 1.3)
+
+spyderlib/images/actions/collapse.png
+spyderlib/images/actions/collapse_selection.png
+spyderlib/images/actions/expand.png
+spyderlib/images/actions/expand_selection.png
+spyderlib/images/actions/restore.png
+spyderlib/images/editor/class.png
+spyderlib/images/editor/convention.png
+spyderlib/images/editor/todo.png
+spyderlib/images/editor/warning.png
+spyderlib/images/filetypes/po.png
+spyderlib/images/filetypes/pot.png
+
+
+[8] PSF LICENSE AGREEMENT FOR PYTHON
+spyderlib/images/console/python.png
+spyderlib/images/console/python_t.png
+spyderlib/images/filetypes/py.png
+spyderlib/images/filetypes/pyc.png
+spyderlib/images/filetypes/pyw.png
+
+
+[9] zlib/libpng license
+spyderlib/images/filetypes/nsh.png
+spyderlib/images/filetypes/nsi.png
+
+
+[10] Eclipse Public License
+spyderlib/images/projects/pydev.png
+
+
+[11] Creative Commons Attribution 3.0 License
+(Yusuke Kamiyamane Icons)
+
+spyderlib/images/actions/arrow-continue.png
+spyderlib/images/actions/arrow-step-in.png
+spyderlib/images/actions/arrow-step-out.png
+spyderlib/images/actions/arrow-step-over.png
+spyderlib/images/actions/maximize.png
+spyderlib/images/actions/stop_debug.png
+spyderlib/images/actions/unmaximize.png
+spyderlib/images/actions/window_fullscreen.png
+spyderlib/images/editor/breakpoint_big.png
+spyderlib/images/editor/breakpoint_cond_big.png
+spyderlib/images/editor/breakpoint_cond_small.png
+spyderlib/images/editor/breakpoint_small.png
+spyderlib/images/editor/debug.png
+spyderlib/images/console/terminated.png
+
+
+[12] Creative Commons BY-SA license
+(The Oxygen icon theme)
+
+spyderlib/images/editor/run.png
+spyderlib/images/editor/run_again.png
+spyderlib/images/editor/run_cell.png
+spyderlib/images/editor/run_cell_advance.png
+spyderlib/images/editor/run_selection.png
+spyderlib/images/editor/run_settings.png
+spyderlib/images/console/run_small.png
+
diff --git a/MANIFEST.in b/MANIFEST.in
index c2c932f..6e59a34 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,4 +7,6 @@ include img_src/*.ico
 include img_src/spyder.png
 include MANIFEST.in
 include README
+include LICENSE
+include CHANGELOG
 include bootstrap.py
diff --git a/PKG-INFO b/PKG-INFO
index f4cac6a..b8f831d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,32 +1,32 @@
-Metadata-Version: 1.1
-Name: spyder
-Version: 2.2.3
-Summary: Scientific PYthon Development EnviRonment
-Home-page: http://code.google.com/p/spyderlib
-Author: Pierre Raybaut
-Author-email: UNKNOWN
-License: MIT
-Download-URL: http://code.google.com/p/spyderlib/files/spyder-2.2.3.zip
-Description: Spyder is an interactive Python development environment providing 
-        MATLAB-like features in a simple and light-weighted software.
-        It also provides ready-to-use pure-Python widgets to your PyQt4 or 
-        PySide application: source code editor with syntax highlighting and 
-        code introspection/analysis features, NumPy array editor, dictionary 
-        editor, Python console, etc.
-Keywords: PyQt4 PySide editor shell console widgets IDE
-Platform: any
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: MacOS
-Classifier: Operating System :: Microsoft :: Windows
-Classifier: Operating System :: OS Independent
-Classifier: Operating System :: POSIX
-Classifier: Operating System :: Unix
-Classifier: Programming Language :: Python :: 2.5
-Classifier: Programming Language :: Python :: 2.6
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Topic :: Scientific/Engineering
-Classifier: Topic :: Software Development :: Widget Sets
-Requires: rope (>=0.9.2)
-Requires: sphinx (>=0.6.0)
-Requires: PyQt4 (>=4.4)
+Metadata-Version: 1.1
+Name: spyder
+Version: 2.2.4
+Summary: Scientific PYthon Development EnviRonment
+Home-page: http://code.google.com/p/spyderlib
+Author: Pierre Raybaut
+Author-email: UNKNOWN
+License: MIT
+Download-URL: http://code.google.com/p/spyderlib/files/spyder-2.2.4.zip
+Description: Spyder is an interactive Python development environment providing 
+        MATLAB-like features in a simple and light-weighted software.
+        It also provides ready-to-use pure-Python widgets to your PyQt4 or 
+        PySide application: source code editor with syntax highlighting and 
+        code introspection/analysis features, NumPy array editor, dictionary 
+        editor, Python console, etc.
+Keywords: PyQt4 PySide editor shell console widgets IDE
+Platform: any
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: MacOS
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: OS Independent
+Classifier: Operating System :: POSIX
+Classifier: Operating System :: Unix
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Topic :: Scientific/Engineering
+Classifier: Topic :: Software Development :: Widget Sets
+Requires: rope (>=0.9.2)
+Requires: sphinx (>=0.6.0)
+Requires: PyQt4 (>=4.4)
diff --git a/bootstrap.py b/bootstrap.py
old mode 100644
new mode 100755
diff --git a/scripts/spyder b/scripts/spyder
old mode 100644
new mode 100755
diff --git a/spyderlib/__init__.py b/spyderlib/__init__.py
index ffa8d53..5c56936 100644
--- a/spyderlib/__init__.py
+++ b/spyderlib/__init__.py
@@ -27,7 +27,7 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '2.2.3'
+__version__ = '2.2.4'
 __license__ = __doc__
 __project_url__ = 'http://code.google.com/p/spyderlib'
 __forum_url__   = 'http://groups.google.com/group/spyderlib'
diff --git a/spyderlib/baseconfig.py b/spyderlib/baseconfig.py
index c43b544..a9f4915 100644
--- a/spyderlib/baseconfig.py
+++ b/spyderlib/baseconfig.py
@@ -19,9 +19,26 @@ import sys
 
 # Local imports
 from spyderlib import __version__
+from spyderlib.utils import programs
 
 
-SUPPORTED_IPYTHON = '>=0.13;<1.0'
+#==============================================================================
+# Only for development
+#==============================================================================
+# To activate/deactivate certain things for development
+# SPYDER_DEV is (and *only* have to be) set in bootstrap.py
+DEV = os.environ.get('SPYDER_DEV')
+
+
+#==============================================================================
+# IPython constants
+#==============================================================================
+SUPPORTED_IPYTHON = '>=0.13'
+if programs.is_module_installed('IPython', '>=1.0'):
+    IPYTHON_QT_MODULE = 'IPython.qt'
+else:
+    IPYTHON_QT_MODULE = 'IPython.frontend.qt'
+
 
 #==============================================================================
 # Debug helpers
diff --git a/spyderlib/config.py b/spyderlib/config.py
index a5c19f4..c876833 100644
--- a/spyderlib/config.py
+++ b/spyderlib/config.py
@@ -228,7 +228,9 @@ DEFAULTS = [
               'pyqt/ignore_sip_setapi_errors': False,
               'matplotlib/patch': True,
               'matplotlib/backend/enabled': True,
-              'matplotlib/backend/value': 'Qt4Agg',
+              'matplotlib/backend/value': 'MacOSX' if (sys.platform == 'darwin' \
+                                           and os.environ.get('QT_API') == 'pyside')\
+                                           else 'Qt4Agg',
               'umd/enabled': True,
               'umd/verbose': True,
               'umd/namelist': ['guidata', 'guiqwt'],
@@ -425,11 +427,7 @@ DEFAULTS = [
               }),
             ]
 
-# To activate/deactivate certain things for development
-# SPYDER_DEV is (and *only* have to be) set in bootstrap.py
-DEV = os.environ.get('SPYDER_DEV')
-
-# XXX Previously we had load=(not DEV) here but DEV was set to False.
+# XXX: Previously we had load=(not DEV) here but DEV was set to *False*.
 # Check if it *really* needs to be updated or not
 CONF = UserConfig('spyder', defaults=DEFAULTS, load=True, version='2.4.0',
                   subfolder=SUBFOLDER, backup=True, raw_mode=True)
diff --git a/spyderlib/images/editor/breakpoint_small.png b/spyderlib/images/editor/breakpoint_small.png
index 88eca0d..5ab0fa1 100644
Binary files a/spyderlib/images/editor/breakpoint_small.png and b/spyderlib/images/editor/breakpoint_small.png differ
diff --git a/spyderlib/locale/es/LC_MESSAGES/spyderlib.mo b/spyderlib/locale/es/LC_MESSAGES/spyderlib.mo
index d001f83..833e066 100644
Binary files a/spyderlib/locale/es/LC_MESSAGES/spyderlib.mo and b/spyderlib/locale/es/LC_MESSAGES/spyderlib.mo differ
diff --git a/spyderlib/locale/es/LC_MESSAGES/spyderlib.po b/spyderlib/locale/es/LC_MESSAGES/spyderlib.po
index 39e6f84..f2d9724 100644
--- a/spyderlib/locale/es/LC_MESSAGES/spyderlib.po
+++ b/spyderlib/locale/es/LC_MESSAGES/spyderlib.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.1\n"
-"POT-Creation-Date: 2013-08-11 14:04+Hora est. del Pacfico de SA\n"
-"PO-Revision-Date: 2013-08-11 14:24-0500\n"
+"POT-Creation-Date: 2013-09-04 20:58+Hora est. del Pacfico de SA\n"
+"PO-Revision-Date: 2013-09-04 21:44-0500\n"
 "Last-Translator: Carlos Cordoba <ccordoba12 at gmail.com>\n"
 "Language-Team: Python\n"
 "MIME-Version: 1.0\n"
@@ -109,9 +109,9 @@ msgstr "Ruta de directorio inválida"
 #: spyderlib\plugins\configdialog.py:416 spyderlib\plugins\configdialog.py:432
 #: spyderlib\plugins\runconfig.py:169 spyderlib\plugins\runconfig.py:229
 #: spyderlib\plugins\workingdirectory.py:293 spyderlib\widgets\explorer.py:535
-#: spyderlib\widgets\externalshell\pythonshell.py:603
+#: spyderlib\widgets\externalshell\pythonshell.py:602
 #: spyderlib\widgets\findinfiles.py:502 spyderlib\widgets\pathmanager.py:217
-#: spyderlib\widgets\projectexplorer.py:861
+#: spyderlib\widgets\projectexplorer.py:888
 msgid "Select directory"
 msgstr "Seleccionar directorio"
 
@@ -127,11 +127,11 @@ msgstr "Seleccionar archivo"
 msgid "All files (*)"
 msgstr "Todos los archivos (*)"
 
-#: spyderlib\plugins\configdialog.py:528 spyderlib\widgets\formlayout.py:214
+#: spyderlib\plugins\configdialog.py:528 spyderlib\widgets\formlayout.py:216
 msgid "Bold"
 msgstr "Negrita"
 
-#: spyderlib\plugins\configdialog.py:531 spyderlib\widgets\formlayout.py:209
+#: spyderlib\plugins\configdialog.py:531 spyderlib\widgets\formlayout.py:211
 msgid "Italic"
 msgstr "Cursiva"
 
@@ -151,9 +151,9 @@ msgstr "Fuente"
 msgid "General"
 msgstr "General"
 
-#: spyderlib\plugins\configdialog.py:635 spyderlib\plugins\editor.py:91
-#: spyderlib\plugins\externalconsole.py:68
-#: spyderlib\plugins\ipythonconsole.py:62
+#: spyderlib\plugins\configdialog.py:635 spyderlib\plugins\editor.py:93
+#: spyderlib\plugins\externalconsole.py:83
+#: spyderlib\plugins\ipythonconsole.py:70
 msgid "Interface"
 msgstr "Interfaz"
 
@@ -235,7 +235,7 @@ msgid "Background:"
 msgstr "Fondo:"
 
 #: spyderlib\plugins\configdialog.py:756
-#: spyderlib\widgets\sourcecode\codeeditor.py:245
+#: spyderlib\widgets\sourcecode\codeeditor.py:256
 msgid "Current line:"
 msgstr "Línea seleccionada:"
 
@@ -303,20 +303,20 @@ msgstr "Restaurar los valores por defecto"
 msgid "Internal console"
 msgstr "Terminal interna"
 
-#: spyderlib\plugins\console.py:123 spyderlib\plugins\ipythonconsole.py:501
-#: spyderlib\spyder.py:743
+#: spyderlib\plugins\console.py:123 spyderlib\plugins\ipythonconsole.py:510
+#: spyderlib\spyder.py:754
 msgid "&Quit"
 msgstr "&Salir"
 
-#: spyderlib\plugins\console.py:124 spyderlib\spyder.py:744
+#: spyderlib\plugins\console.py:124 spyderlib\spyder.py:755
 msgid "Quit"
 msgstr "Salir"
 
-#: spyderlib\plugins\console.py:127 spyderlib\plugins\externalconsole.py:1032
+#: spyderlib\plugins\console.py:127 spyderlib\plugins\externalconsole.py:1112
 msgid "&Run..."
 msgstr "E&jecutar..."
 
-#: spyderlib\plugins\console.py:128 spyderlib\plugins\externalconsole.py:1033
+#: spyderlib\plugins\console.py:128 spyderlib\plugins\externalconsole.py:1113
 msgid "Run a Python script"
 msgstr "Ejecutar un archivo de Python"
 
@@ -340,14 +340,14 @@ msgstr "Muestra los contenidos del sys.path en modo lectura"
 msgid "Buffer..."
 msgstr "Mostrar líneas..."
 
-#: spyderlib\plugins\console.py:143 spyderlib\plugins\externalconsole.py:88
+#: spyderlib\plugins\console.py:143 spyderlib\plugins\externalconsole.py:103
 #: spyderlib\plugins\history.py:34
 msgid "Set maximum line count"
 msgstr "Establece el máximo número de líneas a mostrar en la terminal"
 
 #: spyderlib\plugins\console.py:146 spyderlib\plugins\explorer.py:59
-#: spyderlib\plugins\history.py:149 spyderlib\plugins\inspector.py:276
-#: spyderlib\plugins\projectexplorer.py:56
+#: spyderlib\plugins\history.py:149 spyderlib\plugins\inspector.py:284
+#: spyderlib\plugins\projectexplorer.py:57
 msgid "&Font..."
 msgstr "&Tipo de letra..."
 
@@ -363,25 +363,25 @@ msgstr "Ruta del editor externo..."
 msgid "Set external editor executable path"
 msgstr "Establece la ruta del editor externo"
 
-#: spyderlib\plugins\console.py:154 spyderlib\plugins\editor.py:129
-#: spyderlib\plugins\externalconsole.py:89 spyderlib\plugins\history.py:37
-#: spyderlib\plugins\history.py:152 spyderlib\plugins\inspector.py:89
-#: spyderlib\plugins\inspector.py:279
+#: spyderlib\plugins\console.py:154 spyderlib\plugins\editor.py:131
+#: spyderlib\plugins\externalconsole.py:104 spyderlib\plugins\history.py:37
+#: spyderlib\plugins\history.py:152 spyderlib\plugins\inspector.py:96
+#: spyderlib\plugins\inspector.py:287
 msgid "Wrap lines"
 msgstr "Ajuste de línea automático"
 
-#: spyderlib\plugins\console.py:157 spyderlib\plugins\editor.py:159
-#: spyderlib\plugins\externalconsole.py:138
+#: spyderlib\plugins\console.py:157 spyderlib\plugins\editor.py:161
+#: spyderlib\plugins\externalconsole.py:153
 msgid "Balloon tips"
 msgstr "Mostrar globos de sugerencias"
 
-#: spyderlib\plugins\console.py:161 spyderlib\plugins\editor.py:151
-#: spyderlib\plugins\externalconsole.py:130
+#: spyderlib\plugins\console.py:161 spyderlib\plugins\editor.py:153
+#: spyderlib\plugins\externalconsole.py:145
 msgid "Automatic code completion"
 msgstr "Completar código automáticamente"
 
-#: spyderlib\plugins\console.py:165 spyderlib\plugins\editor.py:157
-#: spyderlib\plugins\externalconsole.py:136
+#: spyderlib\plugins\console.py:165 spyderlib\plugins\editor.py:159
+#: spyderlib\plugins\externalconsole.py:151
 msgid "Enter key selects completion"
 msgstr "La tecla Enter selecciona el resultado a completar"
 
@@ -389,121 +389,121 @@ msgstr "La tecla Enter selecciona el resultado a completar"
 msgid "Internal console settings"
 msgstr "Opciones"
 
-#: spyderlib\plugins\console.py:221 spyderlib\plugins\externalconsole.py:1206
+#: spyderlib\plugins\console.py:221 spyderlib\plugins\externalconsole.py:1286
 msgid "Run Python script"
 msgstr "Ejecutar archivo de Python"
 
-#: spyderlib\plugins\console.py:222 spyderlib\plugins\externalconsole.py:241
-#: spyderlib\plugins\externalconsole.py:1207 spyderlib\widgets\explorer.py:633
+#: spyderlib\plugins\console.py:222 spyderlib\plugins\externalconsole.py:267
+#: spyderlib\plugins\externalconsole.py:1287 spyderlib\widgets\explorer.py:633
 msgid "Python scripts"
 msgstr "Archivos de Python"
 
-#: spyderlib\plugins\console.py:266 spyderlib\plugins\explorer.py:110
-#: spyderlib\plugins\history.py:263 spyderlib\plugins\inspector.py:540
-#: spyderlib\plugins\projectexplorer.py:118
+#: spyderlib\plugins\console.py:267 spyderlib\plugins\explorer.py:110
+#: spyderlib\plugins\history.py:263 spyderlib\plugins\inspector.py:548
+#: spyderlib\plugins\projectexplorer.py:119
 msgid "Select a new font"
 msgstr "Seleccionar una nueva fuente"
 
-#: spyderlib\plugins\console.py:273
+#: spyderlib\plugins\console.py:274
 msgid "Buffer"
 msgstr "Mostrar"
 
-#: spyderlib\plugins\console.py:274
+#: spyderlib\plugins\console.py:275
 msgid "Maximum line count"
 msgstr "Máximo número de líneas a mostrar"
 
-#: spyderlib\plugins\console.py:283
+#: spyderlib\plugins\console.py:284
 msgid "External editor"
 msgstr "Editor externo"
 
-#: spyderlib\plugins\console.py:284
+#: spyderlib\plugins\console.py:285
 msgid "External editor executable path:"
 msgstr "Ruta ejecutable del editor externo:"
 
-#: spyderlib\plugins\editor.py:85 spyderlib\plugins\editor.py:508
-#: spyderlib\plugins\editor.py:1519 spyderlib\plugins\inspector.py:307
-#: spyderlib\widgets\editor.py:563
-#: spyderlib\widgets\sourcecode\codeeditor.py:235
-#: spyderlib\widgets\sourcecode\codeeditor.py:2529
+#: spyderlib\plugins\editor.py:87 spyderlib\plugins\editor.py:510
+#: spyderlib\plugins\editor.py:1574 spyderlib\plugins\inspector.py:315
+#: spyderlib\widgets\editor.py:566
+#: spyderlib\widgets\sourcecode\codeeditor.py:246
+#: spyderlib\widgets\sourcecode\codeeditor.py:2535
 msgid "Editor"
 msgstr "Editor"
 
-#: spyderlib\plugins\editor.py:88
+#: spyderlib\plugins\editor.py:90
 msgid "Edit template for new modules"
 msgstr "Editar la plantilla para nuevos módulos"
 
-#: spyderlib\plugins\editor.py:93
+#: spyderlib\plugins\editor.py:95
 msgid "Text and margin font style"
 msgstr "Tipo de letra para el texto y las márgenes"
 
-#: spyderlib\plugins\editor.py:96
+#: spyderlib\plugins\editor.py:98
 msgid "Sort files according to full path"
 msgstr "Ordenar archivos según su ruta completa"
 
-#: spyderlib\plugins\editor.py:98
+#: spyderlib\plugins\editor.py:100
 msgid "Show tab bar"
 msgstr "Mostrar barra de pestañas"
 
-#: spyderlib\plugins\editor.py:105 spyderlib\plugins\editor.py:180
-#: spyderlib\plugins\externalconsole.py:84
-#: spyderlib\plugins\externalconsole.py:129 spyderlib\plugins\history.py:36
-#: spyderlib\plugins\inspector.py:88 spyderlib\plugins\ipythonconsole.py:97
+#: spyderlib\plugins\editor.py:107 spyderlib\plugins\editor.py:182
+#: spyderlib\plugins\externalconsole.py:99
+#: spyderlib\plugins\externalconsole.py:144 spyderlib\plugins\history.py:36
+#: spyderlib\plugins\inspector.py:95 spyderlib\plugins\ipythonconsole.py:105
 msgid "Source code"
 msgstr "Código fuente"
 
-#: spyderlib\plugins\editor.py:106
+#: spyderlib\plugins\editor.py:108
 msgid "Show line numbers"
 msgstr "Mostrar números de líneas"
 
-#: spyderlib\plugins\editor.py:107
+#: spyderlib\plugins\editor.py:109
 msgid "Show vertical line after"
 msgstr "Mostrar una línea vertical después de"
 
-#: spyderlib\plugins\editor.py:108
+#: spyderlib\plugins\editor.py:110
 msgid "characters"
 msgstr "caracteres"
 
-#: spyderlib\plugins\editor.py:116
+#: spyderlib\plugins\editor.py:118
 msgid "Highlight current line"
 msgstr "Resaltar la línea actual"
 
-#: spyderlib\plugins\editor.py:118
+#: spyderlib\plugins\editor.py:120
 msgid "Highlight occurences after"
 msgstr "Resaltar ocurrencias después de"
 
-#: spyderlib\plugins\editor.py:132 spyderlib\plugins\history.py:45
-#: spyderlib\plugins\inspector.py:92
+#: spyderlib\plugins\editor.py:134 spyderlib\plugins\history.py:45
+#: spyderlib\plugins\inspector.py:99
 msgid "Syntax color scheme: "
 msgstr "Esquema de coloreado:"
 
-#: spyderlib\plugins\editor.py:144 spyderlib\plugins\runconfig.py:304
+#: spyderlib\plugins\editor.py:146 spyderlib\plugins\runconfig.py:304
 #: spyderlib\plugins\runconfig.py:426 spyderlib\plugins\runconfig.py:433
-#: spyderlib\spyder.py:1678 spyderlib\widgets\explorer.py:229
+#: spyderlib\spyder.py:1702 spyderlib\widgets\explorer.py:229
 #: spyderlib\widgets\externalshell\baseshell.py:137
 msgid "Run"
 msgstr "Ejecutar"
 
-#: spyderlib\plugins\editor.py:145
+#: spyderlib\plugins\editor.py:147
 msgid "Save all files before running script"
 msgstr "Guardar todo antes de ejecutar un archivo"
 
-#: spyderlib\plugins\editor.py:148 spyderlib\plugins\externalconsole.py:404
+#: spyderlib\plugins\editor.py:150 spyderlib\plugins\externalconsole.py:433
 msgid "Introspection"
 msgstr "Introspección"
 
-#: spyderlib\plugins\editor.py:153 spyderlib\plugins\externalconsole.py:132
+#: spyderlib\plugins\editor.py:155 spyderlib\plugins\externalconsole.py:147
 msgid "Case sensitive code completion"
 msgstr "Diferenciar entre mayúsculas y minúsculas al completar código"
 
-#: spyderlib\plugins\editor.py:155 spyderlib\plugins\externalconsole.py:134
+#: spyderlib\plugins\editor.py:157 spyderlib\plugins\externalconsole.py:149
 msgid "Show single completion"
 msgstr "Mostrar la lista de resultados a completar aún con una sola elección"
 
-#: spyderlib\plugins\editor.py:160
+#: spyderlib\plugins\editor.py:162
 msgid "Link to object definition"
 msgstr "Enlazar a la definición de un objeto"
 
-#: spyderlib\plugins\editor.py:162
+#: spyderlib\plugins\editor.py:164
 msgid ""
 "If this option is enabled, clicking on an object\n"
 "name (left-click + Ctrl key) will go this object\n"
@@ -514,12 +514,12 @@ msgstr ""
 "la tecla Ctrl), el Editor se ubicará en la definición\n"
 "del mismo (de poder resolverse el nombre)."
 
-#: spyderlib\plugins\editor.py:166 spyderlib\plugins\externalconsole.py:140
-#: spyderlib\plugins\ipythonconsole.py:80
+#: spyderlib\plugins\editor.py:168 spyderlib\plugins\externalconsole.py:155
+#: spyderlib\plugins\ipythonconsole.py:88
 msgid "Automatic notification to object inspector"
 msgstr "Notificación automática al Inspector de objetos"
 
-#: spyderlib\plugins\editor.py:168
+#: spyderlib\plugins\editor.py:170
 msgid ""
 "If this option is enabled, object inspector\n"
 "will automatically show informations on functions\n"
@@ -532,7 +532,7 @@ msgstr ""
 "(esto se activa cuando se introduce un paréntesis\n"
 "izquierdo después de un nombre de función válido"
 
-#: spyderlib\plugins\editor.py:173
+#: spyderlib\plugins\editor.py:175
 msgid ""
 "<b>Warning:</b><br>The Python module <i>rope</i> is not installed on this "
 "computer: calltips, code completion and go-to-definition features won't be "
@@ -542,51 +542,51 @@ msgstr ""
 "este computador. Por tanto el completado de código, el ir a la definición de "
 "una función o método y los globos de sugerencias se encontrarán desactivados."
 
-#: spyderlib\plugins\editor.py:181
+#: spyderlib\plugins\editor.py:183
 msgid "Automatic insertion of parentheses, braces and brackets"
 msgstr "Inserción automática de paréntesis, llaves y corchetes"
 
-#: spyderlib\plugins\editor.py:184
+#: spyderlib\plugins\editor.py:186
 msgid "Automatic insertion of closing quotes"
 msgstr "Inserción automática de comillas"
 
-#: spyderlib\plugins\editor.py:186
+#: spyderlib\plugins\editor.py:188
 msgid "Automatic insertion of colons after 'for', 'if', 'def', etc"
 msgstr "Inserción automática de ':' después de 'for', 'if', 'def', etc"
 
-#: spyderlib\plugins\editor.py:189
+#: spyderlib\plugins\editor.py:191
 msgid "Automatic indentation after 'else', 'elif', etc."
 msgstr "Indentación automática después de 'else', 'elif', etc."
 
-#: spyderlib\plugins\editor.py:191
+#: spyderlib\plugins\editor.py:193
 msgid "Indentation characters: "
 msgstr "Caracteres de indentación:"
 
-#: spyderlib\plugins\editor.py:192
+#: spyderlib\plugins\editor.py:194
 msgid "4 spaces"
 msgstr "4 espacios"
 
-#: spyderlib\plugins\editor.py:193
+#: spyderlib\plugins\editor.py:195
 msgid "2 spaces"
 msgstr "2 espacios"
 
-#: spyderlib\plugins\editor.py:194
+#: spyderlib\plugins\editor.py:196
 msgid "tab"
 msgstr "tabulador"
 
-#: spyderlib\plugins\editor.py:195
+#: spyderlib\plugins\editor.py:197
 msgid "Tab stop width:"
 msgstr "Ancho de las tabulaciones:"
 
-#: spyderlib\plugins\editor.py:195
+#: spyderlib\plugins\editor.py:197
 msgid "pixels"
 msgstr "pixels"
 
-#: spyderlib\plugins\editor.py:197
+#: spyderlib\plugins\editor.py:199
 msgid "Tab always indent"
 msgstr "Siempre indentar con la tecla Tab"
 
-#: spyderlib\plugins\editor.py:199
+#: spyderlib\plugins\editor.py:201
 msgid ""
 "If enabled, pressing Tab will always indent,\n"
 "even when the cursor is not at the beginning\n"
@@ -601,19 +601,19 @@ msgstr ""
 "la combinación de teclas Ctrl+Espacio para\n"
 "activar el completado de código)"
 
-#: spyderlib\plugins\editor.py:204
+#: spyderlib\plugins\editor.py:206
 msgid "Intelligent backspace"
 msgstr "Tecla de retroceso (\"backspace\") inteligente"
 
-#: spyderlib\plugins\editor.py:206
+#: spyderlib\plugins\editor.py:208
 msgid "Automatically remove trailing spaces when saving files"
 msgstr "Eliminar automáticamente espacios en blanco al guardar un archivo"
 
-#: spyderlib\plugins\editor.py:210
+#: spyderlib\plugins\editor.py:212
 msgid "Analysis"
 msgstr "Análisis"
 
-#: spyderlib\plugins\editor.py:212
+#: spyderlib\plugins\editor.py:214
 msgid ""
 "<u>Note</u>: add <b>analysis:ignore</b> in a comment to ignore code/style "
 "analysis warnings. For more informations on style guide for Python code, "
@@ -624,12 +624,12 @@ msgstr ""
 "guía de estilo para escribir código en Python, por favor refiérase a la "
 "página de %s (en inglés).<br>"
 
-#: spyderlib\plugins\editor.py:221
-#: spyderlib\widgets\sourcecode\codeeditor.py:1575
+#: spyderlib\plugins\editor.py:223
+#: spyderlib\widgets\sourcecode\codeeditor.py:1587
 msgid "Code analysis"
 msgstr "Análisis del código"
 
-#: spyderlib\plugins\editor.py:223
+#: spyderlib\plugins\editor.py:225
 msgid ""
 "If enabled, Python source code will be analyzed\n"
 "using pyflakes, lines containing errors or \n"
@@ -639,15 +639,15 @@ msgstr ""
 "serán analizados automáticamente y las líneas que\n"
 "contengan errores o advertencias serán resaltadas"
 
-#: spyderlib\plugins\editor.py:228
+#: spyderlib\plugins\editor.py:230
 msgid "Code analysis requires pyflakes %s+"
 msgstr "El análisis del código requiere pyflakes %s+"
 
-#: spyderlib\plugins\editor.py:230
+#: spyderlib\plugins\editor.py:232
 msgid "Style analysis"
 msgstr "Análisis de estilo"
 
-#: spyderlib\plugins\editor.py:232
+#: spyderlib\plugins\editor.py:234
 msgid ""
 "If enabled, Python source code will be analyzed\n"
 "using pep8, lines that are not following PEP8\n"
@@ -657,23 +657,23 @@ msgstr ""
 "serán analizados con PEP8 y las líneas que no sigan\n"
 "esta guía de estilo serán resaltadas."
 
-#: spyderlib\plugins\editor.py:239
+#: spyderlib\plugins\editor.py:241
 msgid "Tasks (TODO, FIXME, XXX, HINT, TIP)"
 msgstr "Tareas (TODO, FIXME, XXX, HINT, TIP)"
 
-#: spyderlib\plugins\editor.py:242
+#: spyderlib\plugins\editor.py:244
 msgid "Perform analysis when saving file and every"
 msgstr "Realizar los análisis al guardar el archivo y cada"
 
-#: spyderlib\plugins\editor.py:246
+#: spyderlib\plugins\editor.py:248
 msgid "Perform analysis only when saving file"
 msgstr "Realizar análisis sólo cuando se guarde el archivo"
 
-#: spyderlib\plugins\editor.py:292
+#: spyderlib\plugins\editor.py:294
 msgid "End-of-line characters"
 msgstr "Caracteres de fin de línea"
 
-#: spyderlib\plugins\editor.py:293
+#: spyderlib\plugins\editor.py:295
 msgid ""
 "When opening a text file containing mixed end-of-line characters (this may "
 "raise syntax errors in Python interpreter on Windows platforms), Spyder may "
@@ -683,387 +683,391 @@ msgstr ""
 "de fin de línea (lo cual puede dar lugar a errores en el intérprete de "
 "Python en Windows), Spyder puede arreglar el archivo automáticamente."
 
-#: spyderlib\plugins\editor.py:299
+#: spyderlib\plugins\editor.py:301
 msgid "Fix automatically and show warning message box"
 msgstr "Arreglar automáticamente y mostrar un mensaje de advertencia"
 
-#: spyderlib\plugins\editor.py:310 spyderlib\plugins\externalconsole.py:402
-#: spyderlib\plugins\ipythonconsole.py:349
+#: spyderlib\plugins\editor.py:312 spyderlib\plugins\externalconsole.py:431
+#: spyderlib\plugins\ipythonconsole.py:358
 #: spyderlib\plugins\variableexplorer.py:41
 msgid "Display"
 msgstr "Visualización"
 
-#: spyderlib\plugins\editor.py:312
+#: spyderlib\plugins\editor.py:314
 msgid "Code Introspection/Analysis"
 msgstr "Análisis e introspección de código"
 
-#: spyderlib\plugins\editor.py:315 spyderlib\plugins\externalconsole.py:407
+#: spyderlib\plugins\editor.py:317 spyderlib\plugins\externalconsole.py:436
 msgid "Advanced settings"
 msgstr "Opciones avanzadas"
 
-#: spyderlib\plugins\editor.py:564 spyderlib\widgets\editortools.py:467
+#: spyderlib\plugins\editor.py:566 spyderlib\widgets\editortools.py:467
 msgid "Show/hide outline explorer"
 msgstr ""
 "Mostrar u ocultar el\n"
 "explorador de código"
 
-#: spyderlib\plugins\editor.py:570
+#: spyderlib\plugins\editor.py:572
 msgid "Show/hide project explorer"
 msgstr "Mostrar/cerrar el explorador de proyectos"
 
-#: spyderlib\plugins\editor.py:578
+#: spyderlib\plugins\editor.py:581
 msgid "&New file..."
 msgstr "&Nuevo"
 
-#: spyderlib\plugins\editor.py:579
-msgid "Create a new Python script"
-msgstr "Crear un nuevo archivo de Python"
+#: spyderlib\plugins\editor.py:582 spyderlib\plugins\workingdirectory.py:81
+#: spyderlib\widgets\explorer.py:611 spyderlib\widgets\explorer.py:618
+msgid "New file"
+msgstr "Nuevo archivo"
 
-#: spyderlib\plugins\editor.py:583
+#: spyderlib\plugins\editor.py:589
 msgid "&Open..."
 msgstr "&Abrir"
 
-#: spyderlib\plugins\editor.py:584
-msgid "Open text file"
-msgstr "Abrir archivo de texto"
+#: spyderlib\plugins\editor.py:590 spyderlib\plugins\editor.py:1615
+#: spyderlib\plugins\workingdirectory.py:68
+msgid "Open file"
+msgstr "Abrir archivo"
 
-#: spyderlib\plugins\editor.py:586
+#: spyderlib\plugins\editor.py:597
 msgid "&Revert"
 msgstr "&Restaurar"
 
-#: spyderlib\plugins\editor.py:587
+#: spyderlib\plugins\editor.py:598
 msgid "Revert file from disk"
 msgstr "Restaurar archivo desde el disco"
 
-#: spyderlib\plugins\editor.py:591
+#: spyderlib\plugins\editor.py:601
 msgid "&Save"
 msgstr "&Guardar"
 
-#: spyderlib\plugins\editor.py:592
-msgid "Save current file"
-msgstr "Guardar el archivo actual"
+#: spyderlib\plugins\editor.py:602
+msgid "Save file"
+msgstr "Guardar archivo"
 
-#: spyderlib\plugins\editor.py:596
+#: spyderlib\plugins\editor.py:609
 msgid "Sav&e all"
 msgstr "Guardar t&odo"
 
-#: spyderlib\plugins\editor.py:597
-msgid "Save all opened files"
-msgstr "Guardar todos los archivos abiertos"
+#: spyderlib\plugins\editor.py:610
+msgid "Save all files"
+msgstr "Guardar todos los archivos"
 
-#: spyderlib\plugins\editor.py:601
+#: spyderlib\plugins\editor.py:617
 msgid "Save &as..."
 msgstr "Gu&ardar como..."
 
-#: spyderlib\plugins\editor.py:602
+#: spyderlib\plugins\editor.py:618
 msgid "Save current file as..."
 msgstr "Guardar el archivo actual como..."
 
-#: spyderlib\plugins\editor.py:604 spyderlib\plugins\editor.py:605
+#: spyderlib\plugins\editor.py:620 spyderlib\plugins\editor.py:621
 msgid "Print preview..."
 msgstr "Presentación preliminar..."
 
-#: spyderlib\plugins\editor.py:606
+#: spyderlib\plugins\editor.py:622
 msgid "&Print..."
 msgstr "Im&primir"
 
-#: spyderlib\plugins\editor.py:607
+#: spyderlib\plugins\editor.py:623
 msgid "Print current file..."
 msgstr "Imprimir el archivo actual..."
 
-#: spyderlib\plugins\editor.py:611
+#: spyderlib\plugins\editor.py:627
 msgid "&Close"
 msgstr "&Cerrar"
 
-#: spyderlib\plugins\editor.py:612
+#: spyderlib\plugins\editor.py:628
 msgid "Close current file"
 msgstr "Cerrar el archivo actual"
 
-#: spyderlib\plugins\editor.py:616
+#: spyderlib\plugins\editor.py:632
 msgid "C&lose all"
 msgstr "C&errar todo"
 
-#: spyderlib\plugins\editor.py:617
+#: spyderlib\plugins\editor.py:633
 msgid "Close all opened files"
 msgstr "Cerrar todos los archivos abiertos"
 
-#: spyderlib\plugins\editor.py:623
+#: spyderlib\plugins\editor.py:640
 msgid "Set/Clear breakpoint"
 msgstr "Añadir o eliminar un punto de interrupción"
 
-#: spyderlib\plugins\editor.py:630
+#: spyderlib\plugins\editor.py:647
 msgid "Set/Edit conditional breakpoint"
 msgstr "Añadir o editar un punto de interrupción condicional"
 
-#: spyderlib\plugins\editor.py:638
+#: spyderlib\plugins\editor.py:655
 msgid "Clear breakpoints in all files"
 msgstr "Eliminar los puntos de interrupción de todos los archivos"
 
-#: spyderlib\plugins\editor.py:640
+#: spyderlib\plugins\editor.py:657
 msgid "Breakpoints"
 msgstr "Puntos de interrupción (Breakpoints)"
 
-#: spyderlib\plugins\editor.py:646
+#: spyderlib\plugins\editor.py:661
+msgid "Debug with winpdb"
+msgstr "Depurar con winpdb"
+
+#: spyderlib\plugins\editor.py:668 spyderlib\spyder.py:562
 msgid "&Debug"
 msgstr "&Depurar"
 
-#: spyderlib\plugins\editor.py:647
+#: spyderlib\plugins\editor.py:669
 msgid "Debug file"
 msgstr "Depurar archivo"
 
-#: spyderlib\plugins\editor.py:651
+#: spyderlib\plugins\editor.py:675
 msgid "Step"
 msgstr "Ejecutar línea"
 
-#: spyderlib\plugins\editor.py:652
+#: spyderlib\plugins\editor.py:676
 msgid "Run current line"
 msgstr "Ejecutar la línea seleccionada"
 
-#: spyderlib\plugins\editor.py:656
+#: spyderlib\plugins\editor.py:683
 msgid "Continue"
 msgstr "Continuar"
 
-#: spyderlib\plugins\editor.py:657
-msgid ""
-"Continue execution until\n"
-"next breakpoint"
-msgstr ""
-"Continuar con la ejecución hasta el\n"
-"siguiente punto de interrupción"
+#: spyderlib\plugins\editor.py:684
+msgid "Continue execution until next breakpoint"
+msgstr "Continuar con la ejecución hasta el siguiente punto de interrupción"
 
-#: spyderlib\plugins\editor.py:662
+#: spyderlib\plugins\editor.py:692
 msgid "Step Into"
 msgstr "Ingresar en la función/método"
 
-#: spyderlib\plugins\editor.py:663
-msgid ""
-"Step into function, method\n"
-"or class of current line"
-msgstr ""
-"Ingresar en la función, método o\n"
-"clase de la línea seleccionada"
+#: spyderlib\plugins\editor.py:693
+msgid "Step into function or method of current line"
+msgstr "Ingresar en la función o método de la línea actual"
 
-#: spyderlib\plugins\editor.py:668
+#: spyderlib\plugins\editor.py:701
 msgid "Step Return"
 msgstr "Salir de la función/método"
 
-#: spyderlib\plugins\editor.py:669
-msgid ""
-"Run until current function\n"
-"or method returns"
-msgstr ""
-"Ejecutar hasta que la función\n"
-"o método actual termine"
+#: spyderlib\plugins\editor.py:702
+msgid "Run until current function or method returns"
+msgstr "Ejecutar hasta que la función o método actual termine"
 
-#: spyderlib\plugins\editor.py:674
+#: spyderlib\plugins\editor.py:710
 msgid "Exit"
 msgstr "Terminar"
 
-#: spyderlib\plugins\editor.py:675
+#: spyderlib\plugins\editor.py:711
 msgid "Exit Debug"
 msgstr "Terminar depuración"
 
-#: spyderlib\plugins\editor.py:684
+#: spyderlib\plugins\editor.py:723
 msgid "Debugging control"
 msgstr "Control de depuración"
 
-#: spyderlib\plugins\editor.py:688 spyderlib\plugins\editor.py:1171
-#: spyderlib\spyder.py:551
+#: spyderlib\plugins\editor.py:727 spyderlib\plugins\editor.py:1226
+#: spyderlib\spyder.py:557
 msgid "&Run"
 msgstr "E&jecutar"
 
-#: spyderlib\plugins\editor.py:689
+#: spyderlib\plugins\editor.py:728
 msgid "Run file"
 msgstr "Ejecutar archivo"
 
-#: spyderlib\plugins\editor.py:694
+#: spyderlib\plugins\editor.py:735
 msgid "&Configure..."
 msgstr "&Configurar..."
 
-#: spyderlib\plugins\editor.py:695
-#: spyderlib\widgets\externalshell\pythonshell.py:289
+#: spyderlib\plugins\editor.py:736
+#: spyderlib\widgets\externalshell\pythonshell.py:292
 msgid "Run settings"
 msgstr "Ajustes de ejecución"
 
-#: spyderlib\plugins\editor.py:701
+#: spyderlib\plugins\editor.py:745
 msgid "Re-run &last script"
 msgstr "Ejecutar de &nuevo el último archivo"
 
-#: spyderlib\plugins\editor.py:702
+#: spyderlib\plugins\editor.py:746
 msgid "Run again last file"
-msgstr ""
-"Ejecutar de nuevo \n"
-"el mismo archivo"
+msgstr "Ejecutar de nuevo el mismo archivo"
 
-#: spyderlib\plugins\editor.py:708
-#: spyderlib\widgets\sourcecode\codeeditor.py:2210
-msgid "Run &selection or current block"
-msgstr "Ejecutar la &selección o el bloque actual"
+#: spyderlib\plugins\editor.py:753
+#: spyderlib\widgets\sourcecode\codeeditor.py:2222
+msgid "Run &selection"
+msgstr "Ejecutar &selección"
 
-#: spyderlib\plugins\editor.py:710
+#: spyderlib\plugins\editor.py:755
+msgid "Run selection"
+msgstr "Ejecutar selección"
+
+#: spyderlib\plugins\editor.py:761
+msgid "Run cell"
+msgstr "Ejecutar la celda"
+
+#: spyderlib\plugins\editor.py:763
 msgid ""
-"Run selection or current \n"
-"block of lines"
+"Run current cell (Ctrl+Enter)\n"
+"[Use #%% to create cells]"
 msgstr ""
-"Ejecutar la selección \n"
-"o el bloque actual"
+"Ejecutar la celda actual (Ctrl+Enter)\n"
+"[Usar #%% para crear celdas]"
+
+#: spyderlib\plugins\editor.py:768
+msgid "Run cell and advance"
+msgstr "Ejecutar la celda y avanzar"
 
-#: spyderlib\plugins\editor.py:718
+#: spyderlib\plugins\editor.py:771
+msgid "Run current cell and go to the next one (Shift+Enter)"
+msgstr "Ejecutar la celda actual y avanzar a la siguiente (Shift+Enter)"
+
+#: spyderlib\plugins\editor.py:777
 msgid "Show todo list"
 msgstr "Mostrar lista de TODO's"
 
-#: spyderlib\plugins\editor.py:719
+#: spyderlib\plugins\editor.py:778
 msgid "Show TODO/FIXME/XXX/HINT/TIP comments list"
 msgstr ""
 "Mostrar la lista de comentarios de\n"
 "los TODO/FIXME/XXX/HINT/TIP"
 
-#: spyderlib\plugins\editor.py:727
+#: spyderlib\plugins\editor.py:786
 msgid "Show warning/error list"
 msgstr ""
 "Mostrar la lista de errores\n"
 "y advertencias"
 
-#: spyderlib\plugins\editor.py:728
+#: spyderlib\plugins\editor.py:787
 msgid "Show code analysis warnings/errors"
 msgstr ""
 "Mostrar errores o advertencias\n"
 "del análisis del código"
 
-#: spyderlib\plugins\editor.py:735
+#: spyderlib\plugins\editor.py:794
 msgid "Previous warning/error"
 msgstr "Anterior advertencia o error"
 
-#: spyderlib\plugins\editor.py:736
+#: spyderlib\plugins\editor.py:795
 msgid "Go to previous code analysis warning/error"
 msgstr ""
 "Ir a la línea anterior de\n"
 "advertencia o error"
 
-#: spyderlib\plugins\editor.py:739
+#: spyderlib\plugins\editor.py:798
 msgid "Next warning/error"
 msgstr "Siguiente advertencia o error"
 
-#: spyderlib\plugins\editor.py:740
+#: spyderlib\plugins\editor.py:799
 msgid "Go to next code analysis warning/error"
 msgstr ""
 "Ir a la próxima línea de\n"
 "advertencia o error"
 
-#: spyderlib\plugins\editor.py:744
+#: spyderlib\plugins\editor.py:803
 msgid "Last edit location"
 msgstr "Última posición de edición"
 
-#: spyderlib\plugins\editor.py:745
+#: spyderlib\plugins\editor.py:804
 msgid "Go to last edit location"
 msgstr ""
 "Ir a la anterior posición\n"
 "de edición"
 
-#: spyderlib\plugins\editor.py:752
+#: spyderlib\plugins\editor.py:811
 msgid "Previous cursor position"
 msgstr "Anterior posición del cursor"
 
-#: spyderlib\plugins\editor.py:753
+#: spyderlib\plugins\editor.py:812
 msgid "Go to previous cursor position"
 msgstr "Ir a la anterior posición del cursor"
 
-#: spyderlib\plugins\editor.py:760
+#: spyderlib\plugins\editor.py:819
 msgid "Next cursor position"
 msgstr "Siguiente posición del cursor"
 
-#: spyderlib\plugins\editor.py:761
+#: spyderlib\plugins\editor.py:820
 msgid "Go to next cursor position"
 msgstr "Ir a la siguiente posición del cursor"
 
-#: spyderlib\plugins\editor.py:769
-#: spyderlib\widgets\sourcecode\codeeditor.py:2204
+#: spyderlib\plugins\editor.py:828
+#: spyderlib\widgets\sourcecode\codeeditor.py:2216
 msgid "Comment"
 msgstr "Comentar"
 
-#: spyderlib\plugins\editor.py:769
-#: spyderlib\widgets\sourcecode\codeeditor.py:2204
+#: spyderlib\plugins\editor.py:828
+#: spyderlib\widgets\sourcecode\codeeditor.py:2216
 msgid "Uncomment"
 msgstr "Descomentar"
 
-#: spyderlib\plugins\editor.py:770
+#: spyderlib\plugins\editor.py:829
 msgid "Comment current line or selection"
 msgstr "Comentar la línea o selección actual"
 
-#: spyderlib\plugins\editor.py:774
+#: spyderlib\plugins\editor.py:833
 msgid "Add &block comment"
 msgstr "Añadir comentario de &bloque"
 
-#: spyderlib\plugins\editor.py:775
+#: spyderlib\plugins\editor.py:834
 msgid "Add block comment around current line or selection"
 msgstr ""
 "Añadir un comentario de bloque alrededor de la línea o selección actual"
 
-#: spyderlib\plugins\editor.py:781
+#: spyderlib\plugins\editor.py:840
 msgid "R&emove block comment"
 msgstr "&Eliminar comentario de bloque"
 
-#: spyderlib\plugins\editor.py:782
+#: spyderlib\plugins\editor.py:841
 msgid "Remove comment block around current line or selection"
 msgstr "Eliminar comentario de bloque alrededor de la línea o selección actual"
 
-#: spyderlib\plugins\editor.py:793
+#: spyderlib\plugins\editor.py:852
 msgid "Indent"
 msgstr "Indentar"
 
-#: spyderlib\plugins\editor.py:794
+#: spyderlib\plugins\editor.py:853
 msgid "Indent current line or selection"
 msgstr "Indentar la línea o selección actual"
 
-#: spyderlib\plugins\editor.py:797
+#: spyderlib\plugins\editor.py:856
 msgid "Unindent"
 msgstr "Quitar indentación"
 
-#: spyderlib\plugins\editor.py:798
+#: spyderlib\plugins\editor.py:857
 msgid "Unindent current line or selection"
 msgstr "Quitar indentación de la línea o selección actual"
 
-#: spyderlib\plugins\editor.py:802
-msgid "Debug with winpdb"
-msgstr "Depurar con winpdb"
-
-#: spyderlib\plugins\editor.py:809
+#: spyderlib\plugins\editor.py:862
 msgid "Carriage return and line feed (Windows)"
 msgstr "Retorno de carro y salto de línea (Windows)"
 
-#: spyderlib\plugins\editor.py:812
+#: spyderlib\plugins\editor.py:865
 msgid "Line feed (UNIX)"
 msgstr "Salto de línea (UNIX)"
 
-#: spyderlib\plugins\editor.py:815
+#: spyderlib\plugins\editor.py:868
 msgid "Carriage return (Mac)"
 msgstr "Retorno de carro (Mac)"
 
-#: spyderlib\plugins\editor.py:821
+#: spyderlib\plugins\editor.py:874
 msgid "Convert end-of-line characters"
 msgstr "Convertir caracteres de fin de línea"
 
-#: spyderlib\plugins\editor.py:825
+#: spyderlib\plugins\editor.py:878
 msgid "Remove trailing spaces"
 msgstr "Eliminar espacios en blanco"
 
-#: spyderlib\plugins\editor.py:827
+#: spyderlib\plugins\editor.py:880
 msgid "Fix indentation"
 msgstr "Corregir la indentación"
 
-#: spyderlib\plugins\editor.py:828
+#: spyderlib\plugins\editor.py:881
 msgid "Replace tab characters by space characters"
 msgstr "Reemplazar caracteres de tabulación por espacios"
 
-#: spyderlib\plugins\editor.py:831
+#: spyderlib\plugins\editor.py:884
 msgid "Go to line..."
 msgstr "Ir a la línea..."
 
-#: spyderlib\plugins\editor.py:839
+#: spyderlib\plugins\editor.py:892
 msgid "Set console working directory"
 msgstr "Establecer directorio de trabajo"
 
-#: spyderlib\plugins\editor.py:841
+#: spyderlib\plugins\editor.py:894
 msgid ""
 "Set current console (and file explorer) working directory to current script "
 "directory"
@@ -1071,91 +1075,87 @@ msgstr ""
 "Fija el directorio de trabajo para la terminal actual como el directorio del "
 "archivo actual"
 
-#: spyderlib\plugins\editor.py:846
+#: spyderlib\plugins\editor.py:899
 msgid "Maximum number of recent files..."
 msgstr "Máximo número de archivos recientes..."
 
-#: spyderlib\plugins\editor.py:849
+#: spyderlib\plugins\editor.py:902
 msgid "Clear recent files list"
 msgstr "Limpiar la lista de archivos recientes"
 
-#: spyderlib\plugins\editor.py:849
+#: spyderlib\plugins\editor.py:902
 msgid "Clear this list"
 msgstr "Limpiar esta lista"
 
-#: spyderlib\plugins\editor.py:851
+#: spyderlib\plugins\editor.py:904
 msgid "Open &recent"
 msgstr "Abrir &reciente"
 
-#: spyderlib\plugins\editor.py:1159 spyderlib\spyder.py:532
+#: spyderlib\plugins\editor.py:1214 spyderlib\spyder.py:538
 msgid "File toolbar"
 msgstr "Barra de archivo"
 
-#: spyderlib\plugins\editor.py:1160 spyderlib\spyder.py:542
+#: spyderlib\plugins\editor.py:1215 spyderlib\spyder.py:548
 msgid "Search toolbar"
 msgstr "Barra de búsqueda"
 
-#: spyderlib\plugins\editor.py:1161 spyderlib\spyder.py:547
+#: spyderlib\plugins\editor.py:1216 spyderlib\spyder.py:553
 msgid "Source toolbar"
 msgstr "Barra de código fuente"
 
-#: spyderlib\plugins\editor.py:1162 spyderlib\spyder.py:552
+#: spyderlib\plugins\editor.py:1217 spyderlib\spyder.py:558
 msgid "Run toolbar"
 msgstr "Barra de ejecución"
 
-#: spyderlib\plugins\editor.py:1163 spyderlib\spyder.py:556
+#: spyderlib\plugins\editor.py:1218 spyderlib\spyder.py:563
 msgid "Debug toolbar"
 msgstr "Barra de depuración"
 
-#: spyderlib\plugins\editor.py:1164 spyderlib\spyder.py:537
+#: spyderlib\plugins\editor.py:1219 spyderlib\spyder.py:543
 msgid "Edit toolbar"
 msgstr "Barra de edición"
 
-#: spyderlib\plugins\editor.py:1167 spyderlib\spyder.py:529
+#: spyderlib\plugins\editor.py:1222 spyderlib\spyder.py:535
 msgid "&File"
 msgstr "&Archivo"
 
-#: spyderlib\plugins\editor.py:1168 spyderlib\spyder.py:536
+#: spyderlib\plugins\editor.py:1223 spyderlib\spyder.py:542
 msgid "&Edit"
 msgstr "&Editar"
 
-#: spyderlib\plugins\editor.py:1169 spyderlib\spyder.py:541
+#: spyderlib\plugins\editor.py:1224 spyderlib\spyder.py:547
 msgid "&Search"
 msgstr "&Buscar"
 
-#: spyderlib\plugins\editor.py:1170 spyderlib\spyder.py:546
+#: spyderlib\plugins\editor.py:1225 spyderlib\spyder.py:552
 msgid "Sour&ce"
 msgstr "&Código fuente"
 
-#: spyderlib\plugins\editor.py:1172 spyderlib\spyder.py:563
+#: spyderlib\plugins\editor.py:1227 spyderlib\spyder.py:570
 msgid "&Tools"
 msgstr "&Herramientas"
 
-#: spyderlib\plugins\editor.py:1173
+#: spyderlib\plugins\editor.py:1228
 msgid "?"
 msgstr "?"
 
-#: spyderlib\plugins\editor.py:1387
+#: spyderlib\plugins\editor.py:1442
 msgid "Spyder Editor"
 msgstr "Editor de Spyder"
 
-#: spyderlib\plugins\editor.py:1388
+#: spyderlib\plugins\editor.py:1443
 msgid "This temporary script file is located here:"
 msgstr "Este archivo temporal se encuentra aquí:"
 
-#: spyderlib\plugins\editor.py:1449
+#: spyderlib\plugins\editor.py:1504
 msgid "untitled"
 msgstr "Sin título "
 
-#: spyderlib\plugins\editor.py:1520
+#: spyderlib\plugins\editor.py:1575
 msgid "Maximum number of recent files"
 msgstr "Máximo número de archivos recientes"
 
-#: spyderlib\plugins\editor.py:1560 spyderlib\plugins\workingdirectory.py:68
-msgid "Open file"
-msgstr "Abrir archivo"
-
-#: spyderlib\plugins\editor.py:1642
+#: spyderlib\plugins\editor.py:1697
 msgid "Printing..."
 msgstr "Imprimir..."
 
@@ -1163,46 +1163,50 @@ msgstr "Imprimir..."
 msgid "File explorer"
 msgstr "Explorador de archivos"
 
-#: spyderlib\plugins\explorer.py:60 spyderlib\plugins\inspector.py:277
-#: spyderlib\plugins\projectexplorer.py:57
+#: spyderlib\plugins\explorer.py:60 spyderlib\plugins\inspector.py:285
+#: spyderlib\plugins\projectexplorer.py:58
 msgid "Set font style"
 msgstr "Establece el tipo de fuente"
 
-#: spyderlib\plugins\externalconsole.py:65
-#: spyderlib\plugins\externalconsole.py:999 spyderlib\plugins\inspector.py:307
-#: spyderlib\plugins\ipythonconsole.py:424
-#: spyderlib\plugins\ipythonconsole.py:1129
+#: spyderlib\plugins\externalconsole.py:44
+msgid "Interactive data plotting"
+msgstr "Graficar datos interactivamente"
+
+#: spyderlib\plugins\externalconsole.py:69
+#: spyderlib\plugins\externalconsole.py:1079
+#: spyderlib\plugins\inspector.py:315 spyderlib\plugins\ipythonconsole.py:433
+#: spyderlib\plugins\ipythonconsole.py:1176
 #: spyderlib\widgets\externalshell\baseshell.py:105
 msgid "Console"
 msgstr "Terminal"
 
-#: spyderlib\plugins\externalconsole.py:72
+#: spyderlib\plugins\externalconsole.py:87
 msgid "One tab per script"
 msgstr "Una pestaña por archivo"
 
-#: spyderlib\plugins\externalconsole.py:73
+#: spyderlib\plugins\externalconsole.py:88
 #: spyderlib\widgets\externalshell\baseshell.py:170
 msgid "Show elapsed time"
 msgstr "Mostrar el tiempo transcurrido"
 
-#: spyderlib\plugins\externalconsole.py:74 spyderlib\widgets\explorer.py:955
+#: spyderlib\plugins\externalconsole.py:89 spyderlib\widgets\explorer.py:955
 msgid "Show icons and text"
 msgstr "Mostrar iconos y texto "
 
-#: spyderlib\plugins\externalconsole.py:86
+#: spyderlib\plugins\externalconsole.py:101
 msgid "Buffer: "
 msgstr "Mostrar:"
 
-#: spyderlib\plugins\externalconsole.py:86
-#: spyderlib\plugins\ipythonconsole.py:99
+#: spyderlib\plugins\externalconsole.py:101
+#: spyderlib\plugins\ipythonconsole.py:107
 msgid " lines"
 msgstr "líneas"
 
-#: spyderlib\plugins\externalconsole.py:91
+#: spyderlib\plugins\externalconsole.py:106
 msgid "Merge process standard output/error channels"
 msgstr "Combinar los canales de salida y error estándar del proceso"
 
-#: spyderlib\plugins\externalconsole.py:93
+#: spyderlib\plugins\externalconsole.py:108
 msgid ""
 "Merging the output channels of the process means that\n"
 "the standard error won't be written in red anymore,\n"
@@ -1212,11 +1216,11 @@ msgstr ""
 "el error estándar no será escrito en rojo , pero esto ayuda a\n"
 "mejorar la velocidad en que aparece el texto en la terminal."
 
-#: spyderlib\plugins\externalconsole.py:97
+#: spyderlib\plugins\externalconsole.py:112
 msgid "Colorize standard error channel using ANSI escape codes"
 msgstr "Colorear el canal de error estándar usando códigos de escape ANSI "
 
-#: spyderlib\plugins\externalconsole.py:99
+#: spyderlib\plugins\externalconsole.py:114
 msgid ""
 "This method is the only way to have colorized standard\n"
 "error channel when the output channels have been merged."
@@ -1224,12 +1228,12 @@ msgstr ""
 "Éste método es la única forma de darle color al canal de error\n"
 "estándar cuando los canales de salida han sido combinados."
 
-#: spyderlib\plugins\externalconsole.py:117
+#: spyderlib\plugins\externalconsole.py:132
 #: spyderlib\widgets\arrayeditor.py:393
 msgid "Background color"
 msgstr "Color de fondo"
 
-#: spyderlib\plugins\externalconsole.py:118
+#: spyderlib\plugins\externalconsole.py:133
 msgid ""
 "This option will be applied the next time a Python console or a terminal is "
 "opened."
@@ -1237,12 +1241,12 @@ msgstr ""
 "Esta opción será aplicada la próxima vez que una terminal de Python o una "
 "consola sea abierta."
 
-#: spyderlib\plugins\externalconsole.py:121
+#: spyderlib\plugins\externalconsole.py:136
 msgid "Light background (white color)"
 msgstr "Fondo claro (color blanco)"
 
-#: spyderlib\plugins\externalconsole.py:142
-#: spyderlib\plugins\ipythonconsole.py:82
+#: spyderlib\plugins\externalconsole.py:157
+#: spyderlib\plugins\ipythonconsole.py:90
 msgid ""
 "If this option is enabled, object inspector\n"
 "will automatically show informations on functions\n"
@@ -1255,11 +1259,11 @@ msgstr ""
 "(esto se activa cuando se introduce un paréntesis\n"
 "izquierdo después de un nombre de función válido)"
 
-#: spyderlib\plugins\externalconsole.py:157
+#: spyderlib\plugins\externalconsole.py:172
 msgid "User Module Deleter (UMD)"
 msgstr "Eliminador de Módulos del Usuario (EMU)"
 
-#: spyderlib\plugins\externalconsole.py:158
+#: spyderlib\plugins\externalconsole.py:173
 msgid ""
 "UMD forces Python to reload modules which were imported when executing a \n"
 "script in the external console with the 'runfile' function."
@@ -1267,11 +1271,11 @@ msgstr ""
 "El EMU obliga a Python a recargar los módulos que fueron importados\n"
 "durante la ejecución de un archivo en la terminal con la función 'runfile'."
 
-#: spyderlib\plugins\externalconsole.py:161
+#: spyderlib\plugins\externalconsole.py:176
 msgid "Enable UMD"
 msgstr "Activar el EMU"
 
-#: spyderlib\plugins\externalconsole.py:162
+#: spyderlib\plugins\externalconsole.py:177
 msgid ""
 "This option will enable the User Module Deleter (UMD) in Python "
 "interpreters. UMD forces Python to reload deeply modules during import when "
@@ -1296,11 +1300,11 @@ msgstr ""
 "<b>Qt.WA_DeleteOnClose</b> en su ventana principal, utilizando para ello el "
 "método <b>setAttribute</b>)."
 
-#: spyderlib\plugins\externalconsole.py:178
+#: spyderlib\plugins\externalconsole.py:193
 msgid "Show reloaded modules list"
 msgstr "Mostrar la lista de módulos que fueron recargados"
 
-#: spyderlib\plugins\externalconsole.py:179
+#: spyderlib\plugins\externalconsole.py:194
 msgid ""
 "Please note that these changes will be applied only to new Python "
 "interpreters"
@@ -1308,37 +1312,47 @@ msgstr ""
 "Por favor tenga en cuenta que estos cambios sólo se aplicarán a nuevos "
 "intérpretes de IPython y Python"
 
-#: spyderlib\plugins\externalconsole.py:183
+#: spyderlib\plugins\externalconsole.py:198
 msgid "Set UMD excluded (not reloaded) modules"
 msgstr "Establecer la lista de módulos excluidos por el EMU"
 
-#: spyderlib\plugins\externalconsole.py:195
+#: spyderlib\plugins\externalconsole.py:210
 msgid "Python executable"
 msgstr "Archivo ejecutable de Python"
 
-#: spyderlib\plugins\externalconsole.py:196
-msgid "Path to Python interpreter executable binary:"
-msgstr "Ruta al intérprete ejecutable de Python:"
+#: spyderlib\plugins\externalconsole.py:212
+msgid ""
+"Select the Python interpreter executable binary in which Spyder will run "
+"scripts:"
+msgstr "Seleccionar la ruta al intérprete de Python que desee usar:"
 
-#: spyderlib\plugins\externalconsole.py:199
+#: spyderlib\plugins\externalconsole.py:215
+msgid "Default (i.e. the same as Spyder's)"
+msgstr "Por defecto (es decir, el mismo de Spyder)"
+
+#: spyderlib\plugins\externalconsole.py:219
+msgid "Use the following Python interpreter:"
+msgstr "Usar el siguiente intérprete:"
+
+#: spyderlib\plugins\externalconsole.py:223
 msgid "Executables"
 msgstr "Ejecutables"
 
-#: spyderlib\plugins\externalconsole.py:220
-#: spyderlib\plugins\ipythonconsole.py:353
+#: spyderlib\plugins\externalconsole.py:243
+#: spyderlib\plugins\ipythonconsole.py:362
 #: spyderlib\plugins\workingdirectory.py:41
 msgid "Startup"
 msgstr "Inicialización"
 
-#: spyderlib\plugins\externalconsole.py:221
+#: spyderlib\plugins\externalconsole.py:244
 msgid "Open a Python interpreter at startup"
 msgstr "Abrir un intérprete de Python al inicio"
 
-#: spyderlib\plugins\externalconsole.py:229
+#: spyderlib\plugins\externalconsole.py:252
 msgid "PYTHONSTARTUP replacement"
 msgstr "Reemplazo de PYTHONSTARTUP"
 
-#: spyderlib\plugins\externalconsole.py:230
+#: spyderlib\plugins\externalconsole.py:254
 msgid ""
 "This option will override the PYTHONSTARTUP environment variable which\n"
 "defines the script to be executed during the Python interpreter startup."
@@ -1347,19 +1361,19 @@ msgstr ""
 "define el archivo que es ejecutado durante el arranque del intérprete de\n"
 "Python."
 
-#: spyderlib\plugins\externalconsole.py:235
+#: spyderlib\plugins\externalconsole.py:259
 msgid "Default PYTHONSTARTUP script"
 msgstr "Utilizar el archivo por defecto de PYTHONSTARTUP"
 
-#: spyderlib\plugins\externalconsole.py:238
+#: spyderlib\plugins\externalconsole.py:263
 msgid "Use the following startup script:"
 msgstr "Utilizar el siguiente archivo de arranque:"
 
-#: spyderlib\plugins\externalconsole.py:256
+#: spyderlib\plugins\externalconsole.py:282
 msgid "Monitor"
 msgstr "Monitor"
 
-#: spyderlib\plugins\externalconsole.py:257
+#: spyderlib\plugins\externalconsole.py:283
 msgid ""
 "The monitor provides introspection features to console: code completion, "
 "calltips and variable explorer. Because it relies on several modules, "
@@ -1370,33 +1384,33 @@ msgstr ""
 "Dado que depende de varios módulos adicionales, desactivar el monitor puede "
 "acelerar el arranque de la terminal."
 
-#: spyderlib\plugins\externalconsole.py:264
+#: spyderlib\plugins\externalconsole.py:290
 msgid "Enable monitor"
 msgstr "Activar el monitor"
 
-#: spyderlib\plugins\externalconsole.py:276
+#: spyderlib\plugins\externalconsole.py:302
 msgid "Default library"
 msgstr "Librería por defecto"
 
-#: spyderlib\plugins\externalconsole.py:278
+#: spyderlib\plugins\externalconsole.py:304
 msgid "Qt (PyQt/PySide)"
 msgstr "Qt (PyQt/PySide)"
 
-#: spyderlib\plugins\externalconsole.py:280
+#: spyderlib\plugins\externalconsole.py:306
 msgid "Qt-Python bindings library selection:"
 msgstr "Selección de la librería de enlace entre Qt y Python:"
 
-#: spyderlib\plugins\externalconsole.py:282
+#: spyderlib\plugins\externalconsole.py:308
 msgid ""
 "This option will act on<br> libraries such as Matplotlib, guidata or ETS"
 msgstr ""
 "Esta opción tendrá efecto<br> en librerías como Matplotlib, guidata o ETS"
 
-#: spyderlib\plugins\externalconsole.py:293
+#: spyderlib\plugins\externalconsole.py:322
 msgid "Install Spyder's input hook for Qt"
 msgstr "Instalar el \"input hook\" de Spyder para Qt"
 
-#: spyderlib\plugins\externalconsole.py:295
+#: spyderlib\plugins\externalconsole.py:324
 msgid ""
 "PyQt installs an input hook that allows<br> creating and interacting with Qt "
 "widgets in an interactive interpreter without blocking it. On Windows "
@@ -1412,27 +1426,27 @@ msgstr ""
 "así que se requiere activar esta característica para poder manipular "
 "objectos de PySide/Qt interactivamente."
 
-#: spyderlib\plugins\externalconsole.py:314
+#: spyderlib\plugins\externalconsole.py:343
 msgid "PyQt"
 msgstr "PyQt"
 
-#: spyderlib\plugins\externalconsole.py:316
+#: spyderlib\plugins\externalconsole.py:345
 msgid "API selection for QString and QVariant objects:"
 msgstr "Selección del API para objetos QString and QVariant:"
 
-#: spyderlib\plugins\externalconsole.py:317
+#: spyderlib\plugins\externalconsole.py:346
 msgid "API #1"
 msgstr "API #1"
 
-#: spyderlib\plugins\externalconsole.py:317
+#: spyderlib\plugins\externalconsole.py:346
 msgid "API #2"
 msgstr "API #2"
 
-#: spyderlib\plugins\externalconsole.py:317
+#: spyderlib\plugins\externalconsole.py:346
 msgid "Default API"
 msgstr "API por defecto"
 
-#: spyderlib\plugins\externalconsole.py:319
+#: spyderlib\plugins\externalconsole.py:348
 msgid ""
 "PyQt API #1 is the default API for<br>Python 2. PyQt API #2 is the default "
 "API for Python 3 and is compatible with PySide. Note that switching to API "
@@ -1443,11 +1457,11 @@ msgstr ""
 "cuenta que para cambiar al API #2 puede ser necesario activar el parche de "
 "Matplotlib."
 
-#: spyderlib\plugins\externalconsole.py:325
+#: spyderlib\plugins\externalconsole.py:354
 msgid "Ignore API change errors (sip.setapi)"
 msgstr "Ignorar los errores de cambio de API (sip.setapi)"
 
-#: spyderlib\plugins\externalconsole.py:327
+#: spyderlib\plugins\externalconsole.py:356
 msgid ""
 "Enabling this option will ignore <br>errors when changing PyQt API. As PyQt "
 "does not support dynamic API changes, it is strongly recommended to use this "
@@ -1458,26 +1472,26 @@ msgstr ""
 "recomienda usar esta característica con sumo cuidado, por ejemplo, para "
 "propósitos de depuración."
 
-#: spyderlib\plugins\externalconsole.py:346
+#: spyderlib\plugins\externalconsole.py:375
 msgid "Matplotlib"
 msgstr "Matplotlib"
 
-#: spyderlib\plugins\externalconsole.py:348
+#: spyderlib\plugins\externalconsole.py:377
 msgid "GUI backend:"
 msgstr "Salida gráfica:"
 
-#: spyderlib\plugins\externalconsole.py:350
+#: spyderlib\plugins\externalconsole.py:379
 msgid ""
 "Set the GUI toolkit used by <br>Matplotlib to show figures (default: Qt4Agg)"
 msgstr ""
 "Establecer la librería gráfica <br>utilizada para generar las gráficas de "
 "Matplotlib (por defecto: Qt4Agg)"
 
-#: spyderlib\plugins\externalconsole.py:361
+#: spyderlib\plugins\externalconsole.py:390
 msgid "Patch Matplotlib figures"
 msgstr "Parchear las gráficas de Matplotlib"
 
-#: spyderlib\plugins\externalconsole.py:363
+#: spyderlib\plugins\externalconsole.py:392
 msgid ""
 "Patching Matplotlib library will add a button to customize figure options "
 "(Qt4Agg only) and fix some issues."
@@ -1487,11 +1501,11 @@ msgstr ""
 "el backend Qt4Agg) para ajustar las opciones de curvas y gráficas y para\n"
 "corregir algunos problemas."
 
-#: spyderlib\plugins\externalconsole.py:383
+#: spyderlib\plugins\externalconsole.py:412
 msgid "Enthought Tool Suite"
 msgstr "Enthought Tool Suite"
 
-#: spyderlib\plugins\externalconsole.py:384
+#: spyderlib\plugins\externalconsole.py:413
 msgid ""
 "Enthought Tool Suite (ETS) supports PyQt4 (qt4) and wxPython (wx) graphical "
 "user interfaces."
@@ -1500,19 +1514,19 @@ msgstr ""
 "y \n"
 "wxPython (wx). Esta opción establece cual desea utilizar el usuario."
 
-#: spyderlib\plugins\externalconsole.py:388
+#: spyderlib\plugins\externalconsole.py:417
 msgid "ETS_TOOLKIT:"
 msgstr "ETS_TOOLKIT:"
 
-#: spyderlib\plugins\externalconsole.py:409
+#: spyderlib\plugins\externalconsole.py:438
 msgid "External modules"
 msgstr "Módulos externos"
 
-#: spyderlib\plugins\externalconsole.py:595
+#: spyderlib\plugins\externalconsole.py:642
 msgid "Trying to kill a kernel?"
 msgstr "Desea cerrar un núcleo?"
 
-#: spyderlib\plugins\externalconsole.py:596
+#: spyderlib\plugins\externalconsole.py:643
 msgid ""
 "You can't close this kernel because it has one or more consoles connected to "
 "it.<br><br>You need to close them instead or you can kill the kernel using "
@@ -1522,14 +1536,14 @@ msgstr ""
 "él.<br><br>Debe cerrarlas previamente o puede terminar el proceso usando el "
 "botón ubicado más a su derecha."
 
-#: spyderlib\plugins\externalconsole.py:671
-#: spyderlib\plugins\ipythonconsole.py:717 spyderlib\spyder.py:1221
-#: spyderlib\spyder.py:1239 spyderlib\utils\environ.py:95
+#: spyderlib\plugins\externalconsole.py:718
+#: spyderlib\plugins\ipythonconsole.py:730 spyderlib\spyder.py:1238
+#: spyderlib\spyder.py:1256 spyderlib\utils\environ.py:95
 #: spyderlib\utils\environ.py:108
 msgid "Warning"
 msgstr "Advertencia"
 
-#: spyderlib\plugins\externalconsole.py:672
+#: spyderlib\plugins\externalconsole.py:719
 msgid ""
 "No Python shell is currently selected to run <b>%s</b>.<br><br>Please select "
 "or open a new Python interpreter and try again."
@@ -1537,7 +1551,7 @@ msgstr ""
 "No hay un intérprete de Python para ejecutar <b>%s</b>.<br><br>Por favor "
 "abra uno nuevo y pruebe otra vez."
 
-#: spyderlib\plugins\externalconsole.py:749
+#: spyderlib\plugins\externalconsole.py:796
 msgid ""
 "%s is already running in a separate process.\n"
 "Do you want to kill the process before starting a new one?"
@@ -1545,54 +1559,69 @@ msgstr ""
 "%s ya se está ejecutando en proceso aparte.\n"
 "¿Desea terminar este proceso antes de empezar uno nuevo?"
 
-#: spyderlib\plugins\externalconsole.py:880
+#: spyderlib\plugins\externalconsole.py:948
 msgid "Kernel"
 msgstr "Núcleo"
 
-#: spyderlib\plugins\externalconsole.py:900
+#: spyderlib\plugins\externalconsole.py:958
+#: spyderlib\plugins\ipythonconsole.py:1003
+msgid "Mismatch between kernel and frontend"
+msgstr "Incompatibilidad entre el núcleo y la interfaz gráfica"
+
+#: spyderlib\plugins\externalconsole.py:959
+#: spyderlib\plugins\ipythonconsole.py:1004
+msgid ""
+"Your IPython frontend and kernel versions are <b>incompatible!!</"
+"b><br><br>We're sorry but we can't create an IPython console for you."
+msgstr ""
+"Sus versiones del núcleo y la interfaz gráfica de IPython son "
+"<b>incompatibles!!</b><br><br>Lo lamentamos pero no podemos crear una "
+"terminal de IPython para usted."
+
+#: spyderlib\plugins\externalconsole.py:980
 msgid "Command Window"
 msgstr "Símbolo"
 
-#: spyderlib\plugins\externalconsole.py:902
+#: spyderlib\plugins\externalconsole.py:982
 msgid "Terminal"
 msgstr "Terminal"
 
-#: spyderlib\plugins\externalconsole.py:1021
+#: spyderlib\plugins\externalconsole.py:1101
 msgid "Open a Python &interpreter"
 msgstr "Abrir un &intérprete de Python"
 
-#: spyderlib\plugins\externalconsole.py:1024
+#: spyderlib\plugins\externalconsole.py:1104
 msgid "Open &command prompt"
 msgstr "Abrir &símbolo del sistema"
 
-#: spyderlib\plugins\externalconsole.py:1025
+#: spyderlib\plugins\externalconsole.py:1105
 msgid "Open a Windows command prompt"
 msgstr "Abre el símbolo del sistema de Windows"
 
-#: spyderlib\plugins\externalconsole.py:1027
+#: spyderlib\plugins\externalconsole.py:1107
 msgid "Open &terminal"
 msgstr "Abrir &terminal de comandos"
 
-#: spyderlib\plugins\externalconsole.py:1028
+#: spyderlib\plugins\externalconsole.py:1108
 msgid "Open a terminal window inside Spyder"
 msgstr "Abre una terminal del sistema (en Windows, dentro de Spyder)"
 
-#: spyderlib\plugins\externalconsole.py:1149
-#: spyderlib\widgets\projectexplorer.py:333
+#: spyderlib\plugins\externalconsole.py:1229
+#: spyderlib\widgets\projectexplorer.py:334
 msgid " and "
 msgstr " y"
 
-#: spyderlib\plugins\externalconsole.py:1154
+#: spyderlib\plugins\externalconsole.py:1234
 msgid "<br><u>Installed version</u>: %s"
 msgstr "<br><u>Versión instalada</u>: %s"
 
-#: spyderlib\plugins\externalconsole.py:1156
-#: spyderlib\plugins\ipythonconsole.py:51
-#: spyderlib\plugins\ipythonconsole.py:668
+#: spyderlib\plugins\externalconsole.py:1236
+#: spyderlib\plugins\ipythonconsole.py:59
+#: spyderlib\plugins\ipythonconsole.py:681
 msgid "IPython console"
 msgstr "Terminal de IPython"
 
-#: spyderlib\plugins\externalconsole.py:1157
+#: spyderlib\plugins\externalconsole.py:1237
 msgid ""
 "Unable to open IPython console because no supported IPython version was "
 "found.<br><br><u>Supported IPython versions</u>: %s"
@@ -1601,12 +1630,12 @@ msgstr ""
 "versión de IPython soportada por Spyder. <br><br><u>Versiones soportadas "
 "son</u>: %s"
 
-#: spyderlib\plugins\externalconsole.py:1178
-#: spyderlib\plugins\ipythonconsole.py:737
+#: spyderlib\plugins\externalconsole.py:1258
+#: spyderlib\plugins\ipythonconsole.py:750
 msgid "Open an IPython console"
 msgstr "Abrir una terminal de IPython"
 
-#: spyderlib\plugins\externalconsole.py:1179
+#: spyderlib\plugins\externalconsole.py:1259
 msgid ""
 "The console monitor was disabled: the IPython kernel will be started as "
 "expected, but an IPython console will have to be connected manually to the "
@@ -1615,13 +1644,13 @@ msgstr ""
 "El monitor está desactivado, por tanto se creará un kernel de IPython pero "
 "usted deberá conectar manualmente un intérprete al mismo."
 
-#: spyderlib\plugins\externalconsole.py:1215
-#: spyderlib\plugins\externalconsole.py:1228
-#: spyderlib\plugins\externalconsole.py:1232
+#: spyderlib\plugins\externalconsole.py:1295
+#: spyderlib\plugins\externalconsole.py:1308
+#: spyderlib\plugins\externalconsole.py:1312
 msgid "UMD"
 msgstr "EMU"
 
-#: spyderlib\plugins\externalconsole.py:1216
+#: spyderlib\plugins\externalconsole.py:1296
 msgid ""
 "UMD excluded modules:\n"
 "(example: guidata, guiqwt)"
@@ -1629,7 +1658,7 @@ msgstr ""
 "Módulos excluidos del EMU:\n"
 "(por ejemplo: guidata, guiqwt)"
 
-#: spyderlib\plugins\externalconsole.py:1229
+#: spyderlib\plugins\externalconsole.py:1309
 msgid ""
 "The following modules are not installed on your machine:\n"
 "%s"
@@ -1637,7 +1666,7 @@ msgstr ""
 "Los siguientes módulos no están instalados en su computador:\n"
 "%s"
 
-#: spyderlib\plugins\externalconsole.py:1233
+#: spyderlib\plugins\externalconsole.py:1313
 msgid ""
 "Please note that these changes will be applied only to new Python/IPython "
 "interpreters"
@@ -1673,8 +1702,8 @@ msgstr "Longitud del historial"
 msgid "Scroll automatically to last entry"
 msgstr "Desplazarse automáticamente a la última entrada"
 
-#: spyderlib\plugins\history.py:98 spyderlib\plugins\inspector.py:360
-#: spyderlib\plugins\ipythonconsole.py:477 spyderlib\widgets\editor.py:650
+#: spyderlib\plugins\history.py:98 spyderlib\plugins\inspector.py:368
+#: spyderlib\plugins\ipythonconsole.py:486 spyderlib\widgets\editor.py:653
 #: spyderlib\widgets\explorer.py:985
 #: spyderlib\widgets\externalshell\baseshell.py:150
 #: spyderlib\widgets\externalshell\namespacebrowser.py:220
@@ -1701,71 +1730,75 @@ msgstr "Historial"
 msgid "Maximum entries"
 msgstr "Máximo número de entradas"
 
-#: spyderlib\plugins\inspector.py:101
+#: spyderlib\plugins\inspector.py:53
+msgid "Rich text help on the Object Inspector"
+msgstr "Ayuda en texto enriquecido en el Insp. de Objetos"
+
+#: spyderlib\plugins\inspector.py:108
 msgid "Plain text font style"
 msgstr "Fuente para el texto plano"
 
-#: spyderlib\plugins\inspector.py:104
+#: spyderlib\plugins\inspector.py:111
 msgid "Rich text font style"
 msgstr "Fuente para el texto enriquecido"
 
-#: spyderlib\plugins\inspector.py:106
+#: spyderlib\plugins\inspector.py:113
 msgid "Additional features"
 msgstr "Características adicionales"
 
-#: spyderlib\plugins\inspector.py:107
+#: spyderlib\plugins\inspector.py:114
 msgid "Render mathematical equations"
 msgstr "Renderizar ecuaciones matemáticas"
 
-#: spyderlib\plugins\inspector.py:112
+#: spyderlib\plugins\inspector.py:120
 msgid "This feature requires Sphinx 1.1 or superior."
 msgstr "Esta característica requiere Sphinx 1.1 o superior."
 
-#: spyderlib\plugins\inspector.py:114
+#: spyderlib\plugins\inspector.py:122
 msgid "Sphinx %s is currently installed."
 msgstr "Sphinx %s está instalado actualmente."
 
-#: spyderlib\plugins\inspector.py:261
+#: spyderlib\plugins\inspector.py:269
 msgid "No documentation available"
 msgstr "No existe documentación disponible"
 
-#: spyderlib\plugins\inspector.py:300
+#: spyderlib\plugins\inspector.py:308
 msgid "Source"
 msgstr "Origen"
 
-#: spyderlib\plugins\inspector.py:315 spyderlib\widgets\dicteditor.py:161
+#: spyderlib\plugins\inspector.py:323 spyderlib\widgets\dicteditor.py:161
 msgid "Object"
 msgstr "Objeto"
 
-#: spyderlib\plugins\inspector.py:330
+#: spyderlib\plugins\inspector.py:338
 msgid "Plain Text"
 msgstr "Texto plano"
 
-#: spyderlib\plugins\inspector.py:334
+#: spyderlib\plugins\inspector.py:342
 msgid "Show Source"
 msgstr "Mostrar código fuente"
 
-#: spyderlib\plugins\inspector.py:338
+#: spyderlib\plugins\inspector.py:346
 msgid "Rich Text"
 msgstr "Texto enriquecido"
 
-#: spyderlib\plugins\inspector.py:348
+#: spyderlib\plugins\inspector.py:356
 msgid "Automatic import"
 msgstr "Importar automáticamente"
 
-#: spyderlib\plugins\inspector.py:404 spyderlib\plugins\inspector.py:791
+#: spyderlib\plugins\inspector.py:412 spyderlib\plugins\inspector.py:799
 msgid "Object inspector"
 msgstr "Inspector de objetos"
 
-#: spyderlib\plugins\inspector.py:747
+#: spyderlib\plugins\inspector.py:755
 msgid "Lock"
 msgstr "Bloquear"
 
-#: spyderlib\plugins\inspector.py:747
+#: spyderlib\plugins\inspector.py:755
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: spyderlib\plugins\inspector.py:792
+#: spyderlib\plugins\inspector.py:800
 msgid ""
 "The following error occured when calling <b>Sphinx %s</b>. <br>Incompatible "
 "Sphinx version or doc string decoding failed.<br><br>Error message:<br>%s"
@@ -1774,15 +1807,19 @@ msgstr ""
 "<br>Ello se debe a una versión incompatible de Sphinx o bien a que no fue "
 "posible leer la documentación solicitada.<br><br>Mensaje de error:<br>%s"
 
-#: spyderlib\plugins\inspector.py:842
+#: spyderlib\plugins\inspector.py:850
 msgid "No source code available."
 msgstr "No está disponible el código fuente"
 
-#: spyderlib\plugins\ipythonconsole.py:63
+#: spyderlib\plugins\ipythonconsole.py:52
+msgid "Symbolic mathematics for the IPython Console"
+msgstr "Matemática simbólica para la terminal de IPython"
+
+#: spyderlib\plugins\ipythonconsole.py:71
 msgid "Display initial banner"
 msgstr "Mostrar el banner inicial"
 
-#: spyderlib\plugins\ipythonconsole.py:64
+#: spyderlib\plugins\ipythonconsole.py:72
 msgid ""
 "This option lets you hide the message shown at\n"
 "the top of the console when it's opened."
@@ -1791,22 +1828,22 @@ msgstr ""
 "aparece al principio de la terminal cuando se abre\n"
 "por primera vez."
 
-#: spyderlib\plugins\ipythonconsole.py:66
+#: spyderlib\plugins\ipythonconsole.py:74
 msgid "Use a completion widget"
 msgstr "Usar un widget para completar texto"
 
-#: spyderlib\plugins\ipythonconsole.py:68
+#: spyderlib\plugins\ipythonconsole.py:76
 msgid "Use a widget instead of plain text output for tab completion"
 msgstr ""
 "Puede decidir si usar un widget en lugar de texto plano \n"
 "para mostrar las posibilidades de completado usando la\n"
 "tecla Tab."
 
-#: spyderlib\plugins\ipythonconsole.py:70
+#: spyderlib\plugins\ipythonconsole.py:78
 msgid "Use a pager to display additional text inside the console"
 msgstr "Usar un paginador para mostrar textos dentro de la terminal"
 
-#: spyderlib\plugins\ipythonconsole.py:72
+#: spyderlib\plugins\ipythonconsole.py:80
 msgid ""
 "Useful if you don't want to fill the console with long help or completion "
 "texts.\n"
@@ -1815,19 +1852,19 @@ msgstr ""
 "Es útil si no desea llenar la terminal con largos textos de ayuda.\n"
 "Nota: Debe usar la tecla Q para salir del paginador"
 
-#: spyderlib\plugins\ipythonconsole.py:76
+#: spyderlib\plugins\ipythonconsole.py:84
 msgid "Display balloon tips"
 msgstr "Mostrar globos de sugerencias"
 
-#: spyderlib\plugins\ipythonconsole.py:77
+#: spyderlib\plugins\ipythonconsole.py:85
 msgid "Ask for confirmation before closing"
 msgstr "Mostrar un diálogo de confirmación antes de cerrar una terminal"
 
-#: spyderlib\plugins\ipythonconsole.py:99
+#: spyderlib\plugins\ipythonconsole.py:107
 msgid "Buffer:  "
 msgstr "Mostrar"
 
-#: spyderlib\plugins\ipythonconsole.py:101
+#: spyderlib\plugins\ipythonconsole.py:109
 msgid ""
 "Set the maximum number of lines of text shown in the\n"
 "console before truncation. Specifying -1 disables it\n"
@@ -1837,19 +1874,19 @@ msgstr ""
 "en la terminal en cualquier momento. Si se introduce -1 se\n"
 "mostrarán todas las líneas (no se recomienda!)"
 
-#: spyderlib\plugins\ipythonconsole.py:110
-msgid "Support for graphics (Pylab)"
-msgstr "Soporte para crear gráficas (Pylab)"
+#: spyderlib\plugins\ipythonconsole.py:118
+msgid "Support for graphics (Matplotlib)"
+msgstr "Soporte para crear gráficas (Matplotlib)"
 
-#: spyderlib\plugins\ipythonconsole.py:111
+#: spyderlib\plugins\ipythonconsole.py:119
 msgid "Activate support"
 msgstr "Activar el soporte"
 
-#: spyderlib\plugins\ipythonconsole.py:112
-msgid "Automatically load Pylab and NumPy"
-msgstr "Cargar automáticamente Pylab y NumPy"
+#: spyderlib\plugins\ipythonconsole.py:120
+msgid "Automatically load Pylab and NumPy modules"
+msgstr "Cargar automáticamente los módulos de Pylab y NumPy"
 
-#: spyderlib\plugins\ipythonconsole.py:114
+#: spyderlib\plugins\ipythonconsole.py:123
 msgid ""
 "This lets you load graphics support without importing \n"
 "the commands to do plots. Useful to work with other\n"
@@ -1861,7 +1898,7 @@ msgstr ""
 "otras librerías gráficas diferentes a Matplotlib o para\n"
 "desarrollar interfaces gráficas con Spyder."
 
-#: spyderlib\plugins\ipythonconsole.py:133
+#: spyderlib\plugins\ipythonconsole.py:142
 msgid ""
 "This feature requires the Matplotlib library.\n"
 "It seems you don't have it installed."
@@ -1869,19 +1906,19 @@ msgstr ""
 "Esta característica requiere la librería Matplotlib.\n"
 "Al parecer no la tiene instalada."
 
-#: spyderlib\plugins\ipythonconsole.py:138
+#: spyderlib\plugins\ipythonconsole.py:147
 msgid "Inline"
 msgstr "En línea"
 
-#: spyderlib\plugins\ipythonconsole.py:139
+#: spyderlib\plugins\ipythonconsole.py:148
 msgid "Automatic"
 msgstr "Automático"
 
-#: spyderlib\plugins\ipythonconsole.py:140
+#: spyderlib\plugins\ipythonconsole.py:149
 msgid "Graphics backend"
 msgstr "Salida gráfica:"
 
-#: spyderlib\plugins\ipythonconsole.py:141
+#: spyderlib\plugins\ipythonconsole.py:150
 msgid ""
 "Decide how graphics are going to be displayed in the console. If unsure, "
 "please select <b>%s</b> to put graphics inside the console or <b>%s</b> to "
@@ -1892,65 +1929,65 @@ msgstr ""
 "%s</b> para interactuar con ellas (a través de acercamientos y paneos) en "
 "una ventana aparte."
 
-#: spyderlib\plugins\ipythonconsole.py:161
+#: spyderlib\plugins\ipythonconsole.py:170
 msgid "Backend:"
 msgstr "Salida:"
 
-#: spyderlib\plugins\ipythonconsole.py:163
+#: spyderlib\plugins\ipythonconsole.py:172
 msgid "This option will be applied the next time a console is opened."
 msgstr "Esta opción será aplicada la próxima vez que una terminal sea abierta."
 
-#: spyderlib\plugins\ipythonconsole.py:175
+#: spyderlib\plugins\ipythonconsole.py:184
 msgid "Inline backend"
 msgstr "Salida en línea:"
 
-#: spyderlib\plugins\ipythonconsole.py:176
+#: spyderlib\plugins\ipythonconsole.py:185
 msgid "Decide how to render the figures created by this backend"
 msgstr ""
 "Decida como renderizar las figuras creadas por este tipo de salida gráfica"
 
-#: spyderlib\plugins\ipythonconsole.py:180
+#: spyderlib\plugins\ipythonconsole.py:189
 msgid "Format:"
 msgstr "Formato:"
 
-#: spyderlib\plugins\ipythonconsole.py:183
+#: spyderlib\plugins\ipythonconsole.py:192
 msgid "Resolution:"
 msgstr "Resolución:"
 
-#: spyderlib\plugins\ipythonconsole.py:183
+#: spyderlib\plugins\ipythonconsole.py:192
 msgid "dpi"
 msgstr "dpi"
 
-#: spyderlib\plugins\ipythonconsole.py:185
+#: spyderlib\plugins\ipythonconsole.py:194
 msgid "Only used when the format is PNG. Default is 72"
 msgstr "Sólo se usa cuando el formato es PNG. Por defecto es 72."
 
-#: spyderlib\plugins\ipythonconsole.py:188
+#: spyderlib\plugins\ipythonconsole.py:197
 msgid "Width:"
 msgstr "Ancho:"
 
-#: spyderlib\plugins\ipythonconsole.py:188
-#: spyderlib\plugins\ipythonconsole.py:192
+#: spyderlib\plugins\ipythonconsole.py:197
+#: spyderlib\plugins\ipythonconsole.py:201
 msgid "inches"
 msgstr "pulgadas"
 
-#: spyderlib\plugins\ipythonconsole.py:190
+#: spyderlib\plugins\ipythonconsole.py:199
 msgid "Default is 6"
 msgstr "Por defecto es 6"
 
-#: spyderlib\plugins\ipythonconsole.py:192
+#: spyderlib\plugins\ipythonconsole.py:201
 msgid "Height:"
 msgstr "Alto:"
 
-#: spyderlib\plugins\ipythonconsole.py:194
+#: spyderlib\plugins\ipythonconsole.py:203
 msgid "Default is 4"
 msgstr "Por defecto es 4"
 
-#: spyderlib\plugins\ipythonconsole.py:209
+#: spyderlib\plugins\ipythonconsole.py:218
 msgid "Run code"
 msgstr "Ejecutar código"
 
-#: spyderlib\plugins\ipythonconsole.py:210
+#: spyderlib\plugins\ipythonconsole.py:219
 msgid ""
 "You can run several lines of code when a console is started. Please "
 "introduce each one separated by commas, for example:<br><i>import os, import "
@@ -1960,15 +1997,15 @@ msgstr ""
 "introduzca cada una separada por comas, por ejemplo:<br><i>import os, import "
 "sys</i>"
 
-#: spyderlib\plugins\ipythonconsole.py:216
+#: spyderlib\plugins\ipythonconsole.py:225
 msgid "Lines:"
 msgstr "Líneas:"
 
-#: spyderlib\plugins\ipythonconsole.py:225
+#: spyderlib\plugins\ipythonconsole.py:234
 msgid "Run a file"
 msgstr "Ejecutar un archivo"
 
-#: spyderlib\plugins\ipythonconsole.py:226
+#: spyderlib\plugins\ipythonconsole.py:235
 msgid ""
 "You can also run a whole file at startup instead of just some lines (This is "
 "similar to have a PYTHONSTARTUP file)."
@@ -1976,23 +2013,23 @@ msgstr ""
 "También se puede ejecutar un archivo completo al inicio, en lugar de unas "
 "pocas líneas (Esto es similar a tener un archivo PYTHONSTARTUP)."
 
-#: spyderlib\plugins\ipythonconsole.py:230
+#: spyderlib\plugins\ipythonconsole.py:239
 msgid "Use the following file:"
 msgstr "Usar el siguiente archivo:"
 
-#: spyderlib\plugins\ipythonconsole.py:244
+#: spyderlib\plugins\ipythonconsole.py:253
 msgid "Spyder startup"
 msgstr "Inicialización de Spyder"
 
-#: spyderlib\plugins\ipythonconsole.py:245
+#: spyderlib\plugins\ipythonconsole.py:254
 msgid "Open an IPython console at startup"
 msgstr "Abrir una terminal de IPython al inicio"
 
-#: spyderlib\plugins\ipythonconsole.py:253
+#: spyderlib\plugins\ipythonconsole.py:262
 msgid "Greedy completion"
 msgstr "Completado ambicioso"
 
-#: spyderlib\plugins\ipythonconsole.py:254
+#: spyderlib\plugins\ipythonconsole.py:263
 msgid ""
 "Enable <tt>Tab</tt> completion on elements of lists, results of function "
 "calls, etc, <i>without</i> assigning them to a variable.<br>For example, you "
@@ -2004,15 +2041,15 @@ msgstr ""
 "variable.<br>De esta forma se pueden obtener sugerencias de completado en "
 "cosas como <tt>li[0].<Tab></tt> o <tt>ins.meth().<Tab></tt>"
 
-#: spyderlib\plugins\ipythonconsole.py:262
+#: spyderlib\plugins\ipythonconsole.py:271
 msgid "Use the greedy completer"
 msgstr "Usar el completado ambicioso"
 
-#: spyderlib\plugins\ipythonconsole.py:273
+#: spyderlib\plugins\ipythonconsole.py:282
 msgid "Autocall"
 msgstr "Autollamar"
 
-#: spyderlib\plugins\ipythonconsole.py:274
+#: spyderlib\plugins\ipythonconsole.py:283
 msgid ""
 "Autocall makes IPython automatically call any callable object even if you "
 "didn't type explicit parentheses.<br>For example, if you type <i>str 43</i> "
@@ -2023,23 +2060,23 @@ msgstr ""
 "<br>Por ejemplo, al escribir <i>str 43</i>, se convertirá automáticamente en "
 "<i>str(43)</i>."
 
-#: spyderlib\plugins\ipythonconsole.py:281
+#: spyderlib\plugins\ipythonconsole.py:290
 msgid "Smart"
 msgstr "Inteligente"
 
-#: spyderlib\plugins\ipythonconsole.py:282
+#: spyderlib\plugins\ipythonconsole.py:291
 msgid "Full"
 msgstr "Total"
 
-#: spyderlib\plugins\ipythonconsole.py:283
+#: spyderlib\plugins\ipythonconsole.py:292
 msgid "Off"
 msgstr "Desactivado"
 
-#: spyderlib\plugins\ipythonconsole.py:285
+#: spyderlib\plugins\ipythonconsole.py:294
 msgid "Autocall:  "
 msgstr "Autollamar:"
 
-#: spyderlib\plugins\ipythonconsole.py:286
+#: spyderlib\plugins\ipythonconsole.py:295
 msgid ""
 "On <b>%s</b> mode, Autocall is not applied if there are no arguments after "
 "the callable. On <b>%s</b> mode, all callable objects are automatically "
@@ -2049,11 +2086,11 @@ msgstr ""
 "objeto llamable. En modo <b>%s</b>, todos los objetos llamables son llamados "
 "automáticamente (aún si no hay argumentos presentes)."
 
-#: spyderlib\plugins\ipythonconsole.py:298
+#: spyderlib\plugins\ipythonconsole.py:307
 msgid "Symbolic Mathematics"
 msgstr "Matemática simbólica"
 
-#: spyderlib\plugins\ipythonconsole.py:299
+#: spyderlib\plugins\ipythonconsole.py:308
 msgid ""
 "Perfom symbolic operations in the console (e.g. integrals, derivatives, "
 "vector calculus, etc) and get the outputs in a beautifully printed style."
@@ -2061,11 +2098,11 @@ msgstr ""
 "Realice operaciones simbólicas en la terminal (integrales, derivadas o "
 "cálculo vectorial) y obtenga los resultados en un bello estilo impreso."
 
-#: spyderlib\plugins\ipythonconsole.py:304
+#: spyderlib\plugins\ipythonconsole.py:313
 msgid "Use symbolic math"
 msgstr "Usar matemática simbólica"
 
-#: spyderlib\plugins\ipythonconsole.py:305
+#: spyderlib\plugins\ipythonconsole.py:314
 msgid ""
 "This option loads the Sympy library to work with.<br>Please refer to its "
 "documentation to learn how to use it."
@@ -2073,7 +2110,7 @@ msgstr ""
 "Esta opción carga la librería Sympy para trabajar<br>con ella. Por favor lea "
 "su documentación para aprender como usarla."
 
-#: spyderlib\plugins\ipythonconsole.py:318
+#: spyderlib\plugins\ipythonconsole.py:327
 msgid ""
 "This feature requires the Sympy library.\n"
 "It seems you don't have it installed."
@@ -2081,87 +2118,87 @@ msgstr ""
 "Esta característica requiere la librería Sympy.\n"
 "Al parecer no la tiene instalada."
 
-#: spyderlib\plugins\ipythonconsole.py:323
+#: spyderlib\plugins\ipythonconsole.py:332
 msgid "Prompts"
 msgstr "Prompts"
 
-#: spyderlib\plugins\ipythonconsole.py:324
+#: spyderlib\plugins\ipythonconsole.py:333
 msgid "Modify how Input and Output prompts are shown in the console."
 msgstr ""
 "Modifique como se muestran los prompts de entrada y salida en la terminal."
 
-#: spyderlib\plugins\ipythonconsole.py:327
+#: spyderlib\plugins\ipythonconsole.py:336
 msgid "Input prompt:"
 msgstr "Prompt de entrada:"
 
-#: spyderlib\plugins\ipythonconsole.py:329
+#: spyderlib\plugins\ipythonconsole.py:338
 msgid ""
 "Default is<br>In [<span class=\"in-prompt-number\">%i</span>]:"
 msgstr ""
 "Por defecto es<br>In [<span class=\"in-prompt-number\">%i</"
 "span>]:"
 
-#: spyderlib\plugins\ipythonconsole.py:333
+#: spyderlib\plugins\ipythonconsole.py:342
 msgid "Output prompt:"
 msgstr "Prompt de salida:"
 
-#: spyderlib\plugins\ipythonconsole.py:335
+#: spyderlib\plugins\ipythonconsole.py:344
 msgid ""
 "Default is<br>Out[<span class=\"out-prompt-number\">%i</span>]:"
 msgstr ""
 "Por defecto es<br>Out[<span class=\"out-prompt-number\">%i</"
 "span>]:"
 
-#: spyderlib\plugins\ipythonconsole.py:351
+#: spyderlib\plugins\ipythonconsole.py:360
 msgid "Graphics"
 msgstr "Gráficas"
 
-#: spyderlib\plugins\ipythonconsole.py:355
+#: spyderlib\plugins\ipythonconsole.py:364
 msgid "Advanced Settings"
 msgstr "Opciones avanzadas"
 
-#: spyderlib\plugins\ipythonconsole.py:438
+#: spyderlib\plugins\ipythonconsole.py:447
 msgid "Interrupt kernel"
 msgstr "Interrumpir el núcleo"
 
-#: spyderlib\plugins\ipythonconsole.py:441
+#: spyderlib\plugins\ipythonconsole.py:450
 msgid "Restart kernel"
 msgstr "Reiniciar el núcleo"
 
-#: spyderlib\plugins\ipythonconsole.py:446
+#: spyderlib\plugins\ipythonconsole.py:455
 msgid "Intro to IPython"
 msgstr "Ayuda básica"
 
-#: spyderlib\plugins\ipythonconsole.py:448
+#: spyderlib\plugins\ipythonconsole.py:457
 msgid "Quick Reference"
 msgstr "Referencia rápida"
 
-#: spyderlib\plugins\ipythonconsole.py:450
+#: spyderlib\plugins\ipythonconsole.py:459
 msgid "Console help"
 msgstr "Ayuda de la terminal"
 
-#: spyderlib\plugins\ipythonconsole.py:452
+#: spyderlib\plugins\ipythonconsole.py:461
 #: spyderlib\widgets\internalshell.py:253
 msgid "Help"
 msgstr "Ayuda"
 
-#: spyderlib\plugins\ipythonconsole.py:453
+#: spyderlib\plugins\ipythonconsole.py:462
 msgid "IPython Help"
 msgstr "Ayuda de IPython"
 
-#: spyderlib\plugins\ipythonconsole.py:489
+#: spyderlib\plugins\ipythonconsole.py:498
 msgid "Inspect current object"
 msgstr "Inspeccionar objeto"
 
-#: spyderlib\plugins\ipythonconsole.py:493
+#: spyderlib\plugins\ipythonconsole.py:502
 msgid "Clear line or block"
 msgstr "Limpiar línea o bloque"
 
-#: spyderlib\plugins\ipythonconsole.py:497
+#: spyderlib\plugins\ipythonconsole.py:506
 msgid "Clear console"
 msgstr "Limpiar la terminal"
 
-#: spyderlib\plugins\ipythonconsole.py:536
+#: spyderlib\plugins\ipythonconsole.py:545
 msgid ""
 "It seems the kernel died unexpectedly. Use 'Restart kernel' to continue "
 "using this console."
@@ -2169,17 +2206,17 @@ msgstr ""
 "Al parecer el núcleo murió de forma inesperada. Use 'Reiniciar el núcleo' "
 "para continuar usando esta terminal."
 
-#: spyderlib\plugins\ipythonconsole.py:548
+#: spyderlib\plugins\ipythonconsole.py:557
 msgid "Kernel process is either remote or unspecified. Cannot interrupt"
 msgstr ""
 "El núcleo es remoto o no está especificado. Por ello no se puede interrumpir."
 
-#: spyderlib\plugins\ipythonconsole.py:557
+#: spyderlib\plugins\ipythonconsole.py:566
 msgid "Kernel process is either remote or unspecified. Cannot restart."
 msgstr ""
 "El núcleo es remoto o no está especificado. Por ello no se puede reiniciar."
 
-#: spyderlib\plugins\ipythonconsole.py:718
+#: spyderlib\plugins\ipythonconsole.py:731
 msgid ""
 "No IPython console is currently available to run <b>%s</b>.<br><br>Please "
 "open a new one and try again."
@@ -2187,32 +2224,32 @@ msgstr ""
 "No existe un intérprete de IPython para ejecutar <b>%s</b>.<br><br>Por favor "
 "abra uno nuevo e intente otra vez."
 
-#: spyderlib\plugins\ipythonconsole.py:742
+#: spyderlib\plugins\ipythonconsole.py:755
 msgid "Connect to an existing kernel"
 msgstr "Conectarse a un núcleo existente"
 
-#: spyderlib\plugins\ipythonconsole.py:744
+#: spyderlib\plugins\ipythonconsole.py:757
 msgid "Open a new IPython client connected to an external kernel"
 msgstr "Abrir una nueva consola de IPython conectada a un núcleo existente"
 
-#: spyderlib\plugins\ipythonconsole.py:854
+#: spyderlib\plugins\ipythonconsole.py:891
 msgid "(for example: `kernel-3764.json`, or simply `3764`)"
 msgstr "(por ejemplo: `kernel-3764.json`, o simplemente `3764`)"
 
-#: spyderlib\plugins\ipythonconsole.py:856
-#: spyderlib\plugins\ipythonconsole.py:896
+#: spyderlib\plugins\ipythonconsole.py:893
+#: spyderlib\plugins\ipythonconsole.py:933
 msgid "IPython"
 msgstr "IPython"
 
-#: spyderlib\plugins\ipythonconsole.py:857
+#: spyderlib\plugins\ipythonconsole.py:894
 msgid "Provide an IPython kernel connection file:"
 msgstr "Provea un archivo de conexión para un núcleo de IPython"
 
-#: spyderlib\plugins\ipythonconsole.py:897
+#: spyderlib\plugins\ipythonconsole.py:934
 msgid "Unable to connect to IPython kernel <b>`%s`"
 msgstr "No se pudo establecer conexión con el núcleo <b>`%s`"
 
-#: spyderlib\plugins\ipythonconsole.py:1091
+#: spyderlib\plugins\ipythonconsole.py:1138
 msgid ""
 "%s will be closed.\n"
 "Do you want to kill the associated kernel and all of its clients?"
@@ -2220,11 +2257,11 @@ msgstr ""
 "La %s será cerrada.\n"
 "Desea cerrar el núcleo asociado y todos sus clientes?"
 
-#: spyderlib\plugins\ipythonconsole.py:1137
+#: spyderlib\plugins\ipythonconsole.py:1184
 msgid "Are you sure you want to restart the kernel?"
 msgstr "Está seguro de que desea reiniciar el núcleo?"
 
-#: spyderlib\plugins\ipythonconsole.py:1139
+#: spyderlib\plugins\ipythonconsole.py:1186
 msgid "Restart kernel?"
 msgstr "Reiniciar el núcleo?"
 
@@ -2238,14 +2275,14 @@ msgstr "Ayuda en línea"
 msgid "Outline"
 msgstr "Explorador de código"
 
-#: spyderlib\plugins\projectexplorer.py:41
-#: spyderlib\widgets\projectexplorer.py:1106
-#: spyderlib\widgets\projectexplorer.py:1120
+#: spyderlib\plugins\projectexplorer.py:42
+#: spyderlib\widgets\projectexplorer.py:1133
+#: spyderlib\widgets\projectexplorer.py:1147
 msgid "Project explorer"
 msgstr "Explorador de proyectos"
 
-#: spyderlib\plugins\projectexplorer.py:52
-#: spyderlib\widgets\projectexplorer.py:537
+#: spyderlib\plugins\projectexplorer.py:53
+#: spyderlib\widgets\projectexplorer.py:544
 msgid "New project..."
 msgstr "Nuevo proyecto..."
 
@@ -2326,7 +2363,7 @@ msgstr ""
 "modificarse usando el diálogo <b>%s</b> (ver el menú <b>%s</b>)"
 
 #: spyderlib\plugins\runconfig.py:458
-#: spyderlib\widgets\externalshell\pythonshell.py:292
+#: spyderlib\widgets\externalshell\pythonshell.py:295
 msgid "Working directory"
 msgstr "Directorio de trabajo"
 
@@ -2508,11 +2545,6 @@ msgstr "El directorio en  el que se encuentra el archivo actual"
 msgid "the global working directory"
 msgstr "El directorio de trabajo global"
 
-#: spyderlib\plugins\workingdirectory.py:81 spyderlib\widgets\explorer.py:611
-#: spyderlib\widgets\explorer.py:618
-msgid "New file"
-msgstr "Nuevos archivos"
-
 #: spyderlib\plugins\workingdirectory.py:82
 msgid "Files are created in:"
 msgstr "Los archivos son creados en:"
@@ -2556,9 +2588,7 @@ msgstr ""
 
 #: spyderlib\plugins\workingdirectory.py:214
 msgid "Browse a working directory"
-msgstr ""
-"Seleccionar un directorio\n"
-"de trabajo"
+msgstr "Seleccionar un directorio de trabajo"
 
 #: spyderlib\plugins\workingdirectory.py:220
 msgid "Set as current console's working directory"
@@ -2572,149 +2602,153 @@ msgstr "Moverse al directorio superior"
 msgid "Global working directory"
 msgstr "Directorio de trabajo global"
 
-#: spyderlib\spyder.py:238
+#: spyderlib\spyder.py:36
+msgid "IPython Console integration"
+msgstr "Integración con la terminal de IPython"
+
+#: spyderlib\spyder.py:242
 msgid "PyQt4 Reference Guide"
 msgstr "Manual de referencia de PyQt4"
 
-#: spyderlib\spyder.py:241
+#: spyderlib\spyder.py:245
 msgid "PyQt4 API Reference"
 msgstr "Referencia del API de PyQt4"
 
-#: spyderlib\spyder.py:243
+#: spyderlib\spyder.py:247
 msgid "Python(x,y)"
 msgstr "Python(x,y)"
 
-#: spyderlib\spyder.py:245
+#: spyderlib\spyder.py:249
 msgid "WinPython"
 msgstr "WinPython"
 
-#: spyderlib\spyder.py:247
+#: spyderlib\spyder.py:251
 msgid "Numpy and Scipy documentation"
 msgstr "Documentación de Numpy y Scipy"
 
-#: spyderlib\spyder.py:250 spyderlib\spyder.py:900
+#: spyderlib\spyder.py:254 spyderlib\spyder.py:915
 msgid "Matplotlib documentation"
 msgstr "Documentación de Matplotlib"
 
-#: spyderlib\spyder.py:284
+#: spyderlib\spyder.py:288
 msgid "Reload last session"
 msgstr "Recargar la última sesión"
 
-#: spyderlib\spyder.py:288
+#: spyderlib\spyder.py:292
 msgid "Load session..."
 msgstr "Cargar sesión..."
 
-#: spyderlib\spyder.py:291
+#: spyderlib\spyder.py:295
 msgid "Load Spyder session"
 msgstr "Cargar sesión de Spyder"
 
-#: spyderlib\spyder.py:293
+#: spyderlib\spyder.py:297
 msgid "Save session and quit..."
 msgstr "Guardar sesión y salir..."
 
-#: spyderlib\spyder.py:296
+#: spyderlib\spyder.py:300
 msgid "Save current session and quit application"
 msgstr "Guardar sesión actual y salir de la aplicación"
 
-#: spyderlib\spyder.py:403
+#: spyderlib\spyder.py:409
 msgid "Initializing..."
 msgstr "Inicializando..."
 
-#: spyderlib\spyder.py:464
+#: spyderlib\spyder.py:470
 msgid "Close current dockwidget"
 msgstr "Cerrar el componente actual"
 
-#: spyderlib\spyder.py:470
+#: spyderlib\spyder.py:476
 msgid "&Find text"
 msgstr "&Buscar texto"
 
-#: spyderlib\spyder.py:476
+#: spyderlib\spyder.py:482
 msgid "Find &next"
 msgstr "Buscar &siguiente"
 
-#: spyderlib\spyder.py:482
+#: spyderlib\spyder.py:488
 msgid "Find &previous"
 msgstr "Buscar &anterior"
 
-#: spyderlib\spyder.py:487
+#: spyderlib\spyder.py:493
 msgid "&Replace text"
 msgstr "&Reemplazar texto"
 
-#: spyderlib\spyder.py:502 spyderlib\widgets\sourcecode\codeeditor.py:2180
+#: spyderlib\spyder.py:508 spyderlib\widgets\sourcecode\codeeditor.py:2192
 msgid "Undo"
 msgstr "Deshacer"
 
-#: spyderlib\spyder.py:504 spyderlib\widgets\sourcecode\codeeditor.py:2183
+#: spyderlib\spyder.py:510 spyderlib\widgets\sourcecode\codeeditor.py:2195
 msgid "Redo"
 msgstr "Rehacer"
 
-#: spyderlib\spyder.py:505 spyderlib\widgets\arrayeditor.py:325
+#: spyderlib\spyder.py:511 spyderlib\widgets\arrayeditor.py:325
 #: spyderlib\widgets\dicteditor.py:562 spyderlib\widgets\shell.py:118
-#: spyderlib\widgets\sourcecode\codeeditor.py:2189
+#: spyderlib\widgets\sourcecode\codeeditor.py:2201
 msgid "Copy"
 msgstr "Copiar"
 
-#: spyderlib\spyder.py:507 spyderlib\widgets\shell.py:114
-#: spyderlib\widgets\sourcecode\codeeditor.py:2186
+#: spyderlib\spyder.py:513 spyderlib\widgets\shell.py:114
+#: spyderlib\widgets\sourcecode\codeeditor.py:2198
 msgid "Cut"
 msgstr "Cortar"
 
-#: spyderlib\spyder.py:508 spyderlib\widgets\dicteditor.py:559
+#: spyderlib\spyder.py:514 spyderlib\widgets\dicteditor.py:559
 #: spyderlib\widgets\shell.py:122
-#: spyderlib\widgets\sourcecode\codeeditor.py:2192
+#: spyderlib\widgets\sourcecode\codeeditor.py:2204
 msgid "Paste"
 msgstr "Pegar"
 
-#: spyderlib\spyder.py:510 spyderlib\widgets\explorer.py:452
-#: spyderlib\widgets\projectexplorer.py:973 spyderlib\widgets\shell.py:131
-#: spyderlib\widgets\sourcecode\codeeditor.py:2195
+#: spyderlib\spyder.py:516 spyderlib\widgets\explorer.py:452
+#: spyderlib\widgets\projectexplorer.py:1000 spyderlib\widgets\shell.py:131
+#: spyderlib\widgets\sourcecode\codeeditor.py:2207
 msgid "Delete"
 msgstr "Eliminar"
 
-#: spyderlib\spyder.py:513 spyderlib\widgets\shell.py:135
-#: spyderlib\widgets\sourcecode\codeeditor.py:2199
+#: spyderlib\spyder.py:519 spyderlib\widgets\shell.py:135
+#: spyderlib\widgets\sourcecode\codeeditor.py:2211
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: spyderlib\spyder.py:560
+#: spyderlib\spyder.py:567
 msgid "&Interpreters"
 msgstr "&Intérpretes"
 
-#: spyderlib\spyder.py:566
+#: spyderlib\spyder.py:573
 msgid "&View"
 msgstr "&Ver"
 
-#: spyderlib\spyder.py:574
+#: spyderlib\spyder.py:581
 msgid "Welcome to Spyder!"
 msgstr "Bienvenido a Spyder!"
 
-#: spyderlib\spyder.py:578
+#: spyderlib\spyder.py:585
 msgid "Pre&ferences"
 msgstr "Pre&ferencias"
 
-#: spyderlib\spyder.py:584 spyderlib\widgets\pathmanager.py:44
-#: spyderlib\widgets\projectexplorer.py:586
+#: spyderlib\spyder.py:593 spyderlib\widgets\pathmanager.py:44
+#: spyderlib\widgets\projectexplorer.py:593
 msgid "PYTHONPATH manager"
 msgstr "Administrador del PYTHONPATH"
 
-#: spyderlib\spyder.py:587
-msgid "Open Spyder path manager"
-msgstr "Abrir el administrador de rutas de Spyder"
+#: spyderlib\spyder.py:596
+msgid "Python Path Manager"
+msgstr "Manejador de rutas de Python"
 
-#: spyderlib\spyder.py:590
+#: spyderlib\spyder.py:599
 msgid "Update module names list"
 msgstr "Actualizar la lista de nombres de módulos"
 
-#: spyderlib\spyder.py:593
+#: spyderlib\spyder.py:602
 msgid "Refresh list of module names available in PYTHONPATH"
 msgstr ""
 "Actualiza la lista de nombres de los módulos disponibles en su PYTHONPATH"
 
-#: spyderlib\spyder.py:599
+#: spyderlib\spyder.py:608
 msgid "Current user environment variables..."
 msgstr "Variables de entorno del usuario actual..."
 
-#: spyderlib\spyder.py:601
+#: spyderlib\spyder.py:610
 msgid ""
 "Show and edit current user environment variables in Windows registry (i.e. "
 "for all sessions)"
@@ -2724,179 +2758,183 @@ msgstr ""
 "registro de Windows (es decir,\n"
 "para todas las sesiones)"
 
-#: spyderlib\spyder.py:608 spyderlib\spyder.py:975
+#: spyderlib\spyder.py:617 spyderlib\spyder.py:990
 msgid "External Tools"
 msgstr "Herramientas externas"
 
-#: spyderlib\spyder.py:612
+#: spyderlib\spyder.py:621
 msgid "Python(x,y) launcher"
 msgstr "Lanzador de Python(x,y)"
 
-#: spyderlib\spyder.py:623
+#: spyderlib\spyder.py:632
 msgid "WinPython control panel"
 msgstr "Panel de control de WinPython"
 
-#: spyderlib\spyder.py:636
+#: spyderlib\spyder.py:645
 msgid "Qt Designer"
 msgstr "Diseñador de interfaces de Qt"
 
-#: spyderlib\spyder.py:641
+#: spyderlib\spyder.py:650
 msgid "Qt Linguist"
 msgstr "Traductor de aplicaciones de Qt"
 
-#: spyderlib\spyder.py:647
+#: spyderlib\spyder.py:656
 msgid "Qt examples"
 msgstr "Ejemplos de Qt"
 
-#: spyderlib\spyder.py:663
+#: spyderlib\spyder.py:672
 msgid "guidata examples"
 msgstr "Ejemplos de guidata"
 
-#: spyderlib\spyder.py:671
+#: spyderlib\spyder.py:680
 msgid "guiqwt examples"
 msgstr "Ejemplos de guiqwt"
 
-#: spyderlib\spyder.py:676
+#: spyderlib\spyder.py:685
 msgid "Sift"
 msgstr "Sift"
 
-#: spyderlib\spyder.py:684
+#: spyderlib\spyder.py:693
 msgid "ViTables"
 msgstr "ViTables"
 
-#: spyderlib\spyder.py:698
+#: spyderlib\spyder.py:707
 msgid "Fullscreen mode"
 msgstr "Modo a pantalla completa"
 
-#: spyderlib\spyder.py:708
+#: spyderlib\spyder.py:719
 msgid "Main toolbar"
 msgstr "Barra principal"
 
-#: spyderlib\spyder.py:725
+#: spyderlib\spyder.py:736
 msgid "Loading object inspector..."
 msgstr "Cargando el inspector de objetos..."
 
-#: spyderlib\spyder.py:731
+#: spyderlib\spyder.py:742
 msgid "Loading outline explorer..."
 msgstr "Cargando el explorador de código..."
 
-#: spyderlib\spyder.py:738
+#: spyderlib\spyder.py:749
 msgid "Loading editor..."
 msgstr "Cargando el editor..."
 
-#: spyderlib\spyder.py:760
+#: spyderlib\spyder.py:771
 msgid "Loading file explorer..."
 msgstr "Cargando el explorador de archivos..."
 
-#: spyderlib\spyder.py:766
+#: spyderlib\spyder.py:777
 msgid "Loading history plugin..."
 msgstr "Cargando el historial..."
 
-#: spyderlib\spyder.py:772
+#: spyderlib\spyder.py:783
 msgid "Loading online help..."
 msgstr "Cargando la ayuda en línea..."
 
-#: spyderlib\spyder.py:778
+#: spyderlib\spyder.py:789
 msgid "Loading project explorer..."
 msgstr "Cargando el explorador de proyectos..."
 
-#: spyderlib\spyder.py:788
+#: spyderlib\spyder.py:799
 msgid "Loading external console..."
 msgstr "Cargando la terminal externa..."
 
-#: spyderlib\spyder.py:796
+#: spyderlib\spyder.py:807
 msgid "Loading namespace browser..."
 msgstr "Cargando el explorador de variables..."
 
-#: spyderlib\spyder.py:805
+#: spyderlib\spyder.py:816
 msgid "Loading IPython console..."
 msgstr "Cargando la terminal de IPython..."
 
-#: spyderlib\spyder.py:816
+#: spyderlib\spyder.py:827
 msgid "Setting up main window..."
 msgstr "Construyendo la ventana principal..."
 
-#: spyderlib\spyder.py:820
+#: spyderlib\spyder.py:831
 msgid "About %s..."
 msgstr "Acerca de %s..."
 
-#: spyderlib\spyder.py:824
+#: spyderlib\spyder.py:834
+msgid "Optional dependencies..."
+msgstr "Dependencias opcionales..."
+
+#: spyderlib\spyder.py:838
 msgid "Report issue..."
 msgstr "Reportar un problema..."
 
-#: spyderlib\spyder.py:845
+#: spyderlib\spyder.py:859
 msgid "Spyder documentation"
 msgstr "Documentación de Spyder"
 
-#: spyderlib\spyder.py:850
+#: spyderlib\spyder.py:865
 msgid "Python documentation"
 msgstr "Documentación de Python"
 
-#: spyderlib\spyder.py:856
+#: spyderlib\spyder.py:871
 msgid "Qt Assistant"
 msgstr "Documentación de Qt"
 
-#: spyderlib\spyder.py:890
+#: spyderlib\spyder.py:905
 msgid "Python(x,y) documentation folder"
 msgstr "Carpeta de documentación de Python(x,y)"
 
-#: spyderlib\spyder.py:892
+#: spyderlib\spyder.py:907
 msgid "IPython documentation"
 msgstr "Documentación de IPython"
 
-#: spyderlib\spyder.py:894
+#: spyderlib\spyder.py:909
 msgid "guidata documentation"
 msgstr "Documentación de guidata"
 
-#: spyderlib\spyder.py:897
+#: spyderlib\spyder.py:912
 msgid "guiqwt documentation"
 msgstr "Documentación de guiqwt"
 
-#: spyderlib\spyder.py:903
+#: spyderlib\spyder.py:918
 msgid "NumPy documentation"
 msgstr "Documentación de NumPy"
 
-#: spyderlib\spyder.py:905
+#: spyderlib\spyder.py:920
 msgid "NumPy reference guide"
 msgstr "Manual de referencia de NumPy"
 
-#: spyderlib\spyder.py:907
+#: spyderlib\spyder.py:922
 msgid "NumPy user guide"
 msgstr "Guía del usuario de Numpy"
 
-#: spyderlib\spyder.py:909
+#: spyderlib\spyder.py:924
 msgid "SciPy documentation"
 msgstr "Documentación de SciPy"
 
-#: spyderlib\spyder.py:916
+#: spyderlib\spyder.py:931
 msgid "Web Resources"
 msgstr "Recursos en la Web"
 
-#: spyderlib\spyder.py:937
+#: spyderlib\spyder.py:952
 msgid "Windows and toolbars"
 msgstr "Componentes y barras de herramientas"
 
-#: spyderlib\spyder.py:941
+#: spyderlib\spyder.py:956
 msgid "Reset window layout"
 msgstr "Restablecer la disposición de componentes"
 
-#: spyderlib\spyder.py:943
+#: spyderlib\spyder.py:958
 msgid "Custom window layouts"
 msgstr "Disposiciones personalizadas de componentes"
 
-#: spyderlib\spyder.py:949
+#: spyderlib\spyder.py:964
 msgid "Switch to/from layout %d"
 msgstr "Cambiarse a la disposición %d"
 
-#: spyderlib\spyder.py:955
+#: spyderlib\spyder.py:970
 msgid "Set layout %d"
 msgstr "Establecer la disposición %d"
 
-#: spyderlib\spyder.py:965
+#: spyderlib\spyder.py:980
 msgid "Attached console window (debugging)"
 msgstr "Ventana de terminal anexa (para depuración)"
 
-#: spyderlib\spyder.py:1222
+#: spyderlib\spyder.py:1239
 msgid ""
 "Window layout will be reset to default settings: this affects window "
 "position, size and dockwidgets.\n"
@@ -2906,59 +2944,56 @@ msgstr ""
 "Esto afecta a la posición y tamaño de la ventana y los componentes.\n"
 "¿Desea continuar?"
 
-#: spyderlib\spyder.py:1240
+#: spyderlib\spyder.py:1257
 msgid "Quick switch layout #%d has not yet been defined."
 msgstr "Aún no se ha definido la disposición de componentes #%d"
 
-#: spyderlib\spyder.py:1431
+#: spyderlib\spyder.py:1448 spyderlib\spyder.py:1449
 msgid "Maximize current plugin"
 msgstr "Maximizar el componente actual"
 
-#: spyderlib\spyder.py:1432
-msgid "Maximize current plugin to fit the whole application window"
-msgstr ""
-"Maximizar el componente actual\n"
-"para que ocupe toda la ventana"
-
-#: spyderlib\spyder.py:1436
+#: spyderlib\spyder.py:1452
 msgid "Restore current plugin"
 msgstr "Restaurar el componente actual"
 
-#: spyderlib\spyder.py:1437
-msgid ""
-"Restore current plugin to its original size and position within the "
-"application window"
-msgstr ""
-"Restaurar el componente actual\n"
-"a su tamaño y posición originales\n"
-"dentro de la ventana principal"
+#: spyderlib\spyder.py:1453
+msgid "Restore plugin to its original size"
+msgstr "Restaurar el componente a su tamaño original"
 
-#: spyderlib\spyder.py:1509
+#: spyderlib\spyder.py:1524
 msgid "(not installed)"
 msgstr "(no está instalado)"
 
-#: spyderlib\spyder.py:1527
+#: spyderlib\spyder.py:1542
 msgid "About %s"
 msgstr "Acerca de %s"
 
-#: spyderlib\spyder.py:1679
+#: spyderlib\spyder.py:1703
 msgid "Running an external system terminal is not supported on platform %s."
 msgstr ""
 "Ejecutar en una terminal externa del sistema no está soportado en la "
 "plataforma %s."
 
-#: spyderlib\spyder.py:1865
+#: spyderlib\spyder.py:1900
 msgid "Open session"
 msgstr "Abrir sesión"
 
-#: spyderlib\spyder.py:1866 spyderlib\spyder.py:1877
+#: spyderlib\spyder.py:1901 spyderlib\spyder.py:1912
 msgid "Spyder sessions"
 msgstr "Sesiones de Spyder"
 
-#: spyderlib\spyder.py:1876
+#: spyderlib\spyder.py:1911
 msgid "Save session"
 msgstr "Guardar sesión"
 
+#: spyderlib\utils\codeanalysis.py:76
+msgid "Real-time code analysis on the Editor"
+msgstr "Análisis del código en tiempo real en el Editor"
+
+#: spyderlib\utils\codeanalysis.py:80
+msgid "Real-time code style analysis on the Editor"
+msgstr "Análisis de estilo del código en el Editor"
+
 #: spyderlib\utils\environ.py:96
 msgid ""
 "Module <b>pywin32 was not found</b>.<br>Please restart this Windows "
@@ -3071,7 +3106,7 @@ msgstr "Formato de punto flotante"
 
 #: spyderlib\widgets\arrayeditor.py:426 spyderlib\widgets\explorer.py:548
 #: spyderlib\widgets\explorer.py:645
-#: spyderlib\widgets\externalshell\pythonshell.py:521
+#: spyderlib\widgets\externalshell\pythonshell.py:520
 #: spyderlib\widgets\externalshell\systemshell.py:91
 msgid "Error"
 msgstr "Error"
@@ -3143,12 +3178,12 @@ msgstr ""
 "(y viceversa)."
 
 #: spyderlib\widgets\browser.py:29
-#: spyderlib\widgets\sourcecode\codeeditor.py:2217
+#: spyderlib\widgets\sourcecode\codeeditor.py:2227
 msgid "Zoom out"
 msgstr "Alejar"
 
 #: spyderlib\widgets\browser.py:32
-#: spyderlib\widgets\sourcecode\codeeditor.py:2214
+#: spyderlib\widgets\sourcecode\codeeditor.py:2224
 msgid "Zoom in"
 msgstr "Acercar"
 
@@ -3191,6 +3226,45 @@ msgstr ""
 "directorio correcta y después\n"
 "presione Enter para validarla"
 
+#: spyderlib\widgets\dependencies.py:60
+msgid " Required "
+msgstr "Requerida"
+
+#: spyderlib\widgets\dependencies.py:60
+msgid "Module"
+msgstr "Módulo"
+
+#: spyderlib\widgets\dependencies.py:61
+msgid " Installed "
+msgstr "Instalada"
+
+#: spyderlib\widgets\dependencies.py:61
+msgid "Provided features"
+msgstr "Características proporcionadas"
+
+#: spyderlib\widgets\dependencies.py:127
+msgid "Optional Dependencies"
+msgstr "Dependencias opcionales"
+
+#: spyderlib\widgets\dependencies.py:134
+msgid ""
+"Spyder depends on several Python modules to provide additional functionality "
+"for its plugins. The table below shows the required and installed versions "
+"(if any) of all of them.<br><br>Although Spyder can work without any of "
+"these modules, it's strongly recommended that at least you try to install <b>"
+"%s</b> and <b>%s</b> to have a much better experience."
+msgstr ""
+"Spyder depende de varios módulos de Python para proveer funcionalidad "
+"adicional para sus componentes. La tabla que aparece a continuación muestra "
+"las versiones requeridas e instaladas (de existir) de todos ellos."
+"<br><br>Aunque Spyder puede funcionar sin ninguno de estos módulos, se "
+"recomienda al menos instalar <b>%s</b> and <b>%s</b> para tener una mejor "
+"experiencia."
+
+#: spyderlib\widgets\dependencies.py:149
+msgid "Copy to clipboard"
+msgstr "Copiar al portapapeles"
+
 #: spyderlib\widgets\dicteditor.py:144
 msgid "Index"
 msgstr "Índice"
@@ -3341,84 +3415,84 @@ msgstr "Vaciar el portapapeles"
 msgid "Nothing to be imported from clipboard."
 msgstr "No hay nada para importar desde el portapapeles."
 
-#: spyderlib\widgets\editor.py:63 spyderlib\widgets\editor.py:546
+#: spyderlib\widgets\editor.py:66 spyderlib\widgets\editor.py:549
 msgid "File list management"
 msgstr "Gestión de la lista de archivos"
 
-#: spyderlib\widgets\editor.py:67
+#: spyderlib\widgets\editor.py:70
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: spyderlib\widgets\editor.py:72
+#: spyderlib\widgets\editor.py:75
 msgid "(press <b>Enter</b> to edit file)"
 msgstr "(Oprimir <b>Enter</b> para editar)"
 
-#: spyderlib\widgets\editor.py:87
+#: spyderlib\widgets\editor.py:90
 msgid "&Edit file"
 msgstr "Editar"
 
-#: spyderlib\widgets\editor.py:96
+#: spyderlib\widgets\editor.py:99
 msgid "&Close file"
 msgstr "Cerrar"
 
-#: spyderlib\widgets\editor.py:104
+#: spyderlib\widgets\editor.py:107
 msgid "Hint: press <b>Alt</b> to show accelerators"
 msgstr "Sugerencia: oprimir <b>Alt</b> para mostrar aceleradores"
 
-#: spyderlib\widgets\editor.py:549
+#: spyderlib\widgets\editor.py:552
 msgid "Copy path to clipboard"
 msgstr "Copiar la ruta al portapapeles"
 
-#: spyderlib\widgets\editor.py:1087
+#: spyderlib\widgets\editor.py:1090
 msgid "Temporary file"
 msgstr "Archivo temporal"
 
-#: spyderlib\widgets\editor.py:1184
+#: spyderlib\widgets\editor.py:1187
 msgid "New window"
 msgstr "Nueva ventana"
 
-#: spyderlib\widgets\editor.py:1185
+#: spyderlib\widgets\editor.py:1188
 msgid "Create a new editor window"
 msgstr "Crear una nueva ventana de edición"
 
-#: spyderlib\widgets\editor.py:1188
+#: spyderlib\widgets\editor.py:1191
 msgid "Split vertically"
 msgstr "Dividir verticalmente"
 
-#: spyderlib\widgets\editor.py:1190
+#: spyderlib\widgets\editor.py:1193
 msgid "Split vertically this editor window"
 msgstr "Dividir verticalmente esta panel o ventana de edición"
 
-#: spyderlib\widgets\editor.py:1192
+#: spyderlib\widgets\editor.py:1195
 msgid "Split horizontally"
 msgstr "Dividir horizontalmente"
 
-#: spyderlib\widgets\editor.py:1194
+#: spyderlib\widgets\editor.py:1197
 msgid "Split horizontally this editor window"
 msgstr "Dividir horizontalmente esta ventana o panel de edición"
 
-#: spyderlib\widgets\editor.py:1196
+#: spyderlib\widgets\editor.py:1199
 msgid "Close this panel"
 msgstr "Cerrar este panel"
 
-#: spyderlib\widgets\editor.py:1328
+#: spyderlib\widgets\editor.py:1331
 msgid "<b>%s</b> has been modified.<br>Do you want to save changes?"
 msgstr "<b>%s</b> ha sido modificado.<br>¿Desea guardar los cambios?"
 
-#: spyderlib\widgets\editor.py:1391
+#: spyderlib\widgets\editor.py:1394
 msgid "Save"
 msgstr "Guardar"
 
-#: spyderlib\widgets\editor.py:1392
+#: spyderlib\widgets\editor.py:1395
 msgid "<b>Unable to save script '%s'</b><br><br>Error message:<br>%s"
 msgstr ""
 "<b>No fue posible guardar el archivo '%s'</b><br><br>Mensaje de error:<br>%s"
 
-#: spyderlib\widgets\editor.py:1414
+#: spyderlib\widgets\editor.py:1417
 msgid "Save Python script"
 msgstr "Guardar archivo de Python"
 
-#: spyderlib\widgets\editor.py:1635
+#: spyderlib\widgets\editor.py:1638
 msgid ""
 "<b>%s</b> is unavailable (this file may have been removed, moved or renamed "
 "outside Spyder).<br>Do you want to close it?"
@@ -3426,7 +3500,7 @@ msgstr ""
 "<b>%s</b> no está disponible (el archivo puede haber sido eliminado, movido "
 "o renombrado por fuera de Spyder).<br>¿Desea cerrarlo?"
 
-#: spyderlib\widgets\editor.py:1655
+#: spyderlib\widgets\editor.py:1658
 msgid ""
 "<b>%s</b> has been modified outside Spyder.<br>Do you want to reload it and "
 "loose all your changes?"
@@ -3434,7 +3508,7 @@ msgstr ""
 "<b>%s</b> fue modificado por fuera de Spyder.<br>¿Desea recargarlo y perder "
 "todos sus cambios?"
 
-#: spyderlib\widgets\editor.py:1743
+#: spyderlib\widgets\editor.py:1754
 msgid ""
 "All changes to <b>%s</b> will be lost.<br>Do you want to revert file from "
 "disk?"
@@ -3442,11 +3516,11 @@ msgstr ""
 "Todos los cambios a <b>%s</b> se perderán.<br>Desea revertir el archivo del "
 "disco?"
 
-#: spyderlib\widgets\editor.py:1880
+#: spyderlib\widgets\editor.py:1893
 msgid "Loading %s..."
 msgstr "Cargando %s..."
 
-#: spyderlib\widgets\editor.py:1890
+#: spyderlib\widgets\editor.py:1903
 msgid ""
 "<b>%s</b> contains mixed end-of-line characters.<br>Spyder will fix this "
 "automatically."
@@ -3454,11 +3528,11 @@ msgstr ""
 "<b>%s</b> contiene varios tipos de caracteres de fin de línea.<br>Spyder lo "
 "arreglará automáticamente."
 
-#: spyderlib\widgets\editor.py:2228
+#: spyderlib\widgets\editor.py:2250
 msgid "Close window"
 msgstr "Cerrar ventana"
 
-#: spyderlib\widgets\editor.py:2230
+#: spyderlib\widgets\editor.py:2252
 msgid "Close this window"
 msgstr "Cierra esta ventana"
 
@@ -3574,15 +3648,15 @@ msgstr "¿Realmente desea eliminar <b>%s</b>?"
 msgid "delete"
 msgstr "eliminar"
 
-#: spyderlib\widgets\explorer.py:474 spyderlib\widgets\projectexplorer.py:786
-#: spyderlib\widgets\projectexplorer.py:793
-#: spyderlib\widgets\projectexplorer.py:1059
-#: spyderlib\widgets\projectexplorer.py:1142
+#: spyderlib\widgets\explorer.py:474 spyderlib\widgets\projectexplorer.py:813
+#: spyderlib\widgets\projectexplorer.py:820
+#: spyderlib\widgets\projectexplorer.py:1086
+#: spyderlib\widgets\projectexplorer.py:1169
 msgid "Project Explorer"
 msgstr "Explorador de proyectos"
 
-#: spyderlib\widgets\explorer.py:475 spyderlib\widgets\projectexplorer.py:734
-#: spyderlib\widgets\projectexplorer.py:1143
+#: spyderlib\widgets\explorer.py:475 spyderlib\widgets\projectexplorer.py:761
+#: spyderlib\widgets\projectexplorer.py:1170
 msgid "<b>Unable to %s <i>%s</i></b><br><br>Error message:<br>%s"
 msgstr "<b>No fue posible %s <i>%s</i></b><br><br>Mensaje de error:<br>%s"
 
@@ -3683,7 +3757,7 @@ msgid "Terminated."
 msgstr "Terminado."
 
 #: spyderlib\widgets\externalshell\baseshell.py:234
-#: spyderlib\widgets\mixins.py:552
+#: spyderlib\widgets\mixins.py:509
 msgid "Arguments"
 msgstr "Argumentos"
 
@@ -3767,21 +3841,21 @@ msgstr ""
 "<b>No fue posible guardar el espacio de trabajo actual</b><br><br>Mensaje de "
 "error:<br>%s"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:265
+#: spyderlib\widgets\externalshell\pythonshell.py:268
 msgid "Variables"
 msgstr "Variables"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:266
+#: spyderlib\widgets\externalshell\pythonshell.py:269
 msgid "Show/hide global variables explorer"
 msgstr ""
 "Mostrar u ocultar el\n"
 "explorador de variables"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:270
+#: spyderlib\widgets\externalshell\pythonshell.py:273
 msgid "Terminate"
 msgstr "Interrumpir"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:271
+#: spyderlib\widgets\externalshell\pythonshell.py:274
 msgid ""
 "Attempts to terminate the process.\n"
 "The process may not exit as a result of clicking this button\n"
@@ -3792,40 +3866,40 @@ msgstr ""
 "(pues es posible que se le pida al usuario\n"
 "guardar archivos sin salvar, etc)."
 
-#: spyderlib\widgets\externalshell\pythonshell.py:283
+#: spyderlib\widgets\externalshell\pythonshell.py:286
 msgid "Interact"
 msgstr "Interactuar"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:285
+#: spyderlib\widgets\externalshell\pythonshell.py:288
 msgid "Debug"
 msgstr "Depurar"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:287
-#: spyderlib\widgets\externalshell\pythonshell.py:350
+#: spyderlib\widgets\externalshell\pythonshell.py:290
+#: spyderlib\widgets\externalshell\pythonshell.py:353
 msgid "Arguments..."
 msgstr "Argumentos..."
 
-#: spyderlib\widgets\externalshell\pythonshell.py:294
+#: spyderlib\widgets\externalshell\pythonshell.py:297
 msgid "Set current working directory"
 msgstr "Establece el directorio de trabajo"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:296
+#: spyderlib\widgets\externalshell\pythonshell.py:299
 msgid "Environment variables"
 msgstr "Variables de entorno"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:300
+#: spyderlib\widgets\externalshell\pythonshell.py:303
 msgid "Show sys.path contents"
 msgstr "Contenidos del sys.path"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:346
+#: spyderlib\widgets\externalshell\pythonshell.py:349
 msgid "Arguments: %s"
 msgstr "Argumentos: %s"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:348
+#: spyderlib\widgets\externalshell\pythonshell.py:351
 msgid "No argument"
 msgstr "Sin argumentos"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:522
+#: spyderlib\widgets\externalshell\pythonshell.py:521
 #: spyderlib\widgets\externalshell\systemshell.py:92
 msgid "Process failed to start"
 msgstr "El proceso falló al empezar"
@@ -4119,7 +4193,7 @@ msgstr "Ayuda de Python:"
 msgid "GUI-based editor:"
 msgstr "Editor gráfico:"
 
-#: spyderlib\widgets\mixins.py:557
+#: spyderlib\widgets\mixins.py:514
 msgid "Documentation"
 msgstr "Documentación"
 
@@ -4210,63 +4284,67 @@ msgstr ""
 "Este directorio ya está incluido en la lista de rutas de Spyder.<br>¿Desea "
 "moverlo al principio de la lista?"
 
-#: spyderlib\widgets\projectexplorer.py:331
+#: spyderlib\widgets\projectexplorer.py:332
 msgid "its own configuration file"
 msgstr "su propio archivo de configuración"
 
-#: spyderlib\widgets\projectexplorer.py:337
+#: spyderlib\widgets\projectexplorer.py:338
 msgid "the following projects:<br>%s"
 msgstr "los siguientes proyectos:<br>%s"
 
-#: spyderlib\widgets\projectexplorer.py:533
+#: spyderlib\widgets\projectexplorer.py:540
 msgid "Project..."
 msgstr "Proyecto..."
 
-#: spyderlib\widgets\projectexplorer.py:546
+#: spyderlib\widgets\projectexplorer.py:553
 msgid "Existing directory"
 msgstr "Un directorio existente"
 
-#: spyderlib\widgets\projectexplorer.py:550
+#: spyderlib\widgets\projectexplorer.py:557
 msgid "Existing Spyder project"
 msgstr "Un proyecto de Spyder existente"
 
-#: spyderlib\widgets\projectexplorer.py:554
+#: spyderlib\widgets\projectexplorer.py:561
 msgid "Existing Pydev project"
 msgstr "Un proyecto de Pydev existente"
 
-#: spyderlib\widgets\projectexplorer.py:571
+#: spyderlib\widgets\projectexplorer.py:578
 msgid "Open project"
 msgstr "Abrir proyecto"
 
-#: spyderlib\widgets\projectexplorer.py:576
+#: spyderlib\widgets\projectexplorer.py:583
 msgid "Close project"
 msgstr "Cerrar proyecto"
 
-#: spyderlib\widgets\projectexplorer.py:581
+#: spyderlib\widgets\projectexplorer.py:588
 msgid "Close unrelated projects"
 msgstr "Cerrar proyectos no relacionados"
 
-#: spyderlib\widgets\projectexplorer.py:590
+#: spyderlib\widgets\projectexplorer.py:597
 msgid "Edit related projects"
 msgstr "Editar proyectos relacionados"
 
-#: spyderlib\widgets\projectexplorer.py:598
+#: spyderlib\widgets\projectexplorer.py:605
 msgid "Add to PYTHONPATH"
 msgstr "Añadir al PYTHONPATH"
 
-#: spyderlib\widgets\projectexplorer.py:603
+#: spyderlib\widgets\projectexplorer.py:610
 msgid "Remove from PYTHONPATH"
 msgstr "Eliminar del PYTHONPATH"
 
-#: spyderlib\widgets\projectexplorer.py:608
+#: spyderlib\widgets\projectexplorer.py:615
 msgid "Properties"
 msgstr "Propiedades"
 
-#: spyderlib\widgets\projectexplorer.py:656
+#: spyderlib\widgets\projectexplorer.py:650
+msgid "Show horizontal scrollbar"
+msgstr "Mostrar una barra de desplazamiento horizontal"
+
+#: spyderlib\widgets\projectexplorer.py:683
 msgid "Workspace"
 msgstr "Espacio de trabajo"
 
-#: spyderlib\widgets\projectexplorer.py:657
+#: spyderlib\widgets\projectexplorer.py:684
 msgid ""
 "The workspace was unable to load or save %s<br><br>Please check if you have "
 "the permission to write the associated configuration files."
@@ -4275,11 +4353,11 @@ msgstr ""
 "verifique si cuenta con los permisos necesarios para escribir los archivos "
 "de configuración del proyecto al disco."
 
-#: spyderlib\widgets\projectexplorer.py:716
+#: spyderlib\widgets\projectexplorer.py:743
 msgid "Import directory"
 msgstr "Importar directorio"
 
-#: spyderlib\widgets\projectexplorer.py:718
+#: spyderlib\widgets\projectexplorer.py:745
 msgid ""
 "The following directory is not in workspace:<br><b>%s</b><br><br>Do you want "
 "to continue (and copy the directory to workspace)?"
@@ -4287,16 +4365,16 @@ msgstr ""
 "El siguiente directorio no está en el espacio de trabajo:<br><b>%s</"
 "b><br><br>¿Desea continuar (y copiar el directorio al espacio de trabajo)?"
 
-#: spyderlib\widgets\projectexplorer.py:736
-#: spyderlib\widgets\projectexplorer.py:1139
+#: spyderlib\widgets\projectexplorer.py:763
+#: spyderlib\widgets\projectexplorer.py:1166
 msgid "copy"
 msgstr "copiar"
 
-#: spyderlib\widgets\projectexplorer.py:787
+#: spyderlib\widgets\projectexplorer.py:814
 msgid "The project <b>%s</b> is already opened!"
 msgstr "El proyecto <b>%s</b> ya está abierto!"
 
-#: spyderlib\widgets\projectexplorer.py:794
+#: spyderlib\widgets\projectexplorer.py:821
 msgid ""
 "The project root path directory is inside the workspace but not as the "
 "expected tree level. It is not a directory of the workspace:<br><b>%s</b>"
@@ -4305,15 +4383,15 @@ msgstr ""
 "no al nivel esperado de profundidad, pues no es un directorio sino un "
 "subdirectorio del espacio de trabajo:<br><b>%s</b>"
 
-#: spyderlib\widgets\projectexplorer.py:805
+#: spyderlib\widgets\projectexplorer.py:832
 msgid "Project name:"
 msgstr "Nombre del proyecto:"
 
-#: spyderlib\widgets\projectexplorer.py:814
+#: spyderlib\widgets\projectexplorer.py:841
 msgid "A project named <b>%s</b> already exists"
 msgstr "Un proyecto llamado <b>%s</b> ya existe"
 
-#: spyderlib\widgets\projectexplorer.py:819
+#: spyderlib\widgets\projectexplorer.py:846
 msgid ""
 "Invalid project name.<br><br>Name must match the following regular "
 "expression:<br><b>%s</b>"
@@ -4321,18 +4399,18 @@ msgstr ""
 "Nombre de proyecto inválido.<br><br>El nombre debe ajustarse a una expresión "
 "del tipo:<br><b>%s</b>"
 
-#: spyderlib\widgets\projectexplorer.py:826
+#: spyderlib\widgets\projectexplorer.py:853
 msgid ""
 "The following directory is not empty:<br><b>%s</b><br><br>Do you want to "
 "continue?"
 msgstr ""
 "El siguiente directorio no está vacío:<br><b>%s</b><br><br>¿Desear continuar?"
 
-#: spyderlib\widgets\projectexplorer.py:838
+#: spyderlib\widgets\projectexplorer.py:865
 msgid "New project"
 msgstr "Nuevo proyecto"
 
-#: spyderlib\widgets\projectexplorer.py:846
+#: spyderlib\widgets\projectexplorer.py:873
 msgid ""
 "The current workspace has not been configured yet.\n"
 "Do you want to do this now?"
@@ -4340,30 +4418,30 @@ msgstr ""
 "El siguiente espacio de trabajo no ha sido configurado.\n"
 "¿Desea hacerlo ahora?"
 
-#: spyderlib\widgets\projectexplorer.py:883
+#: spyderlib\widgets\projectexplorer.py:910
 msgid "Import existing project"
 msgstr "Importar proyecto existente"
 
-#: spyderlib\widgets\projectexplorer.py:896
+#: spyderlib\widgets\projectexplorer.py:923
 msgid "Select projects to import"
 msgstr "Seleccionar proyectos a importar"
 
-#: spyderlib\widgets\projectexplorer.py:908
+#: spyderlib\widgets\projectexplorer.py:935
 msgid "The folder <i>%s</i> does not contain a valid %s project"
 msgstr "La carpeta <i>%s</i> no contiene un proyecto de %s válido"
 
-#: spyderlib\widgets\projectexplorer.py:936
+#: spyderlib\widgets\projectexplorer.py:963
 msgid "Import existing Pydev project"
 msgstr "Importar un proyecto existente de Pydev"
 
-#: spyderlib\widgets\projectexplorer.py:937
+#: spyderlib\widgets\projectexplorer.py:964
 msgid ""
 "<b>Unable to read Pydev project <i>%s</i></b><br><br>Error message:<br>%s"
 msgstr ""
 "<b>No fue posible cargar el proyecto de Pydev <i>%s</i></b><br><br>Mensaje "
 "de error:<br>%s"
 
-#: spyderlib\widgets\projectexplorer.py:974
+#: spyderlib\widgets\projectexplorer.py:1001
 msgid ""
 "Do you really want to delete project <b>%s</b>?<br><br>Note: project files "
 "won't be deleted from disk."
@@ -4371,15 +4449,15 @@ msgstr ""
 "¿Realmente desea eliminar el proyecto <b>%s</b>?<br><br>Nota: Los archivos "
 "del proyecto no serán eliminados del disco."
 
-#: spyderlib\widgets\projectexplorer.py:1027
+#: spyderlib\widgets\projectexplorer.py:1054
 msgid "Related projects"
 msgstr "Proyectos relacionados"
 
-#: spyderlib\widgets\projectexplorer.py:1035
+#: spyderlib\widgets\projectexplorer.py:1062
 msgid "Select projects which are related to <b>%s</b>"
 msgstr "Seleccionar los proyectos que están relacionados a <b>%s</b>"
 
-#: spyderlib\widgets\projectexplorer.py:1060
+#: spyderlib\widgets\projectexplorer.py:1087
 msgid ""
 "Statistics on source files only:<br>(Python, C/C++, Fortran)<br><br><b>%s</"
 "b> files.<br><b>%s</b> lines of code."
@@ -4387,25 +4465,25 @@ msgstr ""
 "Estadísticas para los archivos de código únicamente:<br>(Python, C/C++, "
 "Fortran)<br><br><b>%s</b> archivos.<br><b>%s</b> líneas de código."
 
-#: spyderlib\widgets\projectexplorer.py:1107
+#: spyderlib\widgets\projectexplorer.py:1134
 msgid "File <b>%s</b> already exists.<br>Do you want to overwrite it?"
 msgstr "El archivo <b>%s</b> ya existe.<br>¿Desea sobrescribirlo?"
 
-#: spyderlib\widgets\projectexplorer.py:1121
+#: spyderlib\widgets\projectexplorer.py:1148
 msgid "Folder <b>%s</b> already exists."
 msgstr "La carpeta <b>%s</b> ya existe."
 
-#: spyderlib\widgets\projectexplorer.py:1141
+#: spyderlib\widgets\projectexplorer.py:1168
 msgid "move"
 msgstr "mover"
 
-#: spyderlib\widgets\projectexplorer.py:1150
+#: spyderlib\widgets\projectexplorer.py:1177
 msgid "Select an existing workspace directory, or create a new one"
 msgstr ""
 "Seleccionar un directorio existente para que\n"
 "sea el espacio de trabajo, o crear uno nuevo"
 
-#: spyderlib\widgets\projectexplorer.py:1151
+#: spyderlib\widgets\projectexplorer.py:1178
 msgid ""
 "<u><b>What is the workspace?</b></u><br><br>A <b>Spyder workspace</b> is a "
 "directory on your filesystem that contains Spyder projects and <b>."
@@ -4422,11 +4500,11 @@ msgstr ""
 "spyderproject</b>) con los ajustes del proyecto (PYTHONPATH, proyectos "
 "referenciados, etc).<br>"
 
-#: spyderlib\widgets\projectexplorer.py:1178
+#: spyderlib\widgets\projectexplorer.py:1205
 msgid "This is the current workspace directory"
 msgstr "Este es el directorio actual del espacio de trabajo"
 
-#: spyderlib\widgets\projectexplorer.py:1209
+#: spyderlib\widgets\projectexplorer.py:1236
 msgid ""
 "The following directory is not a Spyder workspace:<br>%s<br><br>Do you want "
 "to create a new workspace in this directory?"
@@ -4478,27 +4556,31 @@ msgstr "Limpiar la terminal"
 msgid "Clear shell contents ('cls' command)"
 msgstr "Limpia los contenidos de la terminal (equivalente al comando 'cls')"
 
-#: spyderlib\widgets\sourcecode\codeeditor.py:238
+#: spyderlib\widgets\sourcecode\codeeditor.py:68
+msgid "Editor's code completion, go-to-definition and help"
+msgstr "Completado del código y ayuda en el Editor"
+
+#: spyderlib\widgets\sourcecode\codeeditor.py:249
 msgid "Go to line:"
 msgstr "Ir a la línea"
 
-#: spyderlib\widgets\sourcecode\codeeditor.py:247
+#: spyderlib\widgets\sourcecode\codeeditor.py:258
 msgid "Line count:"
 msgstr "Número total de líneas:"
 
-#: spyderlib\widgets\sourcecode\codeeditor.py:1180
+#: spyderlib\widgets\sourcecode\codeeditor.py:1193
 msgid "Breakpoint"
 msgstr "Punto de interrupción"
 
-#: spyderlib\widgets\sourcecode\codeeditor.py:1181
+#: spyderlib\widgets\sourcecode\codeeditor.py:1194
 msgid "Condition:"
 msgstr "Condición:"
 
-#: spyderlib\widgets\sourcecode\codeeditor.py:1629
+#: spyderlib\widgets\sourcecode\codeeditor.py:1641
 msgid "To do"
 msgstr "To do"
 
-#: spyderlib\widgets\sourcecode\codeeditor.py:2207
+#: spyderlib\widgets\sourcecode\codeeditor.py:2219
 msgid "Go to definition"
 msgstr "Ir a la definición"
 
@@ -4559,6 +4641,41 @@ msgstr "Cerrar pestaña actual"
 msgid "Text editor"
 msgstr "Editor de texto"
 
+#~ msgid "Create a new Python script"
+#~ msgstr "Crear un nuevo archivo de Python"
+
+#~ msgid "Open text file"
+#~ msgstr "Abrir archivo de texto"
+
+#~ msgid "Save current file"
+#~ msgstr "Guardar el archivo actual"
+
+#~ msgid "Run &selection or current block"
+#~ msgstr "Ejecutar la &selección o el bloque actual"
+
+#~ msgid ""
+#~ "Run selection or current \n"
+#~ "block of lines"
+#~ msgstr ""
+#~ "Ejecutar la selección \n"
+#~ "o el bloque actual"
+
+#~ msgid "Open Spyder path manager"
+#~ msgstr "Abrir el administrador de rutas de Spyder"
+
+#~ msgid "Maximize current plugin to fit the whole application window"
+#~ msgstr ""
+#~ "Maximizar el componente actual\n"
+#~ "para que ocupe toda la ventana"
+
+#~ msgid ""
+#~ "Restore current plugin to its original size and position within the "
+#~ "application window"
+#~ msgstr ""
+#~ "Restaurar el componente actual\n"
+#~ "a su tamaño y posición originales\n"
+#~ "dentro de la ventana principal"
+
 #~ msgid "Step Over"
 #~ msgstr "Saltar paso"
 
diff --git a/spyderlib/locale/fr/LC_MESSAGES/spyderlib.mo b/spyderlib/locale/fr/LC_MESSAGES/spyderlib.mo
index fb8a0fb..0ec74c5 100644
Binary files a/spyderlib/locale/fr/LC_MESSAGES/spyderlib.mo and b/spyderlib/locale/fr/LC_MESSAGES/spyderlib.mo differ
diff --git a/spyderlib/locale/fr/LC_MESSAGES/spyderlib.po b/spyderlib/locale/fr/LC_MESSAGES/spyderlib.po
index 2417093..ced16f3 100644
--- a/spyderlib/locale/fr/LC_MESSAGES/spyderlib.po
+++ b/spyderlib/locale/fr/LC_MESSAGES/spyderlib.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.1\n"
-"POT-Creation-Date: 2013-08-20 13:51+Paris, Madrid (heure dt)\n"
+"POT-Creation-Date: 2013-09-04 20:58+Hora est. del Pacfico de SA\n"
 "PO-Revision-Date: 2011-04-11 21:41+2\n"
 "Last-Translator: Pierre Raybaut\n"
 "Language-Team: Python\n"
@@ -105,7 +105,7 @@ msgstr "Chemin d'accès de répertoire incorrect"
 #: spyderlib\plugins\configdialog.py:416 spyderlib\plugins\configdialog.py:432
 #: spyderlib\plugins\runconfig.py:169 spyderlib\plugins\runconfig.py:229
 #: spyderlib\plugins\workingdirectory.py:293 spyderlib\widgets\explorer.py:535
-#: spyderlib\widgets\externalshell\pythonshell.py:603
+#: spyderlib\widgets\externalshell\pythonshell.py:602
 #: spyderlib\widgets\findinfiles.py:502 spyderlib\widgets\pathmanager.py:217
 #: spyderlib\widgets\projectexplorer.py:888
 msgid "Select directory"
@@ -147,9 +147,9 @@ msgstr "Police d'écriture"
 msgid "General"
 msgstr "Général"
 
-#: spyderlib\plugins\configdialog.py:635 spyderlib\plugins\editor.py:92
+#: spyderlib\plugins\configdialog.py:635 spyderlib\plugins\editor.py:93
 #: spyderlib\plugins\externalconsole.py:83
-#: spyderlib\plugins\ipythonconsole.py:67
+#: spyderlib\plugins\ipythonconsole.py:70
 msgid "Interface"
 msgstr "Interface"
 
@@ -299,20 +299,20 @@ msgstr "Rétablir les valeurs par défaut"
 msgid "Internal console"
 msgstr "Console interne"
 
-#: spyderlib\plugins\console.py:123 spyderlib\plugins\ipythonconsole.py:506
-#: spyderlib\spyder.py:747
+#: spyderlib\plugins\console.py:123 spyderlib\plugins\ipythonconsole.py:510
+#: spyderlib\spyder.py:754
 msgid "&Quit"
 msgstr "&Quitter"
 
-#: spyderlib\plugins\console.py:124 spyderlib\spyder.py:748
+#: spyderlib\plugins\console.py:124 spyderlib\spyder.py:755
 msgid "Quit"
 msgstr "Quitter"
 
-#: spyderlib\plugins\console.py:127 spyderlib\plugins\externalconsole.py:1082
+#: spyderlib\plugins\console.py:127 spyderlib\plugins\externalconsole.py:1112
 msgid "&Run..."
 msgstr "Exécute&r..."
 
-#: spyderlib\plugins\console.py:128 spyderlib\plugins\externalconsole.py:1083
+#: spyderlib\plugins\console.py:128 spyderlib\plugins\externalconsole.py:1113
 msgid "Run a Python script"
 msgstr "Exécuter un script Python"
 
@@ -343,7 +343,7 @@ msgid "Set maximum line count"
 msgstr "Modifier le nombre maximum de lignes"
 
 #: spyderlib\plugins\console.py:146 spyderlib\plugins\explorer.py:59
-#: spyderlib\plugins\history.py:149 spyderlib\plugins\inspector.py:283
+#: spyderlib\plugins\history.py:149 spyderlib\plugins\inspector.py:284
 #: spyderlib\plugins\projectexplorer.py:57
 msgid "&Font..."
 msgstr "&Police..."
@@ -360,24 +360,24 @@ msgstr "Éditeur externe..."
 msgid "Set external editor executable path"
 msgstr "Modifier le chemin d'accès de l'éditeur externe"
 
-#: spyderlib\plugins\console.py:154 spyderlib\plugins\editor.py:130
+#: spyderlib\plugins\console.py:154 spyderlib\plugins\editor.py:131
 #: spyderlib\plugins\externalconsole.py:104 spyderlib\plugins\history.py:37
-#: spyderlib\plugins\history.py:152 spyderlib\plugins\inspector.py:95
-#: spyderlib\plugins\inspector.py:286
+#: spyderlib\plugins\history.py:152 spyderlib\plugins\inspector.py:96
+#: spyderlib\plugins\inspector.py:287
 msgid "Wrap lines"
 msgstr "Retour à la ligne automatique"
 
-#: spyderlib\plugins\console.py:157 spyderlib\plugins\editor.py:160
+#: spyderlib\plugins\console.py:157 spyderlib\plugins\editor.py:161
 #: spyderlib\plugins\externalconsole.py:153
 msgid "Balloon tips"
 msgstr "Info-bulles"
 
-#: spyderlib\plugins\console.py:161 spyderlib\plugins\editor.py:152
+#: spyderlib\plugins\console.py:161 spyderlib\plugins\editor.py:153
 #: spyderlib\plugins\externalconsole.py:145
 msgid "Automatic code completion"
 msgstr "Complétion de code automatique"
 
-#: spyderlib\plugins\console.py:165 spyderlib\plugins\editor.py:158
+#: spyderlib\plugins\console.py:165 spyderlib\plugins\editor.py:159
 #: spyderlib\plugins\externalconsole.py:151
 msgid "Enter key selects completion"
 msgstr "Entrée valide la complétion de code"
@@ -386,17 +386,17 @@ msgstr "Entrée valide la complétion de code"
 msgid "Internal console settings"
 msgstr "Options de la console interne"
 
-#: spyderlib\plugins\console.py:221 spyderlib\plugins\externalconsole.py:1256
+#: spyderlib\plugins\console.py:221 spyderlib\plugins\externalconsole.py:1286
 msgid "Run Python script"
 msgstr "Exécuter un script Python"
 
 #: spyderlib\plugins\console.py:222 spyderlib\plugins\externalconsole.py:267
-#: spyderlib\plugins\externalconsole.py:1257 spyderlib\widgets\explorer.py:633
+#: spyderlib\plugins\externalconsole.py:1287 spyderlib\widgets\explorer.py:633
 msgid "Python scripts"
 msgstr "Scripts Python"
 
 #: spyderlib\plugins\console.py:267 spyderlib\plugins\explorer.py:110
-#: spyderlib\plugins\history.py:263 spyderlib\plugins\inspector.py:547
+#: spyderlib\plugins\history.py:263 spyderlib\plugins\inspector.py:548
 #: spyderlib\plugins\projectexplorer.py:119
 msgid "Select a new font"
 msgstr "Sélectionner une police d'écriture"
@@ -417,90 +417,90 @@ msgstr "Éditeur externe"
 msgid "External editor executable path:"
 msgstr "Chemin d'accès de l'exécutable :"
 
-#: spyderlib\plugins\editor.py:86 spyderlib\plugins\editor.py:509
-#: spyderlib\plugins\editor.py:1536 spyderlib\plugins\inspector.py:314
+#: spyderlib\plugins\editor.py:87 spyderlib\plugins\editor.py:510
+#: spyderlib\plugins\editor.py:1574 spyderlib\plugins\inspector.py:315
 #: spyderlib\widgets\editor.py:566
 #: spyderlib\widgets\sourcecode\codeeditor.py:246
 #: spyderlib\widgets\sourcecode\codeeditor.py:2535
 msgid "Editor"
 msgstr "Éditeur"
 
-#: spyderlib\plugins\editor.py:89
+#: spyderlib\plugins\editor.py:90
 msgid "Edit template for new modules"
 msgstr "Modifier le modèle (nouveaux modules)"
 
-#: spyderlib\plugins\editor.py:94
+#: spyderlib\plugins\editor.py:95
 msgid "Text and margin font style"
 msgstr "Police d'écriture du texte et de la marge"
 
-#: spyderlib\plugins\editor.py:97
+#: spyderlib\plugins\editor.py:98
 msgid "Sort files according to full path"
 msgstr "Classer les fichiers suivant leur chemin complet"
 
-#: spyderlib\plugins\editor.py:99
+#: spyderlib\plugins\editor.py:100
 msgid "Show tab bar"
 msgstr "Afficher la barre d'onglets"
 
-#: spyderlib\plugins\editor.py:106 spyderlib\plugins\editor.py:181
+#: spyderlib\plugins\editor.py:107 spyderlib\plugins\editor.py:182
 #: spyderlib\plugins\externalconsole.py:99
 #: spyderlib\plugins\externalconsole.py:144 spyderlib\plugins\history.py:36
-#: spyderlib\plugins\inspector.py:94 spyderlib\plugins\ipythonconsole.py:102
+#: spyderlib\plugins\inspector.py:95 spyderlib\plugins\ipythonconsole.py:105
 msgid "Source code"
 msgstr "Code source"
 
-#: spyderlib\plugins\editor.py:107
+#: spyderlib\plugins\editor.py:108
 msgid "Show line numbers"
 msgstr "Afficher les numéros de ligne"
 
-#: spyderlib\plugins\editor.py:108
+#: spyderlib\plugins\editor.py:109
 msgid "Show vertical line after"
 msgstr "Afficher une ligne verticale après"
 
-#: spyderlib\plugins\editor.py:109
+#: spyderlib\plugins\editor.py:110
 msgid "characters"
 msgstr "caractères"
 
-#: spyderlib\plugins\editor.py:117
+#: spyderlib\plugins\editor.py:118
 msgid "Highlight current line"
 msgstr "Surligner la ligne en cours d'édition"
 
-#: spyderlib\plugins\editor.py:119
+#: spyderlib\plugins\editor.py:120
 msgid "Highlight occurences after"
 msgstr "Surligner les occurences après"
 
-#: spyderlib\plugins\editor.py:133 spyderlib\plugins\history.py:45
-#: spyderlib\plugins\inspector.py:98
+#: spyderlib\plugins\editor.py:134 spyderlib\plugins\history.py:45
+#: spyderlib\plugins\inspector.py:99
 msgid "Syntax color scheme: "
 msgstr "Thème de coloration syntaxique : "
 
-#: spyderlib\plugins\editor.py:145 spyderlib\plugins\runconfig.py:304
+#: spyderlib\plugins\editor.py:146 spyderlib\plugins\runconfig.py:304
 #: spyderlib\plugins\runconfig.py:426 spyderlib\plugins\runconfig.py:433
-#: spyderlib\spyder.py:1696 spyderlib\widgets\explorer.py:229
+#: spyderlib\spyder.py:1702 spyderlib\widgets\explorer.py:229
 #: spyderlib\widgets\externalshell\baseshell.py:137
 msgid "Run"
 msgstr "Exécuter"
 
-#: spyderlib\plugins\editor.py:146
+#: spyderlib\plugins\editor.py:147
 msgid "Save all files before running script"
 msgstr "Enregistrer tous les fichiers avant l'exécution d'un script"
 
-#: spyderlib\plugins\editor.py:149 spyderlib\plugins\externalconsole.py:433
+#: spyderlib\plugins\editor.py:150 spyderlib\plugins\externalconsole.py:433
 msgid "Introspection"
 msgstr "Introspection"
 
-#: spyderlib\plugins\editor.py:154 spyderlib\plugins\externalconsole.py:147
+#: spyderlib\plugins\editor.py:155 spyderlib\plugins\externalconsole.py:147
 msgid "Case sensitive code completion"
 msgstr "Complétion de code sensible à la casse"
 
-#: spyderlib\plugins\editor.py:156 spyderlib\plugins\externalconsole.py:149
+#: spyderlib\plugins\editor.py:157 spyderlib\plugins\externalconsole.py:149
 msgid "Show single completion"
 msgstr "Afficher les listes de complétion avec un choix unique"
 
-#: spyderlib\plugins\editor.py:161
+#: spyderlib\plugins\editor.py:162
 msgid "Link to object definition"
 msgstr "Lien vers la définition d'un objet"
 
-#: spyderlib\plugins\editor.py:163
+#: spyderlib\plugins\editor.py:164
 msgid ""
 "If this option is enabled, clicking on an object\n"
 "name (left-click + Ctrl key) will go this object\n"
@@ -510,12 +510,12 @@ msgstr ""
 "d'un objet (click gauche + touche Ctrl) ira à la\n"
 "définition de cet objet (si celle-ci est trouvée)."
 
-#: spyderlib\plugins\editor.py:167 spyderlib\plugins\externalconsole.py:155
-#: spyderlib\plugins\ipythonconsole.py:85
+#: spyderlib\plugins\editor.py:168 spyderlib\plugins\externalconsole.py:155
+#: spyderlib\plugins\ipythonconsole.py:88
 msgid "Automatic notification to object inspector"
 msgstr "Notification automatique à l'inspecteur d'objets"
 
-#: spyderlib\plugins\editor.py:169
+#: spyderlib\plugins\editor.py:170
 msgid ""
 "If this option is enabled, object inspector\n"
 "will automatically show informations on functions\n"
@@ -528,7 +528,7 @@ msgstr ""
 "(le mécanisme est déclenché par la saisie d'une\n"
 "parenthèse gauche après un nom valide de fonction)"
 
-#: spyderlib\plugins\editor.py:174
+#: spyderlib\plugins\editor.py:175
 msgid ""
 "<b>Warning:</b><br>The Python module <i>rope</i> is not installed on this "
 "computer: calltips, code completion and go-to-definition features won't be "
@@ -538,51 +538,51 @@ msgstr ""
 "sur cet ordinateur : les fonctionnalités telles que la complétion de code ou "
 "le lien vers la définition d'un objet ne sont donc pas accessibles."
 
-#: spyderlib\plugins\editor.py:182
+#: spyderlib\plugins\editor.py:183
 msgid "Automatic insertion of parentheses, braces and brackets"
 msgstr "Insertion automatique des parenthèses, crochets et accolades"
 
-#: spyderlib\plugins\editor.py:185
+#: spyderlib\plugins\editor.py:186
 msgid "Automatic insertion of closing quotes"
 msgstr "Insertion automatique de guillemets de clôture"
 
-#: spyderlib\plugins\editor.py:187
+#: spyderlib\plugins\editor.py:188
 msgid "Automatic insertion of colons after 'for', 'if', 'def', etc"
 msgstr "Insertion automatique de ':' après 'for', 'if', 'def', etc."
 
-#: spyderlib\plugins\editor.py:190
+#: spyderlib\plugins\editor.py:191
 msgid "Automatic indentation after 'else', 'elif', etc."
 msgstr "Indentation automatique après 'else', 'elif', etc."
 
-#: spyderlib\plugins\editor.py:192
+#: spyderlib\plugins\editor.py:193
 msgid "Indentation characters: "
 msgstr "Caractères d'indentation : "
 
-#: spyderlib\plugins\editor.py:193
+#: spyderlib\plugins\editor.py:194
 msgid "4 spaces"
 msgstr "4 espaces"
 
-#: spyderlib\plugins\editor.py:194
+#: spyderlib\plugins\editor.py:195
 msgid "2 spaces"
 msgstr "2 espaces"
 
-#: spyderlib\plugins\editor.py:195
+#: spyderlib\plugins\editor.py:196
 msgid "tab"
 msgstr "tabulation"
 
-#: spyderlib\plugins\editor.py:196
+#: spyderlib\plugins\editor.py:197
 msgid "Tab stop width:"
 msgstr "Largeur des tabulations :"
 
-#: spyderlib\plugins\editor.py:196
+#: spyderlib\plugins\editor.py:197
 msgid "pixels"
 msgstr "pixels"
 
-#: spyderlib\plugins\editor.py:198
+#: spyderlib\plugins\editor.py:199
 msgid "Tab always indent"
 msgstr "Toujours indenter avec la touche Tab"
 
-#: spyderlib\plugins\editor.py:200
+#: spyderlib\plugins\editor.py:201
 msgid ""
 "If enabled, pressing Tab will always indent,\n"
 "even when the cursor is not at the beginning\n"
@@ -596,21 +596,21 @@ msgstr ""
 "option est activée, la complétion de code reste \n"
 "accessible via le raccourci Ctrl+Espace)"
 
-#: spyderlib\plugins\editor.py:205
+#: spyderlib\plugins\editor.py:206
 msgid "Intelligent backspace"
 msgstr "Retour arrière (\"backspace\") intelligent"
 
-#: spyderlib\plugins\editor.py:207
+#: spyderlib\plugins\editor.py:208
 msgid "Automatically remove trailing spaces when saving files"
 msgstr ""
 "Supprimer automatiquement les espaces en fin de ligne lors de "
 "l'enregistrement"
 
-#: spyderlib\plugins\editor.py:211
+#: spyderlib\plugins\editor.py:212
 msgid "Analysis"
 msgstr "Analyse"
 
-#: spyderlib\plugins\editor.py:213
+#: spyderlib\plugins\editor.py:214
 msgid ""
 "<u>Note</u>: add <b>analysis:ignore</b> in a comment to ignore code/style "
 "analysis warnings. For more informations on style guide for Python code, "
@@ -621,12 +621,12 @@ msgstr ""
 "les recommandations officielles de style d'écriture avec le langage Python, "
 "veuillez visiter la page de la %s."
 
-#: spyderlib\plugins\editor.py:222
+#: spyderlib\plugins\editor.py:223
 #: spyderlib\widgets\sourcecode\codeeditor.py:1587
 msgid "Code analysis"
 msgstr "Analyse de code"
 
-#: spyderlib\plugins\editor.py:224
+#: spyderlib\plugins\editor.py:225
 msgid ""
 "If enabled, Python source code will be analyzed\n"
 "using pyflakes, lines containing errors or \n"
@@ -636,15 +636,15 @@ msgstr ""
 "avec des outils l'outil d'introspection de code pyflakes\n"
 "et les lignes contenant des erreurs seront indiquées"
 
-#: spyderlib\plugins\editor.py:229
+#: spyderlib\plugins\editor.py:230
 msgid "Code analysis requires pyflakes %s+"
 msgstr "L'analyse de code requiert pyflakes %s+"
 
-#: spyderlib\plugins\editor.py:231
+#: spyderlib\plugins\editor.py:232
 msgid "Style analysis"
 msgstr "Analyse de style"
 
-#: spyderlib\plugins\editor.py:233
+#: spyderlib\plugins\editor.py:234
 msgid ""
 "If enabled, Python source code will be analyzed\n"
 "using pep8, lines that are not following PEP8\n"
@@ -654,23 +654,23 @@ msgstr ""
 "avec l'outil d'introspection de code pep8 et les lignes ne suivant pas\n"
 "les recommandations officielles seront indiquées"
 
-#: spyderlib\plugins\editor.py:240
+#: spyderlib\plugins\editor.py:241
 msgid "Tasks (TODO, FIXME, XXX, HINT, TIP)"
 msgstr "Tâches (TODO, FIXME, XXX, HINT, TIP)"
 
-#: spyderlib\plugins\editor.py:243
+#: spyderlib\plugins\editor.py:244
 msgid "Perform analysis when saving file and every"
 msgstr "Analyser lors de l'enregistrement et toutes les"
 
-#: spyderlib\plugins\editor.py:247
+#: spyderlib\plugins\editor.py:248
 msgid "Perform analysis only when saving file"
 msgstr "Analyser uniquement lors de l'enregistrement"
 
-#: spyderlib\plugins\editor.py:293
+#: spyderlib\plugins\editor.py:294
 msgid "End-of-line characters"
 msgstr "Caractères de fin de ligne"
 
-#: spyderlib\plugins\editor.py:294
+#: spyderlib\plugins\editor.py:295
 msgid ""
 "When opening a text file containing mixed end-of-line characters (this may "
 "raise syntax errors in Python interpreter on Windows platforms), Spyder may "
@@ -681,394 +681,392 @@ msgstr ""
 "l'interpréteur Python sous Windows), Spyder peut réparer le fichier "
 "automatiquement."
 
-#: spyderlib\plugins\editor.py:300
+#: spyderlib\plugins\editor.py:301
 msgid "Fix automatically and show warning message box"
 msgstr "Réparer automatiquement et afficher un message d'avertissement"
 
-#: spyderlib\plugins\editor.py:311 spyderlib\plugins\externalconsole.py:431
-#: spyderlib\plugins\ipythonconsole.py:354
+#: spyderlib\plugins\editor.py:312 spyderlib\plugins\externalconsole.py:431
+#: spyderlib\plugins\ipythonconsole.py:358
 #: spyderlib\plugins\variableexplorer.py:41
 msgid "Display"
 msgstr "Affichage"
 
-#: spyderlib\plugins\editor.py:313
+#: spyderlib\plugins\editor.py:314
 msgid "Code Introspection/Analysis"
 msgstr "Introspection et analyse de code"
 
-#: spyderlib\plugins\editor.py:316 spyderlib\plugins\externalconsole.py:436
+#: spyderlib\plugins\editor.py:317 spyderlib\plugins\externalconsole.py:436
 msgid "Advanced settings"
 msgstr "Options avancées"
 
-#: spyderlib\plugins\editor.py:565 spyderlib\widgets\editortools.py:467
+#: spyderlib\plugins\editor.py:566 spyderlib\widgets\editortools.py:467
 msgid "Show/hide outline explorer"
 msgstr "Afficher/masquer l'explorateur de structure"
 
-#: spyderlib\plugins\editor.py:571
+#: spyderlib\plugins\editor.py:572
 msgid "Show/hide project explorer"
 msgstr "Afficher/masquer l'explorateur de projets"
 
-#: spyderlib\plugins\editor.py:579
+#: spyderlib\plugins\editor.py:581
 msgid "&New file..."
 msgstr "&Nouveau fichier..."
 
-#: spyderlib\plugins\editor.py:580
-msgid "Create a new Python script"
-msgstr "Créer un nouveau script Python"
+#: spyderlib\plugins\editor.py:582 spyderlib\plugins\workingdirectory.py:81
+#: spyderlib\widgets\explorer.py:611 spyderlib\widgets\explorer.py:618
+msgid "New file"
+msgstr "Nouveau fichier"
 
-#: spyderlib\plugins\editor.py:584
+#: spyderlib\plugins\editor.py:589
 msgid "&Open..."
 msgstr "&Ouvrir..."
 
-#: spyderlib\plugins\editor.py:585
-msgid "Open text file"
-msgstr "Ouvrir un fichier texte"
+#: spyderlib\plugins\editor.py:590 spyderlib\plugins\editor.py:1615
+#: spyderlib\plugins\workingdirectory.py:68
+msgid "Open file"
+msgstr "Ouvrir un fichier"
 
-#: spyderlib\plugins\editor.py:587
+#: spyderlib\plugins\editor.py:597
 msgid "&Revert"
 msgstr "&Réinitialiser"
 
-#: spyderlib\plugins\editor.py:588
+#: spyderlib\plugins\editor.py:598
 msgid "Revert file from disk"
 msgstr "Revenir à la version du fichier enregistrée sur le disque"
 
-#: spyderlib\plugins\editor.py:592
+#: spyderlib\plugins\editor.py:601
 msgid "&Save"
 msgstr "&Enregistrer"
 
-#: spyderlib\plugins\editor.py:593
-msgid "Save current file"
-msgstr "Enregistrer le fichier en cours d'édition"
+#: spyderlib\plugins\editor.py:602
+#, fuzzy
+msgid "Save file"
+msgstr "Nouveau fichier"
 
-#: spyderlib\plugins\editor.py:597
+#: spyderlib\plugins\editor.py:609
 msgid "Sav&e all"
 msgstr "Enregistrer &tout"
 
-#: spyderlib\plugins\editor.py:598
-msgid "Save all opened files"
+#: spyderlib\plugins\editor.py:610
+#, fuzzy
+msgid "Save all files"
 msgstr "Enregistrer tous les fichiers ouverts"
 
-#: spyderlib\plugins\editor.py:602
+#: spyderlib\plugins\editor.py:617
 msgid "Save &as..."
 msgstr "Enregistrer &sous..."
 
-#: spyderlib\plugins\editor.py:603
+#: spyderlib\plugins\editor.py:618
 msgid "Save current file as..."
 msgstr "Enregistrer le fichier en cours d'édition sous un autre nom..."
 
-#: spyderlib\plugins\editor.py:605 spyderlib\plugins\editor.py:606
+#: spyderlib\plugins\editor.py:620 spyderlib\plugins\editor.py:621
 msgid "Print preview..."
 msgstr "Aperçu avant impression..."
 
-#: spyderlib\plugins\editor.py:607
+#: spyderlib\plugins\editor.py:622
 msgid "&Print..."
 msgstr "Im&primer..."
 
-#: spyderlib\plugins\editor.py:608
+#: spyderlib\plugins\editor.py:623
 msgid "Print current file..."
 msgstr "Imprimer le fichier en cours d'édition..."
 
-#: spyderlib\plugins\editor.py:612
+#: spyderlib\plugins\editor.py:627
 msgid "&Close"
 msgstr "&Fermer"
 
-#: spyderlib\plugins\editor.py:613
+#: spyderlib\plugins\editor.py:628
 msgid "Close current file"
 msgstr "Fermer le fichier en cours d'édition"
 
-#: spyderlib\plugins\editor.py:617
+#: spyderlib\plugins\editor.py:632
 msgid "C&lose all"
 msgstr "Fermer t&out"
 
-#: spyderlib\plugins\editor.py:618
+#: spyderlib\plugins\editor.py:633
 msgid "Close all opened files"
 msgstr "Fermer tous les fichiers ouverts"
 
-#: spyderlib\plugins\editor.py:624
+#: spyderlib\plugins\editor.py:640
 msgid "Set/Clear breakpoint"
 msgstr "Ajouter/supprimer un point d'arrêt"
 
-#: spyderlib\plugins\editor.py:631
+#: spyderlib\plugins\editor.py:647
 msgid "Set/Edit conditional breakpoint"
 msgstr "Ajouter/modifier un point d'arrêt conditionnel"
 
-#: spyderlib\plugins\editor.py:639
+#: spyderlib\plugins\editor.py:655
 msgid "Clear breakpoints in all files"
 msgstr "Supprimer les points d'arrêt dans tous les fichiers"
 
-#: spyderlib\plugins\editor.py:641
+#: spyderlib\plugins\editor.py:657
 msgid "Breakpoints"
 msgstr "Points d'arrêt"
 
-#: spyderlib\plugins\editor.py:647
+#: spyderlib\plugins\editor.py:661
+msgid "Debug with winpdb"
+msgstr "Déboguer avec winpdb"
+
+#: spyderlib\plugins\editor.py:668 spyderlib\spyder.py:562
 msgid "&Debug"
 msgstr "&Déboguer"
 
-#: spyderlib\plugins\editor.py:648
+#: spyderlib\plugins\editor.py:669
 msgid "Debug file"
 msgstr "Déboguer le script"
 
-#: spyderlib\plugins\editor.py:652
+#: spyderlib\plugins\editor.py:675
 msgid "Step"
 msgstr "Pas"
 
-#: spyderlib\plugins\editor.py:653
+#: spyderlib\plugins\editor.py:676
 msgid "Run current line"
 msgstr "Exécuter la ligne en cours"
 
-#: spyderlib\plugins\editor.py:657
+#: spyderlib\plugins\editor.py:683
 msgid "Continue"
 msgstr "Continuer"
 
-#: spyderlib\plugins\editor.py:658
-msgid ""
-"Continue execution until\n"
-"next breakpoint"
+#: spyderlib\plugins\editor.py:684
+#, fuzzy
+msgid "Continue execution until next breakpoint"
 msgstr ""
 "Continuer l'exécution jusqu'au\n"
 "prochain point d'arrêt"
 
-#: spyderlib\plugins\editor.py:663
+#: spyderlib\plugins\editor.py:692
 msgid "Step Into"
 msgstr "Pas vers l'intérieur"
 
-#: spyderlib\plugins\editor.py:664
-msgid ""
-"Step into function, method\n"
-"or class of current line"
+#: spyderlib\plugins\editor.py:693
+#, fuzzy
+msgid "Step into function or method of current line"
 msgstr ""
 "Pas vers l'intérieur d'une fonction, d'une classe\n"
 "ou de la ligne en cours"
 
-#: spyderlib\plugins\editor.py:669
+#: spyderlib\plugins\editor.py:701
 msgid "Step Return"
 msgstr "Pas vers l'extérieur"
 
-#: spyderlib\plugins\editor.py:670
-msgid ""
-"Run until current function\n"
-"or method returns"
+#: spyderlib\plugins\editor.py:702
+#, fuzzy
+msgid "Run until current function or method returns"
 msgstr ""
 "Exécuter jusqu'au retour de la fonction\n"
 "ou de la méthode en cours"
 
-#: spyderlib\plugins\editor.py:675
+#: spyderlib\plugins\editor.py:710
 msgid "Exit"
 msgstr "Sortir"
 
-#: spyderlib\plugins\editor.py:676
+#: spyderlib\plugins\editor.py:711
 msgid "Exit Debug"
 msgstr "Quitter le débogage"
 
-#: spyderlib\plugins\editor.py:685
+#: spyderlib\plugins\editor.py:723
 msgid "Debugging control"
 msgstr "Contrôle du débogage"
 
-#: spyderlib\plugins\editor.py:689 spyderlib\plugins\editor.py:1188
-#: spyderlib\spyder.py:555
+#: spyderlib\plugins\editor.py:727 spyderlib\plugins\editor.py:1226
+#: spyderlib\spyder.py:557
 msgid "&Run"
 msgstr "E&xécution"
 
-#: spyderlib\plugins\editor.py:690
+#: spyderlib\plugins\editor.py:728
 msgid "Run file"
 msgstr "Exécuter le fichier"
 
-#: spyderlib\plugins\editor.py:695
+#: spyderlib\plugins\editor.py:735
 msgid "&Configure..."
 msgstr "&Configurer..."
 
-#: spyderlib\plugins\editor.py:696
-#: spyderlib\widgets\externalshell\pythonshell.py:289
+#: spyderlib\plugins\editor.py:736
+#: spyderlib\widgets\externalshell\pythonshell.py:292
 msgid "Run settings"
 msgstr "Options d'exécution"
 
-#: spyderlib\plugins\editor.py:702
+#: spyderlib\plugins\editor.py:745
 msgid "Re-run &last script"
 msgstr "Exécuter de nouveau le &dernier script"
 
-#: spyderlib\plugins\editor.py:703
+#: spyderlib\plugins\editor.py:746
 msgid "Run again last file"
 msgstr "Exécuter de nouveau le dernier fichier"
 
-#: spyderlib\plugins\editor.py:708
+#: spyderlib\plugins\editor.py:753
 #: spyderlib\widgets\sourcecode\codeeditor.py:2222
 msgid "Run &selection"
 msgstr "Exécuter la &sélection"
 
-#: spyderlib\plugins\editor.py:710
+#: spyderlib\plugins\editor.py:755
 msgid "Run selection"
 msgstr "Exécuter la sélection"
 
-#: spyderlib\plugins\editor.py:715
+#: spyderlib\plugins\editor.py:761
 msgid "Run cell"
 msgstr "Exécuter la cellule"
 
-#: spyderlib\plugins\editor.py:717
+#: spyderlib\plugins\editor.py:763
 msgid ""
-"Run current cell \n"
-"(see Editor documentation \n"
-"for more details on cells)"
+"Run current cell (Ctrl+Enter)\n"
+"[Use #%% to create cells]"
 msgstr ""
-"Exécuter la cellule en cours d'édition\n(voir la documentation de l'Editeur, pour plus de détails sur les cellules)"
 
-#: spyderlib\plugins\editor.py:722
+#: spyderlib\plugins\editor.py:768
 msgid "Run cell and advance"
 msgstr "Exécuter la cellule et avancer"
 
-#: spyderlib\plugins\editor.py:725
-msgid ""
-"Run current cell and go to the next one\n"
-"(see Editor documentation \n"
-"for more details on cells)"
+#: spyderlib\plugins\editor.py:771
+#, fuzzy
+msgid "Run current cell and go to the next one (Shift+Enter)"
 msgstr ""
-"Exécuter la cellule en cours d'édition et aller à la suivante\n(voir la documentation de l'Editeur, pour plus de détails sur les cellules)"
+"Exécuter la cellule en cours d'édition et aller à la suivante\n"
+"(voir la documentation de l'Editeur, pour plus de détails sur les cellules)"
 
-#: spyderlib\plugins\editor.py:732
+#: spyderlib\plugins\editor.py:777
 msgid "Show todo list"
 msgstr "Afficher la liste des tâches"
 
-#: spyderlib\plugins\editor.py:733
+#: spyderlib\plugins\editor.py:778
 msgid "Show TODO/FIXME/XXX/HINT/TIP comments list"
 msgstr "Afficher la liste des commentaires du type TODO/FIXME/XXX/HINT/TIP"
 
-#: spyderlib\plugins\editor.py:741
+#: spyderlib\plugins\editor.py:786
 msgid "Show warning/error list"
 msgstr "Afficher la liste des avertissements/erreurs"
 
-#: spyderlib\plugins\editor.py:742
+#: spyderlib\plugins\editor.py:787
 msgid "Show code analysis warnings/errors"
 msgstr ""
 "Afficher la liste des avertissements/erreurs provenant de l'analyse de code"
 
-#: spyderlib\plugins\editor.py:749
+#: spyderlib\plugins\editor.py:794
 msgid "Previous warning/error"
 msgstr "Avertissement suivant"
 
-#: spyderlib\plugins\editor.py:750
+#: spyderlib\plugins\editor.py:795
 msgid "Go to previous code analysis warning/error"
 msgstr "Afficher le message d'avertissement ou d'erreur suivant"
 
-#: spyderlib\plugins\editor.py:753
+#: spyderlib\plugins\editor.py:798
 msgid "Next warning/error"
 msgstr "Avertissement précédent"
 
-#: spyderlib\plugins\editor.py:754
+#: spyderlib\plugins\editor.py:799
 msgid "Go to next code analysis warning/error"
 msgstr "Afficher le message d'avertissement ou d'erreur précédent"
 
-#: spyderlib\plugins\editor.py:758
+#: spyderlib\plugins\editor.py:803
 msgid "Last edit location"
 msgstr "Dernière position d'édition"
 
-#: spyderlib\plugins\editor.py:759
+#: spyderlib\plugins\editor.py:804
 msgid "Go to last edit location"
 msgstr "Aller à la dernière position d'édition"
 
-#: spyderlib\plugins\editor.py:766
+#: spyderlib\plugins\editor.py:811
 msgid "Previous cursor position"
 msgstr "Position suivante du curseur"
 
-#: spyderlib\plugins\editor.py:767
+#: spyderlib\plugins\editor.py:812
 msgid "Go to previous cursor position"
 msgstr "Aller à la position précédente du curseur"
 
-#: spyderlib\plugins\editor.py:774
+#: spyderlib\plugins\editor.py:819
 msgid "Next cursor position"
 msgstr "Position suivante du curseur"
 
-#: spyderlib\plugins\editor.py:775
+#: spyderlib\plugins\editor.py:820
 msgid "Go to next cursor position"
 msgstr "Aller à la position suivante du curseur"
 
-#: spyderlib\plugins\editor.py:783
+#: spyderlib\plugins\editor.py:828
 #: spyderlib\widgets\sourcecode\codeeditor.py:2216
 msgid "Comment"
 msgstr "Commenter"
 
-#: spyderlib\plugins\editor.py:783
+#: spyderlib\plugins\editor.py:828
 #: spyderlib\widgets\sourcecode\codeeditor.py:2216
 msgid "Uncomment"
 msgstr "Décommenter"
 
-#: spyderlib\plugins\editor.py:784
+#: spyderlib\plugins\editor.py:829
 msgid "Comment current line or selection"
 msgstr "Commenter la sélection ou la ligne en cours d'édition"
 
-#: spyderlib\plugins\editor.py:788
+#: spyderlib\plugins\editor.py:833
 msgid "Add &block comment"
 msgstr "Ajouter un &bloc de commentaires"
 
-#: spyderlib\plugins\editor.py:789
+#: spyderlib\plugins\editor.py:834
 msgid "Add block comment around current line or selection"
 msgstr ""
 "Ajouter un bloc de commentaires autour de la sélection ou de la ligne en "
 "cours d'édition"
 
-#: spyderlib\plugins\editor.py:795
+#: spyderlib\plugins\editor.py:840
 msgid "R&emove block comment"
 msgstr "&Supprimer un bloc de commentaires"
 
-#: spyderlib\plugins\editor.py:796
+#: spyderlib\plugins\editor.py:841
 msgid "Remove comment block around current line or selection"
 msgstr ""
 "Supprimer le bloc de commentaires autour de la ligne en cours d'édition"
 
-#: spyderlib\plugins\editor.py:807
+#: spyderlib\plugins\editor.py:852
 msgid "Indent"
 msgstr "Indenter"
 
-#: spyderlib\plugins\editor.py:808
+#: spyderlib\plugins\editor.py:853
 msgid "Indent current line or selection"
 msgstr "Indenter la sélection ou la ligne en cours d'édition"
 
-#: spyderlib\plugins\editor.py:811
+#: spyderlib\plugins\editor.py:856
 msgid "Unindent"
 msgstr "Désindenter"
 
-#: spyderlib\plugins\editor.py:812
+#: spyderlib\plugins\editor.py:857
 msgid "Unindent current line or selection"
 msgstr "Désindenter la sélection ou la ligne en cours d'édition"
 
-#: spyderlib\plugins\editor.py:816
-msgid "Debug with winpdb"
-msgstr "Déboguer avec winpdb"
-
-#: spyderlib\plugins\editor.py:823
+#: spyderlib\plugins\editor.py:862
 msgid "Carriage return and line feed (Windows)"
 msgstr "Retour chariot et retour à la ligne (Windows)"
 
-#: spyderlib\plugins\editor.py:826
+#: spyderlib\plugins\editor.py:865
 msgid "Line feed (UNIX)"
 msgstr "Retour à la ligne (UNIX)"
 
-#: spyderlib\plugins\editor.py:829
+#: spyderlib\plugins\editor.py:868
 msgid "Carriage return (Mac)"
 msgstr "Retour chariot (Mac)"
 
-#: spyderlib\plugins\editor.py:835
+#: spyderlib\plugins\editor.py:874
 msgid "Convert end-of-line characters"
 msgstr "Convertir les caractères de fin de ligne"
 
-#: spyderlib\plugins\editor.py:839
+#: spyderlib\plugins\editor.py:878
 msgid "Remove trailing spaces"
 msgstr "Supprimer les espaces en fin de ligne"
 
-#: spyderlib\plugins\editor.py:841
+#: spyderlib\plugins\editor.py:880
 msgid "Fix indentation"
 msgstr "Corriger l'indentation"
 
-#: spyderlib\plugins\editor.py:842
+#: spyderlib\plugins\editor.py:881
 msgid "Replace tab characters by space characters"
 msgstr "Remplacer les caractères de tabulation par des espaces"
 
-#: spyderlib\plugins\editor.py:845
+#: spyderlib\plugins\editor.py:884
 msgid "Go to line..."
 msgstr "Aller à la ligne..."
 
-#: spyderlib\plugins\editor.py:853
+#: spyderlib\plugins\editor.py:892
 msgid "Set console working directory"
 msgstr "Répertoire de travail de la console"
 
-#: spyderlib\plugins\editor.py:855
+#: spyderlib\plugins\editor.py:894
 msgid ""
 "Set current console (and file explorer) working directory to current script "
 "directory"
@@ -1076,91 +1074,87 @@ msgstr ""
 "Choisir le répertoire du script comme répertoire de travail de la console "
 "courante (et de l'explorateur de fichier)"
 
-#: spyderlib\plugins\editor.py:860
+#: spyderlib\plugins\editor.py:899
 msgid "Maximum number of recent files..."
 msgstr "Nombre maximum de fichiers récents..."
 
-#: spyderlib\plugins\editor.py:863
+#: spyderlib\plugins\editor.py:902
 msgid "Clear recent files list"
 msgstr "Effacer la liste des fichiers récents"
 
-#: spyderlib\plugins\editor.py:863
+#: spyderlib\plugins\editor.py:902
 msgid "Clear this list"
 msgstr "Effacer cette liste"
 
-#: spyderlib\plugins\editor.py:865
+#: spyderlib\plugins\editor.py:904
 msgid "Open &recent"
 msgstr "Fichiers &récents"
 
-#: spyderlib\plugins\editor.py:1176 spyderlib\spyder.py:536
+#: spyderlib\plugins\editor.py:1214 spyderlib\spyder.py:538
 msgid "File toolbar"
 msgstr "Barre d'outil fichiers"
 
-#: spyderlib\plugins\editor.py:1177 spyderlib\spyder.py:546
+#: spyderlib\plugins\editor.py:1215 spyderlib\spyder.py:548
 msgid "Search toolbar"
 msgstr "Barre d'outil de recherche"
 
-#: spyderlib\plugins\editor.py:1178 spyderlib\spyder.py:551
+#: spyderlib\plugins\editor.py:1216 spyderlib\spyder.py:553
 msgid "Source toolbar"
 msgstr "Barre d'outils code source"
 
-#: spyderlib\plugins\editor.py:1179 spyderlib\spyder.py:556
+#: spyderlib\plugins\editor.py:1217 spyderlib\spyder.py:558
 msgid "Run toolbar"
 msgstr "Barre d'outil exécution"
 
-#: spyderlib\plugins\editor.py:1180 spyderlib\spyder.py:560
+#: spyderlib\plugins\editor.py:1218 spyderlib\spyder.py:563
 msgid "Debug toolbar"
 msgstr "Barre d'outil de débogage"
 
-#: spyderlib\plugins\editor.py:1181 spyderlib\spyder.py:541
+#: spyderlib\plugins\editor.py:1219 spyderlib\spyder.py:543
 msgid "Edit toolbar"
 msgstr "Barre d'outil édition"
 
-#: spyderlib\plugins\editor.py:1184 spyderlib\spyder.py:533
+#: spyderlib\plugins\editor.py:1222 spyderlib\spyder.py:535
 msgid "&File"
 msgstr "&Fichier"
 
-#: spyderlib\plugins\editor.py:1185 spyderlib\spyder.py:540
+#: spyderlib\plugins\editor.py:1223 spyderlib\spyder.py:542
 msgid "&Edit"
 msgstr "&Édition"
 
-#: spyderlib\plugins\editor.py:1186 spyderlib\spyder.py:545
+#: spyderlib\plugins\editor.py:1224 spyderlib\spyder.py:547
 msgid "&Search"
 msgstr "&Recherche"
 
-#: spyderlib\plugins\editor.py:1187 spyderlib\spyder.py:550
+#: spyderlib\plugins\editor.py:1225 spyderlib\spyder.py:552
 msgid "Sour&ce"
 msgstr "Sour&ce"
 
-#: spyderlib\plugins\editor.py:1189 spyderlib\spyder.py:567
+#: spyderlib\plugins\editor.py:1227 spyderlib\spyder.py:570
 msgid "&Tools"
 msgstr "Ou&tils"
 
-#: spyderlib\plugins\editor.py:1190
+#: spyderlib\plugins\editor.py:1228
 msgid "?"
 msgstr "?"
 
-#: spyderlib\plugins\editor.py:1404
+#: spyderlib\plugins\editor.py:1442
 msgid "Spyder Editor"
 msgstr "Éditeur de Spyder"
 
-#: spyderlib\plugins\editor.py:1405
+#: spyderlib\plugins\editor.py:1443
 msgid "This temporary script file is located here:"
 msgstr "Ce script temporaire est sauvegardé ici :"
 
-#: spyderlib\plugins\editor.py:1466
+#: spyderlib\plugins\editor.py:1504
 msgid "untitled"
 msgstr "sanstitre"
 
-#: spyderlib\plugins\editor.py:1537
+#: spyderlib\plugins\editor.py:1575
 msgid "Maximum number of recent files"
 msgstr "Nombre maximum de fichiers récents"
 
-#: spyderlib\plugins\editor.py:1577 spyderlib\plugins\workingdirectory.py:68
-msgid "Open file"
-msgstr "Ouvrir un fichier"
-
-#: spyderlib\plugins\editor.py:1659
+#: spyderlib\plugins\editor.py:1697
 msgid "Printing..."
 msgstr "Impression en cours..."
 
@@ -1168,7 +1162,7 @@ msgstr "Impression en cours..."
 msgid "File explorer"
 msgstr "Explorateur de fichiers"
 
-#: spyderlib\plugins\explorer.py:60 spyderlib\plugins\inspector.py:284
+#: spyderlib\plugins\explorer.py:60 spyderlib\plugins\inspector.py:285
 #: spyderlib\plugins\projectexplorer.py:58
 msgid "Set font style"
 msgstr "Changer la police d'écriture"
@@ -1178,9 +1172,9 @@ msgid "Interactive data plotting"
 msgstr "Visualisation interactive de données"
 
 #: spyderlib\plugins\externalconsole.py:69
-#: spyderlib\plugins\externalconsole.py:1049
-#: spyderlib\plugins\inspector.py:314 spyderlib\plugins\ipythonconsole.py:429
-#: spyderlib\plugins\ipythonconsole.py:1134
+#: spyderlib\plugins\externalconsole.py:1079
+#: spyderlib\plugins\inspector.py:315 spyderlib\plugins\ipythonconsole.py:433
+#: spyderlib\plugins\ipythonconsole.py:1176
 #: spyderlib\widgets\externalshell\baseshell.py:105
 msgid "Console"
 msgstr "Console"
@@ -1203,7 +1197,7 @@ msgid "Buffer: "
 msgstr "Tampon : "
 
 #: spyderlib\plugins\externalconsole.py:101
-#: spyderlib\plugins\ipythonconsole.py:104
+#: spyderlib\plugins\ipythonconsole.py:107
 msgid " lines"
 msgstr " lignes"
 
@@ -1252,7 +1246,7 @@ msgid "Light background (white color)"
 msgstr "Fond blanc"
 
 #: spyderlib\plugins\externalconsole.py:157
-#: spyderlib\plugins\ipythonconsole.py:87
+#: spyderlib\plugins\ipythonconsole.py:90
 msgid ""
 "If this option is enabled, object inspector\n"
 "will automatically show informations on functions\n"
@@ -1346,7 +1340,7 @@ msgid "Executables"
 msgstr "Exécutables"
 
 #: spyderlib\plugins\externalconsole.py:243
-#: spyderlib\plugins\ipythonconsole.py:358
+#: spyderlib\plugins\ipythonconsole.py:362
 #: spyderlib\plugins\workingdirectory.py:41
 msgid "Startup"
 msgstr "Démarrage"
@@ -1548,8 +1542,8 @@ msgstr ""
 "sur le bouton à l'extrême droite pour tuer le processus du noyau."
 
 #: spyderlib\plugins\externalconsole.py:718
-#: spyderlib\plugins\ipythonconsole.py:722 spyderlib\spyder.py:1230
-#: spyderlib\spyder.py:1248 spyderlib\utils\environ.py:95
+#: spyderlib\plugins\ipythonconsole.py:730 spyderlib\spyder.py:1238
+#: spyderlib\spyder.py:1256 spyderlib\utils\environ.py:95
 #: spyderlib\utils\environ.py:108
 msgid "Warning"
 msgstr "Attention"
@@ -1571,54 +1565,66 @@ msgstr ""
 "%s est déjà en cours d'exécution dans un processus séparé.\n"
 "Souhaitez-vous tuer ce processus avant d'en démarrer un autre ?"
 
-#: spyderlib\plugins\externalconsole.py:930
+#: spyderlib\plugins\externalconsole.py:948
 msgid "Kernel"
 msgstr "Noyau"
 
-#: spyderlib\plugins\externalconsole.py:950
+#: spyderlib\plugins\externalconsole.py:958
+#: spyderlib\plugins\ipythonconsole.py:1003
+msgid "Mismatch between kernel and frontend"
+msgstr ""
+
+#: spyderlib\plugins\externalconsole.py:959
+#: spyderlib\plugins\ipythonconsole.py:1004
+msgid ""
+"Your IPython frontend and kernel versions are <b>incompatible!!</"
+"b><br><br>We're sorry but we can't create an IPython console for you."
+msgstr ""
+
+#: spyderlib\plugins\externalconsole.py:980
 msgid "Command Window"
 msgstr "Invite de commandes"
 
-#: spyderlib\plugins\externalconsole.py:952
+#: spyderlib\plugins\externalconsole.py:982
 msgid "Terminal"
 msgstr "Terminal"
 
-#: spyderlib\plugins\externalconsole.py:1071
+#: spyderlib\plugins\externalconsole.py:1101
 msgid "Open a Python &interpreter"
 msgstr "Ouvrir un &interpréteur Python"
 
-#: spyderlib\plugins\externalconsole.py:1074
+#: spyderlib\plugins\externalconsole.py:1104
 msgid "Open &command prompt"
 msgstr "Ouvrir un invite de &commandes"
 
-#: spyderlib\plugins\externalconsole.py:1075
+#: spyderlib\plugins\externalconsole.py:1105
 msgid "Open a Windows command prompt"
 msgstr "Ouvrir un invite de commandes Windows"
 
-#: spyderlib\plugins\externalconsole.py:1077
+#: spyderlib\plugins\externalconsole.py:1107
 msgid "Open &terminal"
 msgstr "Ouvrir un &terminal"
 
-#: spyderlib\plugins\externalconsole.py:1078
+#: spyderlib\plugins\externalconsole.py:1108
 msgid "Open a terminal window inside Spyder"
 msgstr "Ouvrir un terminal de commandes dans Spyder"
 
-#: spyderlib\plugins\externalconsole.py:1199
+#: spyderlib\plugins\externalconsole.py:1229
 #: spyderlib\widgets\projectexplorer.py:334
 msgid " and "
 msgstr " et "
 
-#: spyderlib\plugins\externalconsole.py:1204
+#: spyderlib\plugins\externalconsole.py:1234
 msgid "<br><u>Installed version</u>: %s"
 msgstr "<br><u>Version installée</u>: %s"
 
-#: spyderlib\plugins\externalconsole.py:1206
-#: spyderlib\plugins\ipythonconsole.py:56
-#: spyderlib\plugins\ipythonconsole.py:673
+#: spyderlib\plugins\externalconsole.py:1236
+#: spyderlib\plugins\ipythonconsole.py:59
+#: spyderlib\plugins\ipythonconsole.py:681
 msgid "IPython console"
 msgstr "Console IPython"
 
-#: spyderlib\plugins\externalconsole.py:1207
+#: spyderlib\plugins\externalconsole.py:1237
 msgid ""
 "Unable to open IPython console because no supported IPython version was "
 "found.<br><br><u>Supported IPython versions</u>: %s"
@@ -1626,12 +1632,12 @@ msgstr ""
 "Impossible d'ouvrir une console IPython car aucune version prise en charge "
 "n'est installée.<br><br><u>Versions IPython prises en charge</u>: %s"
 
-#: spyderlib\plugins\externalconsole.py:1228
-#: spyderlib\plugins\ipythonconsole.py:742
+#: spyderlib\plugins\externalconsole.py:1258
+#: spyderlib\plugins\ipythonconsole.py:750
 msgid "Open an IPython console"
 msgstr "Ouvrir une console IPython"
 
-#: spyderlib\plugins\externalconsole.py:1229
+#: spyderlib\plugins\externalconsole.py:1259
 msgid ""
 "The console monitor was disabled: the IPython kernel will be started as "
 "expected, but an IPython console will have to be connected manually to the "
@@ -1640,13 +1646,13 @@ msgstr ""
 "Le moniteur (console) a été désactivé. Par conséquent, le noyau IPython sera "
 "démarré mais la console IPython devra y être connectée manuellement."
 
-#: spyderlib\plugins\externalconsole.py:1265
-#: spyderlib\plugins\externalconsole.py:1278
-#: spyderlib\plugins\externalconsole.py:1282
+#: spyderlib\plugins\externalconsole.py:1295
+#: spyderlib\plugins\externalconsole.py:1308
+#: spyderlib\plugins\externalconsole.py:1312
 msgid "UMD"
 msgstr "UMD"
 
-#: spyderlib\plugins\externalconsole.py:1266
+#: spyderlib\plugins\externalconsole.py:1296
 msgid ""
 "UMD excluded modules:\n"
 "(example: guidata, guiqwt)"
@@ -1654,7 +1660,7 @@ msgstr ""
 "Modules non rechargés par l'UMD :\n"
 "(exemple: guidata, guiqwt)"
 
-#: spyderlib\plugins\externalconsole.py:1279
+#: spyderlib\plugins\externalconsole.py:1309
 msgid ""
 "The following modules are not installed on your machine:\n"
 "%s"
@@ -1662,7 +1668,7 @@ msgstr ""
 "Les modules suivants ne sont pas installés sur votre ordinateur :\n"
 "%s"
 
-#: spyderlib\plugins\externalconsole.py:1283
+#: spyderlib\plugins\externalconsole.py:1313
 msgid ""
 "Please note that these changes will be applied only to new Python/IPython "
 "interpreters"
@@ -1698,8 +1704,8 @@ msgstr "Taille de l'historique : "
 msgid "Scroll automatically to last entry"
 msgstr "Défiler automatiquement jusqu'à la dernière ligne"
 
-#: spyderlib\plugins\history.py:98 spyderlib\plugins\inspector.py:367
-#: spyderlib\plugins\ipythonconsole.py:482 spyderlib\widgets\editor.py:653
+#: spyderlib\plugins\history.py:98 spyderlib\plugins\inspector.py:368
+#: spyderlib\plugins\ipythonconsole.py:486 spyderlib\widgets\editor.py:653
 #: spyderlib\widgets\explorer.py:985
 #: spyderlib\widgets\externalshell\baseshell.py:150
 #: spyderlib\widgets\externalshell\namespacebrowser.py:220
@@ -1726,75 +1732,75 @@ msgstr "Historique"
 msgid "Maximum entries"
 msgstr "Nombre maximum d'entrées"
 
-#: spyderlib\plugins\inspector.py:52
+#: spyderlib\plugins\inspector.py:53
 msgid "Rich text help on the Object Inspector"
 msgstr "Texte enrichi dans l'inspecteur d'objets"
 
-#: spyderlib\plugins\inspector.py:107
+#: spyderlib\plugins\inspector.py:108
 msgid "Plain text font style"
 msgstr "Police d'écriture du texte brut"
 
-#: spyderlib\plugins\inspector.py:110
+#: spyderlib\plugins\inspector.py:111
 msgid "Rich text font style"
 msgstr "Police d'écriture du texte enrichi"
 
-#: spyderlib\plugins\inspector.py:112
+#: spyderlib\plugins\inspector.py:113
 msgid "Additional features"
 msgstr "Options supplémentaires"
 
-#: spyderlib\plugins\inspector.py:113
+#: spyderlib\plugins\inspector.py:114
 msgid "Render mathematical equations"
 msgstr "Styliser les équations mathématiques"
 
-#: spyderlib\plugins\inspector.py:119
+#: spyderlib\plugins\inspector.py:120
 msgid "This feature requires Sphinx 1.1 or superior."
 msgstr "Cette fonctionnalité nécessite l'installation de Sphinx 1.1+."
 
-#: spyderlib\plugins\inspector.py:121
+#: spyderlib\plugins\inspector.py:122
 msgid "Sphinx %s is currently installed."
 msgstr "Sphinx %s n'est pas installé."
 
-#: spyderlib\plugins\inspector.py:268
+#: spyderlib\plugins\inspector.py:269
 msgid "No documentation available"
 msgstr "Aucune documentation disponible"
 
-#: spyderlib\plugins\inspector.py:307
+#: spyderlib\plugins\inspector.py:308
 msgid "Source"
 msgstr "Source"
 
-#: spyderlib\plugins\inspector.py:322 spyderlib\widgets\dicteditor.py:161
+#: spyderlib\plugins\inspector.py:323 spyderlib\widgets\dicteditor.py:161
 msgid "Object"
 msgstr "Objet"
 
-#: spyderlib\plugins\inspector.py:337
+#: spyderlib\plugins\inspector.py:338
 msgid "Plain Text"
 msgstr "Texte brut"
 
-#: spyderlib\plugins\inspector.py:341
+#: spyderlib\plugins\inspector.py:342
 msgid "Show Source"
 msgstr "Afficher les sources"
 
-#: spyderlib\plugins\inspector.py:345
+#: spyderlib\plugins\inspector.py:346
 msgid "Rich Text"
 msgstr "Texte enrichi"
 
-#: spyderlib\plugins\inspector.py:355
+#: spyderlib\plugins\inspector.py:356
 msgid "Automatic import"
 msgstr "Import automatique"
 
-#: spyderlib\plugins\inspector.py:411 spyderlib\plugins\inspector.py:798
+#: spyderlib\plugins\inspector.py:412 spyderlib\plugins\inspector.py:799
 msgid "Object inspector"
 msgstr "Inspecteur d'objets"
 
-#: spyderlib\plugins\inspector.py:754
+#: spyderlib\plugins\inspector.py:755
 msgid "Lock"
 msgstr "Verrouiller"
 
-#: spyderlib\plugins\inspector.py:754
+#: spyderlib\plugins\inspector.py:755
 msgid "Unlock"
 msgstr "Déverrouiller"
 
-#: spyderlib\plugins\inspector.py:799
+#: spyderlib\plugins\inspector.py:800
 msgid ""
 "The following error occured when calling <b>Sphinx %s</b>. <br>Incompatible "
 "Sphinx version or doc string decoding failed.<br><br>Error message:<br>%s"
@@ -1803,19 +1809,19 @@ msgstr ""
 "<br>Veuillez vérifier si cette version de Sphinx est bien prise en charge "
 "par Spyder. <br><br>Message d'erreur :<br>%s"
 
-#: spyderlib\plugins\inspector.py:849
+#: spyderlib\plugins\inspector.py:850
 msgid "No source code available."
 msgstr "Aucun code source disponible."
 
-#: spyderlib\plugins\ipythonconsole.py:49
+#: spyderlib\plugins\ipythonconsole.py:52
 msgid "Symbolic mathematics for the IPython Console"
 msgstr "Mathématiques symboliques pour la console IPython"
 
-#: spyderlib\plugins\ipythonconsole.py:68
+#: spyderlib\plugins\ipythonconsole.py:71
 msgid "Display initial banner"
 msgstr "Afficher le message d'accueil"
 
-#: spyderlib\plugins\ipythonconsole.py:69
+#: spyderlib\plugins\ipythonconsole.py:72
 msgid ""
 "This option lets you hide the message shown at\n"
 "the top of the console when it's opened."
@@ -1823,19 +1829,19 @@ msgstr ""
 "Cette option permet de masquer la message d'accueil\n"
 "qui s'affiche à l'ouverture de la console."
 
-#: spyderlib\plugins\ipythonconsole.py:71
+#: spyderlib\plugins\ipythonconsole.py:74
 msgid "Use a completion widget"
 msgstr "Utiliser un widget de complétion de code"
 
-#: spyderlib\plugins\ipythonconsole.py:73
+#: spyderlib\plugins\ipythonconsole.py:76
 msgid "Use a widget instead of plain text output for tab completion"
 msgstr "Utiliser un widget de complétion au lieu d'une liste en texte brut"
 
-#: spyderlib\plugins\ipythonconsole.py:75
+#: spyderlib\plugins\ipythonconsole.py:78
 msgid "Use a pager to display additional text inside the console"
 msgstr "Utiliser un pager pour afficher l'aide"
 
-#: spyderlib\plugins\ipythonconsole.py:77
+#: spyderlib\plugins\ipythonconsole.py:80
 msgid ""
 "Useful if you don't want to fill the console with long help or completion "
 "texts.\n"
@@ -1844,19 +1850,19 @@ msgstr ""
 "Le pager permet d'éviter de remplir la console de texte d'aide.\n"
 "Note : utiliser la touche Q pour quitter le pager."
 
-#: spyderlib\plugins\ipythonconsole.py:81
+#: spyderlib\plugins\ipythonconsole.py:84
 msgid "Display balloon tips"
 msgstr "Afficher des info-bulles"
 
-#: spyderlib\plugins\ipythonconsole.py:82
+#: spyderlib\plugins\ipythonconsole.py:85
 msgid "Ask for confirmation before closing"
 msgstr "Demander confirmation avant de fermer une console"
 
-#: spyderlib\plugins\ipythonconsole.py:104
+#: spyderlib\plugins\ipythonconsole.py:107
 msgid "Buffer:  "
 msgstr "Tampon :  "
 
-#: spyderlib\plugins\ipythonconsole.py:106
+#: spyderlib\plugins\ipythonconsole.py:109
 msgid ""
 "Set the maximum number of lines of text shown in the\n"
 "console before truncation. Specifying -1 disables it\n"
@@ -1865,19 +1871,21 @@ msgstr ""
 "Nombre maximum de lignes de texte affichées dans la console avant troncature "
 "(saisir -1 désactive cette dernière, ce qui est fortement déconseillé)."
 
-#: spyderlib\plugins\ipythonconsole.py:115
-msgid "Support for graphics (Pylab)"
+#: spyderlib\plugins\ipythonconsole.py:118
+#, fuzzy
+msgid "Support for graphics (Matplotlib)"
 msgstr "Prise en charge des graphes (Pylab)"
 
-#: spyderlib\plugins\ipythonconsole.py:116
+#: spyderlib\plugins\ipythonconsole.py:119
 msgid "Activate support"
 msgstr "Activer"
 
-#: spyderlib\plugins\ipythonconsole.py:117
-msgid "Automatically load Pylab and NumPy"
+#: spyderlib\plugins\ipythonconsole.py:120
+#, fuzzy
+msgid "Automatically load Pylab and NumPy modules"
 msgstr "Importer automatiquement Pylab et NumPy"
 
-#: spyderlib\plugins\ipythonconsole.py:119
+#: spyderlib\plugins\ipythonconsole.py:123
 msgid ""
 "This lets you load graphics support without importing \n"
 "the commands to do plots. Useful to work with other\n"
@@ -1887,7 +1895,7 @@ msgstr ""
 "Import automatique de toutes les fonctions de représentation graphique et de "
 "calcul numérique"
 
-#: spyderlib\plugins\ipythonconsole.py:138
+#: spyderlib\plugins\ipythonconsole.py:142
 msgid ""
 "This feature requires the Matplotlib library.\n"
 "It seems you don't have it installed."
@@ -1895,19 +1903,19 @@ msgstr ""
 "Cette fonctionnalité nécessite l'installation du module Matplotlib.\n"
 "Ce dernier n'est apparemment pas installé."
 
-#: spyderlib\plugins\ipythonconsole.py:143
+#: spyderlib\plugins\ipythonconsole.py:147
 msgid "Inline"
 msgstr "En ligne"
 
-#: spyderlib\plugins\ipythonconsole.py:144
+#: spyderlib\plugins\ipythonconsole.py:148
 msgid "Automatic"
 msgstr "Automatique"
 
-#: spyderlib\plugins\ipythonconsole.py:145
+#: spyderlib\plugins\ipythonconsole.py:149
 msgid "Graphics backend"
 msgstr "Sortie graphique"
 
-#: spyderlib\plugins\ipythonconsole.py:146
+#: spyderlib\plugins\ipythonconsole.py:150
 msgid ""
 "Decide how graphics are going to be displayed in the console. If unsure, "
 "please select <b>%s</b> to put graphics inside the console or <b>%s</b> to "
@@ -1918,65 +1926,65 @@ msgstr ""
 "des graphes tandis que le mode <b>%s</b> permet d'interagir avec (zoom/pan) "
 "dans une fenêtre séparée."
 
-#: spyderlib\plugins\ipythonconsole.py:166
+#: spyderlib\plugins\ipythonconsole.py:170
 msgid "Backend:"
 msgstr "Sortie :"
 
-#: spyderlib\plugins\ipythonconsole.py:168
+#: spyderlib\plugins\ipythonconsole.py:172
 msgid "This option will be applied the next time a console is opened."
 msgstr ""
 "Cette option sera prise en compte lors de la prochaine ouverture de console."
 
-#: spyderlib\plugins\ipythonconsole.py:180
+#: spyderlib\plugins\ipythonconsole.py:184
 msgid "Inline backend"
 msgstr "Backend intégré"
 
-#: spyderlib\plugins\ipythonconsole.py:181
+#: spyderlib\plugins\ipythonconsole.py:185
 msgid "Decide how to render the figures created by this backend"
 msgstr "Option relative au rendu des figures dans ce backend"
 
-#: spyderlib\plugins\ipythonconsole.py:185
+#: spyderlib\plugins\ipythonconsole.py:189
 msgid "Format:"
 msgstr "Format :"
 
-#: spyderlib\plugins\ipythonconsole.py:188
+#: spyderlib\plugins\ipythonconsole.py:192
 msgid "Resolution:"
 msgstr "Résolution :"
 
-#: spyderlib\plugins\ipythonconsole.py:188
+#: spyderlib\plugins\ipythonconsole.py:192
 msgid "dpi"
 msgstr "ppp"
 
-#: spyderlib\plugins\ipythonconsole.py:190
+#: spyderlib\plugins\ipythonconsole.py:194
 msgid "Only used when the format is PNG. Default is 72"
 msgstr "Utilisé uniquement dans le cas du format PNG. Par défaut: 72"
 
-#: spyderlib\plugins\ipythonconsole.py:193
+#: spyderlib\plugins\ipythonconsole.py:197
 msgid "Width:"
 msgstr "Largeur :"
 
-#: spyderlib\plugins\ipythonconsole.py:193
 #: spyderlib\plugins\ipythonconsole.py:197
+#: spyderlib\plugins\ipythonconsole.py:201
 msgid "inches"
 msgstr "pouces"
 
-#: spyderlib\plugins\ipythonconsole.py:195
+#: spyderlib\plugins\ipythonconsole.py:199
 msgid "Default is 6"
 msgstr "Par défaut : 6"
 
-#: spyderlib\plugins\ipythonconsole.py:197
+#: spyderlib\plugins\ipythonconsole.py:201
 msgid "Height:"
 msgstr "Hauteur :"
 
-#: spyderlib\plugins\ipythonconsole.py:199
+#: spyderlib\plugins\ipythonconsole.py:203
 msgid "Default is 4"
 msgstr "Par défaut : 4"
 
-#: spyderlib\plugins\ipythonconsole.py:214
+#: spyderlib\plugins\ipythonconsole.py:218
 msgid "Run code"
 msgstr "Exécuter du code"
 
-#: spyderlib\plugins\ipythonconsole.py:215
+#: spyderlib\plugins\ipythonconsole.py:219
 msgid ""
 "You can run several lines of code when a console is started. Please "
 "introduce each one separated by commas, for example:<br><i>import os, import "
@@ -1986,38 +1994,38 @@ msgstr ""
 "console. Veuillez séparer deux lignes consécutives par une virgule - par "
 "exemple :<br><i>import os, import sys</i>"
 
-#: spyderlib\plugins\ipythonconsole.py:221
+#: spyderlib\plugins\ipythonconsole.py:225
 msgid "Lines:"
 msgstr "Lignes :"
 
-#: spyderlib\plugins\ipythonconsole.py:230
+#: spyderlib\plugins\ipythonconsole.py:234
 msgid "Run a file"
 msgstr "Exécuter un fichier"
 
-#: spyderlib\plugins\ipythonconsole.py:231
+#: spyderlib\plugins\ipythonconsole.py:235
 msgid ""
 "You can also run a whole file at startup instead of just some lines (This is "
 "similar to have a PYTHONSTARTUP file)."
 msgstr "Option similaire à PYTHONSTARTUP pour un interpréteur standard"
 
-#: spyderlib\plugins\ipythonconsole.py:235
+#: spyderlib\plugins\ipythonconsole.py:239
 msgid "Use the following file:"
 msgstr "Utiliser le fichier suivant :"
 
-#: spyderlib\plugins\ipythonconsole.py:249
+#: spyderlib\plugins\ipythonconsole.py:253
 msgid "Spyder startup"
 msgstr "Démarrage de Spyder"
 
-#: spyderlib\plugins\ipythonconsole.py:250
+#: spyderlib\plugins\ipythonconsole.py:254
 msgid "Open an IPython console at startup"
 msgstr "Ouvrir une console IPython au démarrage"
 
-#: spyderlib\plugins\ipythonconsole.py:258
+#: spyderlib\plugins\ipythonconsole.py:262
 #, fuzzy
 msgid "Greedy completion"
 msgstr "Entrée valide la complétion de code"
 
-#: spyderlib\plugins\ipythonconsole.py:259
+#: spyderlib\plugins\ipythonconsole.py:263
 msgid ""
 "Enable <tt>Tab</tt> completion on elements of lists, results of function "
 "calls, etc, <i>without</i> assigning them to a variable.<br>For example, you "
@@ -2025,66 +2033,66 @@ msgid ""
 "().<Tab></tt>"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:267
+#: spyderlib\plugins\ipythonconsole.py:271
 msgid "Use the greedy completer"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:278
+#: spyderlib\plugins\ipythonconsole.py:282
 msgid "Autocall"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:279
+#: spyderlib\plugins\ipythonconsole.py:283
 msgid ""
 "Autocall makes IPython automatically call any callable object even if you "
 "didn't type explicit parentheses.<br>For example, if you type <i>str 43</i> "
 "it becomes <i>str(43)</i> automatically."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:286
+#: spyderlib\plugins\ipythonconsole.py:290
 #, fuzzy
 msgid "Smart"
 msgstr "Démarrage"
 
-#: spyderlib\plugins\ipythonconsole.py:287
+#: spyderlib\plugins\ipythonconsole.py:291
 msgid "Full"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:288
+#: spyderlib\plugins\ipythonconsole.py:292
 msgid "Off"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:290
+#: spyderlib\plugins\ipythonconsole.py:294
 msgid "Autocall:  "
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:291
+#: spyderlib\plugins\ipythonconsole.py:295
 msgid ""
 "On <b>%s</b> mode, Autocall is not applied if there are no arguments after "
 "the callable. On <b>%s</b> mode, all callable objects are automatically "
 "called (even if no arguments are present)."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:303
+#: spyderlib\plugins\ipythonconsole.py:307
 msgid "Symbolic Mathematics"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:304
+#: spyderlib\plugins\ipythonconsole.py:308
 msgid ""
 "Perfom symbolic operations in the console (e.g. integrals, derivatives, "
 "vector calculus, etc) and get the outputs in a beautifully printed style."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:309
+#: spyderlib\plugins\ipythonconsole.py:313
 msgid "Use symbolic math"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:310
+#: spyderlib\plugins\ipythonconsole.py:314
 msgid ""
 "This option loads the Sympy library to work with.<br>Please refer to its "
 "documentation to learn how to use it."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:323
+#: spyderlib\plugins\ipythonconsole.py:327
 msgid ""
 "This feature requires the Sympy library.\n"
 "It seems you don't have it installed."
@@ -2092,84 +2100,84 @@ msgstr ""
 "Cette fonctionnalité nécessite l'installation du module Sympy.\n"
 "Ce dernier n'est apparemment pas installé."
 
-#: spyderlib\plugins\ipythonconsole.py:328
+#: spyderlib\plugins\ipythonconsole.py:332
 #, fuzzy
 msgid "Prompts"
 msgstr "Propriétés"
 
-#: spyderlib\plugins\ipythonconsole.py:329
+#: spyderlib\plugins\ipythonconsole.py:333
 msgid "Modify how Input and Output prompts are shown in the console."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:332
+#: spyderlib\plugins\ipythonconsole.py:336
 #, fuzzy
 msgid "Input prompt:"
 msgstr "Copier sans les préfixes"
 
-#: spyderlib\plugins\ipythonconsole.py:334
+#: spyderlib\plugins\ipythonconsole.py:338
 msgid ""
 "Default is<br>In [<span class=\"in-prompt-number\">%i</span>]:"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:338
+#: spyderlib\plugins\ipythonconsole.py:342
 msgid "Output prompt:"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:340
+#: spyderlib\plugins\ipythonconsole.py:344
 msgid ""
 "Default is<br>Out[<span class=\"out-prompt-number\">%i</span>]:"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:356
+#: spyderlib\plugins\ipythonconsole.py:360
 msgid "Graphics"
 msgstr "Graphiques"
 
-#: spyderlib\plugins\ipythonconsole.py:360
+#: spyderlib\plugins\ipythonconsole.py:364
 msgid "Advanced Settings"
 msgstr "Options avancées"
 
-#: spyderlib\plugins\ipythonconsole.py:443
+#: spyderlib\plugins\ipythonconsole.py:447
 msgid "Interrupt kernel"
 msgstr "Interrompre le noyau"
 
-#: spyderlib\plugins\ipythonconsole.py:446
+#: spyderlib\plugins\ipythonconsole.py:450
 msgid "Restart kernel"
 msgstr "Redémarrer le noyau"
 
-#: spyderlib\plugins\ipythonconsole.py:451
+#: spyderlib\plugins\ipythonconsole.py:455
 msgid "Intro to IPython"
 msgstr "Introduction à IPython"
 
-#: spyderlib\plugins\ipythonconsole.py:453
+#: spyderlib\plugins\ipythonconsole.py:457
 msgid "Quick Reference"
 msgstr "Documentation de IPython"
 
-#: spyderlib\plugins\ipythonconsole.py:455
+#: spyderlib\plugins\ipythonconsole.py:459
 msgid "Console help"
 msgstr "Aide sur la console"
 
-#: spyderlib\plugins\ipythonconsole.py:457
+#: spyderlib\plugins\ipythonconsole.py:461
 #: spyderlib\widgets\internalshell.py:253
 msgid "Help"
 msgstr "Aide"
 
-#: spyderlib\plugins\ipythonconsole.py:458
+#: spyderlib\plugins\ipythonconsole.py:462
 msgid "IPython Help"
 msgstr "Aide IPython"
 
-#: spyderlib\plugins\ipythonconsole.py:494
+#: spyderlib\plugins\ipythonconsole.py:498
 msgid "Inspect current object"
 msgstr "Inspecter l'onglet courant"
 
-#: spyderlib\plugins\ipythonconsole.py:498
+#: spyderlib\plugins\ipythonconsole.py:502
 msgid "Clear line or block"
 msgstr "Effacer la ligne ou le bloc"
 
-#: spyderlib\plugins\ipythonconsole.py:502
+#: spyderlib\plugins\ipythonconsole.py:506
 msgid "Clear console"
 msgstr "Effacer la console"
 
-#: spyderlib\plugins\ipythonconsole.py:541
+#: spyderlib\plugins\ipythonconsole.py:545
 msgid ""
 "It seems the kernel died unexpectedly. Use 'Restart kernel' to continue "
 "using this console."
@@ -2177,19 +2185,19 @@ msgstr ""
 "Le noyau a été arrêté de façon inattendue. Redémarrez le noyau pour "
 "continuer d'utiliser cette console."
 
-#: spyderlib\plugins\ipythonconsole.py:553
+#: spyderlib\plugins\ipythonconsole.py:557
 msgid "Kernel process is either remote or unspecified. Cannot interrupt"
 msgstr ""
 "Le processus du noyau est soit distant, soit non spécifié : impossible "
 "d'arrêter le noyau."
 
-#: spyderlib\plugins\ipythonconsole.py:562
+#: spyderlib\plugins\ipythonconsole.py:566
 msgid "Kernel process is either remote or unspecified. Cannot restart."
 msgstr ""
 "Le processus du noyau est soit distant, soit non spécifié : impossible de "
 "redémarrer le noyau."
 
-#: spyderlib\plugins\ipythonconsole.py:723
+#: spyderlib\plugins\ipythonconsole.py:731
 msgid ""
 "No IPython console is currently available to run <b>%s</b>.<br><br>Please "
 "open a new one and try again."
@@ -2197,32 +2205,32 @@ msgstr ""
 "Aucun client IPython n'est actuellement sélectionné pour exécuter <b>%s</b>."
 "<br><br>Merci d'ouvrir un nouveau client IPython et de réessayer."
 
-#: spyderlib\plugins\ipythonconsole.py:747
+#: spyderlib\plugins\ipythonconsole.py:755
 msgid "Connect to an existing kernel"
 msgstr "Connecter à un noyau existant"
 
-#: spyderlib\plugins\ipythonconsole.py:749
+#: spyderlib\plugins\ipythonconsole.py:757
 msgid "Open a new IPython client connected to an external kernel"
 msgstr "Ouvrir un nouveau client IPython connecté à un noyau externe"
 
-#: spyderlib\plugins\ipythonconsole.py:859
+#: spyderlib\plugins\ipythonconsole.py:891
 msgid "(for example: `kernel-3764.json`, or simply `3764`)"
 msgstr "(exemple: `kernel-3764.json`, ou simplement `3764`)"
 
-#: spyderlib\plugins\ipythonconsole.py:861
-#: spyderlib\plugins\ipythonconsole.py:901
+#: spyderlib\plugins\ipythonconsole.py:893
+#: spyderlib\plugins\ipythonconsole.py:933
 msgid "IPython"
 msgstr "IPython"
 
-#: spyderlib\plugins\ipythonconsole.py:862
+#: spyderlib\plugins\ipythonconsole.py:894
 msgid "Provide an IPython kernel connection file:"
 msgstr "Fichier de connexion du noyau IPython :"
 
-#: spyderlib\plugins\ipythonconsole.py:902
+#: spyderlib\plugins\ipythonconsole.py:934
 msgid "Unable to connect to IPython kernel <b>`%s`"
 msgstr "Impossible de se connecter au noyau IPython <b>`%s`"
 
-#: spyderlib\plugins\ipythonconsole.py:1096
+#: spyderlib\plugins\ipythonconsole.py:1138
 msgid ""
 "%s will be closed.\n"
 "Do you want to kill the associated kernel and all of its clients?"
@@ -2230,11 +2238,11 @@ msgstr ""
 "%s va être fermé.\n"
 "Souhaitez-vous fermer également le noyau associé et tous ses autres clients ?"
 
-#: spyderlib\plugins\ipythonconsole.py:1142
+#: spyderlib\plugins\ipythonconsole.py:1184
 msgid "Are you sure you want to restart the kernel?"
 msgstr "Souhaitez-vous vraiment redémarrer le noyau ?"
 
-#: spyderlib\plugins\ipythonconsole.py:1144
+#: spyderlib\plugins\ipythonconsole.py:1186
 msgid "Restart kernel?"
 msgstr "Redémarrer le noyau"
 
@@ -2337,7 +2345,7 @@ msgstr ""
 "dialogue <b>%s</b> (voir le menu <b>%s</b>)"
 
 #: spyderlib\plugins\runconfig.py:458
-#: spyderlib\widgets\externalshell\pythonshell.py:292
+#: spyderlib\widgets\externalshell\pythonshell.py:295
 msgid "Working directory"
 msgstr "Répertoire de travail"
 
@@ -2522,11 +2530,6 @@ msgstr "le répertoire du fichier en cours d'édition"
 msgid "the global working directory"
 msgstr "le répertoire de travail global"
 
-#: spyderlib\plugins\workingdirectory.py:81 spyderlib\widgets\explorer.py:611
-#: spyderlib\widgets\explorer.py:618
-msgid "New file"
-msgstr "Nouveau fichier"
-
 #: spyderlib\plugins\workingdirectory.py:82
 msgid "Files are created in:"
 msgstr "Les fichiers sont créés dans :"
@@ -2607,7 +2610,7 @@ msgstr "WinPython"
 msgid "Numpy and Scipy documentation"
 msgstr "Documentation de Numpy et Scipy"
 
-#: spyderlib\spyder.py:254 spyderlib\spyder.py:908
+#: spyderlib\spyder.py:254 spyderlib\spyder.py:915
 msgid "Matplotlib documentation"
 msgstr "Documentation de Matplotlib"
 
@@ -2631,106 +2634,106 @@ msgstr "Enregistrer la session et quitter..."
 msgid "Save current session and quit application"
 msgstr "Enregistrer la session en cours et quitter l'application"
 
-#: spyderlib\spyder.py:407
+#: spyderlib\spyder.py:409
 msgid "Initializing..."
 msgstr "Initialisation..."
 
-#: spyderlib\spyder.py:468
+#: spyderlib\spyder.py:470
 msgid "Close current dockwidget"
 msgstr "Fermer le panneau actif"
 
-#: spyderlib\spyder.py:474
+#: spyderlib\spyder.py:476
 msgid "&Find text"
 msgstr "Rec&hercher"
 
-#: spyderlib\spyder.py:480
+#: spyderlib\spyder.py:482
 msgid "Find &next"
 msgstr "Rechercher le &suivant"
 
-#: spyderlib\spyder.py:486
+#: spyderlib\spyder.py:488
 msgid "Find &previous"
 msgstr "Rechercher le &précédent"
 
-#: spyderlib\spyder.py:491
+#: spyderlib\spyder.py:493
 msgid "&Replace text"
 msgstr "&Remplacer"
 
-#: spyderlib\spyder.py:506 spyderlib\widgets\sourcecode\codeeditor.py:2192
+#: spyderlib\spyder.py:508 spyderlib\widgets\sourcecode\codeeditor.py:2192
 msgid "Undo"
 msgstr "Annuler"
 
-#: spyderlib\spyder.py:508 spyderlib\widgets\sourcecode\codeeditor.py:2195
+#: spyderlib\spyder.py:510 spyderlib\widgets\sourcecode\codeeditor.py:2195
 msgid "Redo"
 msgstr "Répéter"
 
-#: spyderlib\spyder.py:509 spyderlib\widgets\arrayeditor.py:325
+#: spyderlib\spyder.py:511 spyderlib\widgets\arrayeditor.py:325
 #: spyderlib\widgets\dicteditor.py:562 spyderlib\widgets\shell.py:118
 #: spyderlib\widgets\sourcecode\codeeditor.py:2201
 msgid "Copy"
 msgstr "Copier"
 
-#: spyderlib\spyder.py:511 spyderlib\widgets\shell.py:114
+#: spyderlib\spyder.py:513 spyderlib\widgets\shell.py:114
 #: spyderlib\widgets\sourcecode\codeeditor.py:2198
 msgid "Cut"
 msgstr "Couper"
 
-#: spyderlib\spyder.py:512 spyderlib\widgets\dicteditor.py:559
+#: spyderlib\spyder.py:514 spyderlib\widgets\dicteditor.py:559
 #: spyderlib\widgets\shell.py:122
 #: spyderlib\widgets\sourcecode\codeeditor.py:2204
 msgid "Paste"
 msgstr "Coller"
 
-#: spyderlib\spyder.py:514 spyderlib\widgets\explorer.py:452
+#: spyderlib\spyder.py:516 spyderlib\widgets\explorer.py:452
 #: spyderlib\widgets\projectexplorer.py:1000 spyderlib\widgets\shell.py:131
 #: spyderlib\widgets\sourcecode\codeeditor.py:2207
 msgid "Delete"
 msgstr "Supprimer"
 
-#: spyderlib\spyder.py:517 spyderlib\widgets\shell.py:135
+#: spyderlib\spyder.py:519 spyderlib\widgets\shell.py:135
 #: spyderlib\widgets\sourcecode\codeeditor.py:2211
 msgid "Select All"
 msgstr "Sélectionner tout"
 
-#: spyderlib\spyder.py:564
+#: spyderlib\spyder.py:567
 msgid "&Interpreters"
 msgstr "&Interpréteurs"
 
-#: spyderlib\spyder.py:570
+#: spyderlib\spyder.py:573
 msgid "&View"
 msgstr "&Affichage"
 
-#: spyderlib\spyder.py:578
+#: spyderlib\spyder.py:581
 msgid "Welcome to Spyder!"
 msgstr "Bienvenue dans Spyder !"
 
-#: spyderlib\spyder.py:582
+#: spyderlib\spyder.py:585
 msgid "Pre&ferences"
 msgstr "Pré&férences"
 
-#: spyderlib\spyder.py:588 spyderlib\widgets\pathmanager.py:44
+#: spyderlib\spyder.py:593 spyderlib\widgets\pathmanager.py:44
 #: spyderlib\widgets\projectexplorer.py:593
 msgid "PYTHONPATH manager"
 msgstr "Gestionnaire de PYTHONPATH"
 
-#: spyderlib\spyder.py:591
-msgid "Open Spyder path manager"
-msgstr "Ouvre le gestionnaire de chemin d'accès de Spyder"
+#: spyderlib\spyder.py:596
+msgid "Python Path Manager"
+msgstr ""
 
-#: spyderlib\spyder.py:594
+#: spyderlib\spyder.py:599
 msgid "Update module names list"
 msgstr "Mise à jour de la liste des modules"
 
-#: spyderlib\spyder.py:597
+#: spyderlib\spyder.py:602
 msgid "Refresh list of module names available in PYTHONPATH"
 msgstr ""
 "Mise à jour de la liste des modules disponibles notamment à travers "
 "PYTHONPATH"
 
-#: spyderlib\spyder.py:603
+#: spyderlib\spyder.py:608
 msgid "Current user environment variables..."
 msgstr "Variables d'environnement de l'utilisateur..."
 
-#: spyderlib\spyder.py:605
+#: spyderlib\spyder.py:610
 msgid ""
 "Show and edit current user environment variables in Windows registry (i.e. "
 "for all sessions)"
@@ -2738,183 +2741,183 @@ msgstr ""
 "Afficher et modifier les variables d'environnement de l'utilisateur courant "
 "dans Windows (c'est-à-dire directement dans la base de registre)"
 
-#: spyderlib\spyder.py:612 spyderlib\spyder.py:983
+#: spyderlib\spyder.py:617 spyderlib\spyder.py:990
 msgid "External Tools"
 msgstr "Outils externes"
 
-#: spyderlib\spyder.py:616
+#: spyderlib\spyder.py:621
 msgid "Python(x,y) launcher"
 msgstr "Accueil de Python(x,y)"
 
-#: spyderlib\spyder.py:627
+#: spyderlib\spyder.py:632
 msgid "WinPython control panel"
 msgstr "Panneau de contrôle WinPython"
 
-#: spyderlib\spyder.py:640
+#: spyderlib\spyder.py:645
 msgid "Qt Designer"
 msgstr "Qt Designer"
 
-#: spyderlib\spyder.py:645
+#: spyderlib\spyder.py:650
 msgid "Qt Linguist"
 msgstr "Qt Linguist"
 
-#: spyderlib\spyder.py:651
+#: spyderlib\spyder.py:656
 msgid "Qt examples"
 msgstr "Exemples Qt"
 
-#: spyderlib\spyder.py:667
+#: spyderlib\spyder.py:672
 msgid "guidata examples"
 msgstr "Exemples guidata"
 
-#: spyderlib\spyder.py:675
+#: spyderlib\spyder.py:680
 msgid "guiqwt examples"
 msgstr "Exemples guiqwt"
 
-#: spyderlib\spyder.py:680
+#: spyderlib\spyder.py:685
 msgid "Sift"
 msgstr "Sift"
 
-#: spyderlib\spyder.py:688
+#: spyderlib\spyder.py:693
 msgid "ViTables"
 msgstr "ViTables"
 
-#: spyderlib\spyder.py:702
+#: spyderlib\spyder.py:707
 msgid "Fullscreen mode"
 msgstr "Mode plein écran"
 
-#: spyderlib\spyder.py:712
+#: spyderlib\spyder.py:719
 msgid "Main toolbar"
 msgstr "Barre d'outil principale"
 
-#: spyderlib\spyder.py:729
+#: spyderlib\spyder.py:736
 msgid "Loading object inspector..."
 msgstr "Chargement de l'inspecteur d'objet..."
 
-#: spyderlib\spyder.py:735
+#: spyderlib\spyder.py:742
 msgid "Loading outline explorer..."
 msgstr "Chargement de l'explorateur de structure..."
 
-#: spyderlib\spyder.py:742
+#: spyderlib\spyder.py:749
 msgid "Loading editor..."
 msgstr "Chargement de l'éditeur..."
 
-#: spyderlib\spyder.py:764
+#: spyderlib\spyder.py:771
 msgid "Loading file explorer..."
 msgstr "Chargement de l'explorateur de fichiers..."
 
-#: spyderlib\spyder.py:770
+#: spyderlib\spyder.py:777
 msgid "Loading history plugin..."
 msgstr "Chargement du journal d'historique..."
 
-#: spyderlib\spyder.py:776
+#: spyderlib\spyder.py:783
 msgid "Loading online help..."
 msgstr "Chargement de l'aide en ligne..."
 
-#: spyderlib\spyder.py:782
+#: spyderlib\spyder.py:789
 msgid "Loading project explorer..."
 msgstr "Chargement de l'explorateur de projet..."
 
-#: spyderlib\spyder.py:792
+#: spyderlib\spyder.py:799
 msgid "Loading external console..."
 msgstr "Chargement de la console externe..."
 
-#: spyderlib\spyder.py:800
+#: spyderlib\spyder.py:807
 msgid "Loading namespace browser..."
 msgstr "Chargement de l'explorateur d'espace de noms..."
 
-#: spyderlib\spyder.py:809
+#: spyderlib\spyder.py:816
 msgid "Loading IPython console..."
 msgstr "Chargement de la console IPython..."
 
-#: spyderlib\spyder.py:820
+#: spyderlib\spyder.py:827
 msgid "Setting up main window..."
 msgstr "Configuration de la fenêtre principale..."
 
-#: spyderlib\spyder.py:824
+#: spyderlib\spyder.py:831
 msgid "About %s..."
 msgstr "À propos de %s..."
 
-#: spyderlib\spyder.py:827
+#: spyderlib\spyder.py:834
 msgid "Optional dependencies..."
 msgstr "Dépendances optionnelles..."
 
-#: spyderlib\spyder.py:831
+#: spyderlib\spyder.py:838
 msgid "Report issue..."
 msgstr "Rapport d'erreur..."
 
-#: spyderlib\spyder.py:852
+#: spyderlib\spyder.py:859
 msgid "Spyder documentation"
 msgstr "Documentation de Spyder"
 
-#: spyderlib\spyder.py:858
+#: spyderlib\spyder.py:865
 msgid "Python documentation"
 msgstr "Documentation de Python"
 
-#: spyderlib\spyder.py:864
+#: spyderlib\spyder.py:871
 msgid "Qt Assistant"
 msgstr "Qt Assistant (documentation Qt)"
 
-#: spyderlib\spyder.py:898
+#: spyderlib\spyder.py:905
 msgid "Python(x,y) documentation folder"
 msgstr "Dossier de documentation Python(x,y)"
 
-#: spyderlib\spyder.py:900
+#: spyderlib\spyder.py:907
 msgid "IPython documentation"
 msgstr "Documentation de IPython"
 
-#: spyderlib\spyder.py:902
+#: spyderlib\spyder.py:909
 msgid "guidata documentation"
 msgstr "Documentation de guidata"
 
-#: spyderlib\spyder.py:905
+#: spyderlib\spyder.py:912
 msgid "guiqwt documentation"
 msgstr "Documentation de guiqwt"
 
-#: spyderlib\spyder.py:911
+#: spyderlib\spyder.py:918
 msgid "NumPy documentation"
 msgstr "Documentation de NumPy"
 
-#: spyderlib\spyder.py:913
+#: spyderlib\spyder.py:920
 msgid "NumPy reference guide"
 msgstr "Manuel de référence de NumPy"
 
-#: spyderlib\spyder.py:915
+#: spyderlib\spyder.py:922
 msgid "NumPy user guide"
 msgstr "Manuel de l'utilisateur de NumPy"
 
-#: spyderlib\spyder.py:917
+#: spyderlib\spyder.py:924
 msgid "SciPy documentation"
 msgstr "Documentation de SciPy"
 
-#: spyderlib\spyder.py:924
+#: spyderlib\spyder.py:931
 msgid "Web Resources"
 msgstr "Documentation en ligne"
 
-#: spyderlib\spyder.py:945
+#: spyderlib\spyder.py:952
 msgid "Windows and toolbars"
 msgstr "Fenêtres et barres d'outils"
 
-#: spyderlib\spyder.py:949
+#: spyderlib\spyder.py:956
 msgid "Reset window layout"
 msgstr "Réinitialiser la disposition des fenêtres"
 
-#: spyderlib\spyder.py:951
+#: spyderlib\spyder.py:958
 msgid "Custom window layouts"
 msgstr "Dispositions de fenêtres personnalisées"
 
-#: spyderlib\spyder.py:957
+#: spyderlib\spyder.py:964
 msgid "Switch to/from layout %d"
 msgstr "Basculer vers/depuis la disposition %d"
 
-#: spyderlib\spyder.py:963
+#: spyderlib\spyder.py:970
 msgid "Set layout %d"
 msgstr "Définir la disposition %d"
 
-#: spyderlib\spyder.py:973
+#: spyderlib\spyder.py:980
 msgid "Attached console window (debugging)"
 msgstr "Invite de commandes attaché (débogage)"
 
-#: spyderlib\spyder.py:1231
+#: spyderlib\spyder.py:1239
 msgid ""
 "Window layout will be reset to default settings: this affects window "
 "position, size and dockwidgets.\n"
@@ -2924,55 +2927,46 @@ msgstr ""
 "défaut.\n"
 "Souhaitez-vous continuer ?"
 
-#: spyderlib\spyder.py:1249
+#: spyderlib\spyder.py:1257
 msgid "Quick switch layout #%d has not yet been defined."
 msgstr ""
 "La disposition de fenêtre personnalisée n°%d n'a pas encore été définie."
 
-#: spyderlib\spyder.py:1440
+#: spyderlib\spyder.py:1448 spyderlib\spyder.py:1449
 msgid "Maximize current plugin"
 msgstr "Agrandir la fenêtre courante"
 
-#: spyderlib\spyder.py:1441
-msgid "Maximize current plugin to fit the whole application window"
-msgstr ""
-"Agrandir la fenêtre courante sur toute la surface de la fenêtre principale"
-
-#: spyderlib\spyder.py:1445
+#: spyderlib\spyder.py:1452
 msgid "Restore current plugin"
 msgstr "Réduire la fenêtre courante"
 
-#: spyderlib\spyder.py:1446
-msgid ""
-"Restore current plugin to its original size and position within the "
-"application window"
+#: spyderlib\spyder.py:1453
+msgid "Restore plugin to its original size"
 msgstr ""
-"Réduire la fenêtre courante à sa taille et position d'origine au sein de la "
-"fenêtre principale"
 
-#: spyderlib\spyder.py:1518
+#: spyderlib\spyder.py:1524
 msgid "(not installed)"
 msgstr "(non installé)"
 
-#: spyderlib\spyder.py:1536
+#: spyderlib\spyder.py:1542
 msgid "About %s"
 msgstr "À propos de %s"
 
-#: spyderlib\spyder.py:1697
+#: spyderlib\spyder.py:1703
 msgid "Running an external system terminal is not supported on platform %s."
 msgstr ""
 "L'exécution dans un terminal système externe n'est pas prise en charge sur "
 "la plateforme %s."
 
-#: spyderlib\spyder.py:1894
+#: spyderlib\spyder.py:1900
 msgid "Open session"
 msgstr "Ouvrir une session"
 
-#: spyderlib\spyder.py:1895 spyderlib\spyder.py:1906
+#: spyderlib\spyder.py:1901 spyderlib\spyder.py:1912
 msgid "Spyder sessions"
 msgstr "Sessions Spyder"
 
-#: spyderlib\spyder.py:1905
+#: spyderlib\spyder.py:1911
 msgid "Save session"
 msgstr "Enregistrer la session"
 
@@ -3097,7 +3091,7 @@ msgstr "Format de flottant"
 
 #: spyderlib\widgets\arrayeditor.py:426 spyderlib\widgets\explorer.py:548
 #: spyderlib\widgets\explorer.py:645
-#: spyderlib\widgets\externalshell\pythonshell.py:521
+#: spyderlib\widgets\externalshell\pythonshell.py:520
 #: spyderlib\widgets\externalshell\systemshell.py:91
 msgid "Error"
 msgstr "Erreur"
@@ -3213,34 +3207,40 @@ msgstr ""
 "veuillez entrer un chemin d'accès correct,\n"
 "puis appuyer sur Entrée pour le valider"
 
-#: spyderlib\widgets\dependencies.py:59
+#: spyderlib\widgets\dependencies.py:60
 msgid " Required "
 msgstr "  Requis  "
 
-#: spyderlib\widgets\dependencies.py:59
+#: spyderlib\widgets\dependencies.py:60
 msgid "Module"
 msgstr "Module"
 
-#: spyderlib\widgets\dependencies.py:60
+#: spyderlib\widgets\dependencies.py:61
 msgid " Installed "
 msgstr "  Installé  "
 
-#: spyderlib\widgets\dependencies.py:60
+#: spyderlib\widgets\dependencies.py:61
 msgid "Provided features"
 msgstr "Fonctionnalités associées"
 
-#: spyderlib\widgets\dependencies.py:126
+#: spyderlib\widgets\dependencies.py:127
 msgid "Optional Dependencies"
 msgstr "Dépendances optionnelles"
 
-#: spyderlib\widgets\dependencies.py:131
+#: spyderlib\widgets\dependencies.py:134
 msgid ""
 "Spyder depends on several Python modules to provide additional functionality "
 "for its plugins. The table below shows the required and installed versions "
 "(if any) of all of them.<br><br>Although Spyder can work without any of "
 "these modules, it's strongly recommended that at least you try to install <b>"
 "%s</b> and <b>%s</b> to have a much better experience."
-msgstr "Spyder dépend de nombreux modules Python pour disposer de l'intégralité des fonctionnalités potentiellement fournies par ses plugins. Le tableau suivant montre les versions requises et installées (le cas échéant) de toutes ces dépendances.<br><br>Même si Spyder est parfaitement fonctionnel sans tout ces modules, il est néanmoins fortement recommandé d'installer au minimum <b>%s</b> et <b>%s</b> afin de bénéficier des fonctionnalités les plus avancées."
+msgstr ""
+"Spyder dépend de nombreux modules Python pour disposer de l'intégralité des "
+"fonctionnalités potentiellement fournies par ses plugins. Le tableau suivant "
+"montre les versions requises et installées (le cas échéant) de toutes ces "
+"dépendances.<br><br>Même si Spyder est parfaitement fonctionnel sans tout "
+"ces modules, il est néanmoins fortement recommandé d'installer au minimum <b>"
+"%s</b> et <b>%s</b> afin de bénéficier des fonctionnalités les plus avancées."
 
 #: spyderlib\widgets\dependencies.py:149
 msgid "Copy to clipboard"
@@ -3511,11 +3511,11 @@ msgstr ""
 "<b>%s</b> contient des caractères de fin de ligne mélangés.<br>Spyder va "
 "corriger ceci automatiquement."
 
-#: spyderlib\widgets\editor.py:2249
+#: spyderlib\widgets\editor.py:2250
 msgid "Close window"
 msgstr "Fermer la fenêtre"
 
-#: spyderlib\widgets\editor.py:2251
+#: spyderlib\widgets\editor.py:2252
 msgid "Close this window"
 msgstr "Fermer cette fenêtre d'édition"
 
@@ -3819,19 +3819,19 @@ msgstr ""
 "<b>Impossible d'enregistrer l'espace de travail</b><br><br>Message d'erreur :"
 "<br>%s"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:265
+#: spyderlib\widgets\externalshell\pythonshell.py:268
 msgid "Variables"
 msgstr "Variables"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:266
+#: spyderlib\widgets\externalshell\pythonshell.py:269
 msgid "Show/hide global variables explorer"
 msgstr "Afficher/masquer l'explorateur de variables globales"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:270
+#: spyderlib\widgets\externalshell\pythonshell.py:273
 msgid "Terminate"
 msgstr "Quitter"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:271
+#: spyderlib\widgets\externalshell\pythonshell.py:274
 msgid ""
 "Attempts to terminate the process.\n"
 "The process may not exit as a result of clicking this button\n"
@@ -3841,40 +3841,40 @@ msgstr ""
 "Le processus peut ne pas s'arrêter suite à cette tentative,\n"
 "mais cela permet au programme en cours de quitter proprement."
 
-#: spyderlib\widgets\externalshell\pythonshell.py:283
+#: spyderlib\widgets\externalshell\pythonshell.py:286
 msgid "Interact"
 msgstr "Interagir"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:285
+#: spyderlib\widgets\externalshell\pythonshell.py:288
 msgid "Debug"
 msgstr "Déboguer"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:287
-#: spyderlib\widgets\externalshell\pythonshell.py:350
+#: spyderlib\widgets\externalshell\pythonshell.py:290
+#: spyderlib\widgets\externalshell\pythonshell.py:353
 msgid "Arguments..."
 msgstr "Arguments..."
 
-#: spyderlib\widgets\externalshell\pythonshell.py:294
+#: spyderlib\widgets\externalshell\pythonshell.py:297
 msgid "Set current working directory"
 msgstr "Changer le répertoire de travail"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:296
+#: spyderlib\widgets\externalshell\pythonshell.py:299
 msgid "Environment variables"
 msgstr "Variables d'environnement"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:300
+#: spyderlib\widgets\externalshell\pythonshell.py:303
 msgid "Show sys.path contents"
 msgstr "Afficher le contenu de sys.path"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:346
+#: spyderlib\widgets\externalshell\pythonshell.py:349
 msgid "Arguments: %s"
 msgstr "Arguments : %s"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:348
+#: spyderlib\widgets\externalshell\pythonshell.py:351
 msgid "No argument"
 msgstr "Aucun argument"
 
-#: spyderlib\widgets\externalshell\pythonshell.py:522
+#: spyderlib\widgets\externalshell\pythonshell.py:521
 #: spyderlib\widgets\externalshell\systemshell.py:92
 msgid "Process failed to start"
 msgstr "Le processus n'a pas pu démarrer"
@@ -4597,6 +4597,38 @@ msgstr "Fermer l'onglet"
 msgid "Text editor"
 msgstr "Éditeur de texte"
 
+#~ msgid "Create a new Python script"
+#~ msgstr "Créer un nouveau script Python"
+
+#~ msgid "Open text file"
+#~ msgstr "Ouvrir un fichier texte"
+
+#~ msgid "Save current file"
+#~ msgstr "Enregistrer le fichier en cours d'édition"
+
+#~ msgid ""
+#~ "Run current cell \n"
+#~ "(see Editor documentation \n"
+#~ "for more details on cells)"
+#~ msgstr ""
+#~ "Exécuter la cellule en cours d'édition\n"
+#~ "(voir la documentation de l'Editeur, pour plus de détails sur les "
+#~ "cellules)"
+
+#~ msgid "Open Spyder path manager"
+#~ msgstr "Ouvre le gestionnaire de chemin d'accès de Spyder"
+
+#~ msgid "Maximize current plugin to fit the whole application window"
+#~ msgstr ""
+#~ "Agrandir la fenêtre courante sur toute la surface de la fenêtre principale"
+
+#~ msgid ""
+#~ "Restore current plugin to its original size and position within the "
+#~ "application window"
+#~ msgstr ""
+#~ "Réduire la fenêtre courante à sa taille et position d'origine au sein de "
+#~ "la fenêtre principale"
+
 #, fuzzy
 #~ msgid ""
 #~ "Run current cell \n"
diff --git a/spyderlib/locale/spyderlib.pot b/spyderlib/locale/spyderlib.pot
old mode 100644
new mode 100755
index 4433ebe..0c966ce
--- a/spyderlib/locale/spyderlib.pot
+++ b/spyderlib/locale/spyderlib.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-08-20 13:51+Paris, Madrid (heure d��t�)\n"
+"POT-Creation-Date: 2013-09-04 20:58+Hora est. del Pac��fico de SA\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -106,7 +106,7 @@ msgstr ""
 #: spyderlib\plugins\configdialog.py:416 spyderlib\plugins\configdialog.py:432
 #: spyderlib\plugins\runconfig.py:169 spyderlib\plugins\runconfig.py:229
 #: spyderlib\plugins\workingdirectory.py:293 spyderlib\widgets\explorer.py:535
-#: spyderlib\widgets\externalshell\pythonshell.py:603
+#: spyderlib\widgets\externalshell\pythonshell.py:602
 #: spyderlib\widgets\findinfiles.py:502 spyderlib\widgets\pathmanager.py:217
 #: spyderlib\widgets\projectexplorer.py:888
 msgid "Select directory"
@@ -148,9 +148,9 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: spyderlib\plugins\configdialog.py:635 spyderlib\plugins\editor.py:92
+#: spyderlib\plugins\configdialog.py:635 spyderlib\plugins\editor.py:93
 #: spyderlib\plugins\externalconsole.py:83
-#: spyderlib\plugins\ipythonconsole.py:67
+#: spyderlib\plugins\ipythonconsole.py:70
 msgid "Interface"
 msgstr ""
 
@@ -293,20 +293,20 @@ msgstr ""
 msgid "Internal console"
 msgstr ""
 
-#: spyderlib\plugins\console.py:123 spyderlib\plugins\ipythonconsole.py:506
-#: spyderlib\spyder.py:747
+#: spyderlib\plugins\console.py:123 spyderlib\plugins\ipythonconsole.py:510
+#: spyderlib\spyder.py:754
 msgid "&Quit"
 msgstr ""
 
-#: spyderlib\plugins\console.py:124 spyderlib\spyder.py:748
+#: spyderlib\plugins\console.py:124 spyderlib\spyder.py:755
 msgid "Quit"
 msgstr ""
 
-#: spyderlib\plugins\console.py:127 spyderlib\plugins\externalconsole.py:1082
+#: spyderlib\plugins\console.py:127 spyderlib\plugins\externalconsole.py:1112
 msgid "&Run..."
 msgstr ""
 
-#: spyderlib\plugins\console.py:128 spyderlib\plugins\externalconsole.py:1083
+#: spyderlib\plugins\console.py:128 spyderlib\plugins\externalconsole.py:1113
 msgid "Run a Python script"
 msgstr ""
 
@@ -336,7 +336,7 @@ msgid "Set maximum line count"
 msgstr ""
 
 #: spyderlib\plugins\console.py:146 spyderlib\plugins\explorer.py:59
-#: spyderlib\plugins\history.py:149 spyderlib\plugins\inspector.py:283
+#: spyderlib\plugins\history.py:149 spyderlib\plugins\inspector.py:284
 #: spyderlib\plugins\projectexplorer.py:57
 msgid "&Font..."
 msgstr ""
@@ -353,24 +353,24 @@ msgstr ""
 msgid "Set external editor executable path"
 msgstr ""
 
-#: spyderlib\plugins\console.py:154 spyderlib\plugins\editor.py:130
+#: spyderlib\plugins\console.py:154 spyderlib\plugins\editor.py:131
 #: spyderlib\plugins\externalconsole.py:104 spyderlib\plugins\history.py:37
-#: spyderlib\plugins\history.py:152 spyderlib\plugins\inspector.py:95
-#: spyderlib\plugins\inspector.py:286
+#: spyderlib\plugins\history.py:152 spyderlib\plugins\inspector.py:96
+#: spyderlib\plugins\inspector.py:287
 msgid "Wrap lines"
 msgstr ""
 
-#: spyderlib\plugins\console.py:157 spyderlib\plugins\editor.py:160
+#: spyderlib\plugins\console.py:157 spyderlib\plugins\editor.py:161
 #: spyderlib\plugins\externalconsole.py:153
 msgid "Balloon tips"
 msgstr ""
 
-#: spyderlib\plugins\console.py:161 spyderlib\plugins\editor.py:152
+#: spyderlib\plugins\console.py:161 spyderlib\plugins\editor.py:153
 #: spyderlib\plugins\externalconsole.py:145
 msgid "Automatic code completion"
 msgstr ""
 
-#: spyderlib\plugins\console.py:165 spyderlib\plugins\editor.py:158
+#: spyderlib\plugins\console.py:165 spyderlib\plugins\editor.py:159
 #: spyderlib\plugins\externalconsole.py:151
 msgid "Enter key selects completion"
 msgstr ""
@@ -379,17 +379,17 @@ msgstr ""
 msgid "Internal console settings"
 msgstr ""
 
-#: spyderlib\plugins\console.py:221 spyderlib\plugins\externalconsole.py:1256
+#: spyderlib\plugins\console.py:221 spyderlib\plugins\externalconsole.py:1286
 msgid "Run Python script"
 msgstr ""
 
 #: spyderlib\plugins\console.py:222 spyderlib\plugins\externalconsole.py:267
-#: spyderlib\plugins\externalconsole.py:1257 spyderlib\widgets\explorer.py:633
+#: spyderlib\plugins\externalconsole.py:1287 spyderlib\widgets\explorer.py:633
 msgid "Python scripts"
 msgstr ""
 
 #: spyderlib\plugins\console.py:267 spyderlib\plugins\explorer.py:110
-#: spyderlib\plugins\history.py:263 spyderlib\plugins\inspector.py:547
+#: spyderlib\plugins\history.py:263 spyderlib\plugins\inspector.py:548
 #: spyderlib\plugins\projectexplorer.py:119
 msgid "Select a new font"
 msgstr ""
@@ -410,102 +410,102 @@ msgstr ""
 msgid "External editor executable path:"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:86 spyderlib\plugins\editor.py:509
-#: spyderlib\plugins\editor.py:1536 spyderlib\plugins\inspector.py:314
+#: spyderlib\plugins\editor.py:87 spyderlib\plugins\editor.py:510
+#: spyderlib\plugins\editor.py:1574 spyderlib\plugins\inspector.py:315
 #: spyderlib\widgets\editor.py:566
 #: spyderlib\widgets\sourcecode\codeeditor.py:246
 #: spyderlib\widgets\sourcecode\codeeditor.py:2535
 msgid "Editor"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:89
+#: spyderlib\plugins\editor.py:90
 msgid "Edit template for new modules"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:94
+#: spyderlib\plugins\editor.py:95
 msgid "Text and margin font style"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:97
+#: spyderlib\plugins\editor.py:98
 msgid "Sort files according to full path"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:99
+#: spyderlib\plugins\editor.py:100
 msgid "Show tab bar"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:106 spyderlib\plugins\editor.py:181
+#: spyderlib\plugins\editor.py:107 spyderlib\plugins\editor.py:182
 #: spyderlib\plugins\externalconsole.py:99
 #: spyderlib\plugins\externalconsole.py:144 spyderlib\plugins\history.py:36
-#: spyderlib\plugins\inspector.py:94 spyderlib\plugins\ipythonconsole.py:102
+#: spyderlib\plugins\inspector.py:95 spyderlib\plugins\ipythonconsole.py:105
 msgid "Source code"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:107
+#: spyderlib\plugins\editor.py:108
 msgid "Show line numbers"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:108
+#: spyderlib\plugins\editor.py:109
 msgid "Show vertical line after"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:109
+#: spyderlib\plugins\editor.py:110
 msgid "characters"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:117
+#: spyderlib\plugins\editor.py:118
 msgid "Highlight current line"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:119
+#: spyderlib\plugins\editor.py:120
 msgid "Highlight occurences after"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:133 spyderlib\plugins\history.py:45
-#: spyderlib\plugins\inspector.py:98
+#: spyderlib\plugins\editor.py:134 spyderlib\plugins\history.py:45
+#: spyderlib\plugins\inspector.py:99
 msgid "Syntax color scheme: "
 msgstr ""
 
-#: spyderlib\plugins\editor.py:145 spyderlib\plugins\runconfig.py:304
+#: spyderlib\plugins\editor.py:146 spyderlib\plugins\runconfig.py:304
 #: spyderlib\plugins\runconfig.py:426 spyderlib\plugins\runconfig.py:433
-#: spyderlib\spyder.py:1696 spyderlib\widgets\explorer.py:229
+#: spyderlib\spyder.py:1702 spyderlib\widgets\explorer.py:229
 #: spyderlib\widgets\externalshell\baseshell.py:137
 msgid "Run"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:146
+#: spyderlib\plugins\editor.py:147
 msgid "Save all files before running script"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:149 spyderlib\plugins\externalconsole.py:433
+#: spyderlib\plugins\editor.py:150 spyderlib\plugins\externalconsole.py:433
 msgid "Introspection"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:154 spyderlib\plugins\externalconsole.py:147
+#: spyderlib\plugins\editor.py:155 spyderlib\plugins\externalconsole.py:147
 msgid "Case sensitive code completion"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:156 spyderlib\plugins\externalconsole.py:149
+#: spyderlib\plugins\editor.py:157 spyderlib\plugins\externalconsole.py:149
 msgid "Show single completion"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:161
+#: spyderlib\plugins\editor.py:162
 msgid "Link to object definition"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:163
+#: spyderlib\plugins\editor.py:164
 msgid ""
 "If this option is enabled, clicking on an object\n"
 "name (left-click + Ctrl key) will go this object\n"
 "definition (if resolved)."
 msgstr ""
 
-#: spyderlib\plugins\editor.py:167 spyderlib\plugins\externalconsole.py:155
-#: spyderlib\plugins\ipythonconsole.py:85
+#: spyderlib\plugins\editor.py:168 spyderlib\plugins\externalconsole.py:155
+#: spyderlib\plugins\ipythonconsole.py:88
 msgid "Automatic notification to object inspector"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:169
+#: spyderlib\plugins\editor.py:170
 msgid ""
 "If this option is enabled, object inspector\n"
 "will automatically show informations on functions\n"
@@ -513,55 +513,55 @@ msgid ""
 "a left parenthesis after a valid function name)"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:174
+#: spyderlib\plugins\editor.py:175
 msgid "<b>Warning:</b><br>The Python module <i>rope</i> is not installed on this computer: calltips, code completion and go-to-definition features won't be available."
 msgstr ""
 
-#: spyderlib\plugins\editor.py:182
+#: spyderlib\plugins\editor.py:183
 msgid "Automatic insertion of parentheses, braces and brackets"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:185
+#: spyderlib\plugins\editor.py:186
 msgid "Automatic insertion of closing quotes"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:187
+#: spyderlib\plugins\editor.py:188
 msgid "Automatic insertion of colons after 'for', 'if', 'def', etc"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:190
+#: spyderlib\plugins\editor.py:191
 msgid "Automatic indentation after 'else', 'elif', etc."
 msgstr ""
 
-#: spyderlib\plugins\editor.py:192
+#: spyderlib\plugins\editor.py:193
 msgid "Indentation characters: "
 msgstr ""
 
-#: spyderlib\plugins\editor.py:193
+#: spyderlib\plugins\editor.py:194
 msgid "4 spaces"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:194
+#: spyderlib\plugins\editor.py:195
 msgid "2 spaces"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:195
+#: spyderlib\plugins\editor.py:196
 msgid "tab"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:196
+#: spyderlib\plugins\editor.py:197
 msgid "Tab stop width:"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:196
+#: spyderlib\plugins\editor.py:197
 msgid "pixels"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:198
+#: spyderlib\plugins\editor.py:199
 msgid "Tab always indent"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:200
+#: spyderlib\plugins\editor.py:201
 msgid ""
 "If enabled, pressing Tab will always indent,\n"
 "even when the cursor is not at the beginning\n"
@@ -570,533 +570,521 @@ msgid ""
 "shortcut: Ctrl+Space)"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:205
+#: spyderlib\plugins\editor.py:206
 msgid "Intelligent backspace"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:207
+#: spyderlib\plugins\editor.py:208
 msgid "Automatically remove trailing spaces when saving files"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:211
+#: spyderlib\plugins\editor.py:212
 msgid "Analysis"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:213
+#: spyderlib\plugins\editor.py:214
 msgid "<u>Note</u>: add <b>analysis:ignore</b> in a comment to ignore code/style analysis warnings. For more informations on style guide for Python code, please refer to the %s page."
 msgstr ""
 
-#: spyderlib\plugins\editor.py:222
+#: spyderlib\plugins\editor.py:223
 #: spyderlib\widgets\sourcecode\codeeditor.py:1587
 msgid "Code analysis"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:224
+#: spyderlib\plugins\editor.py:225
 msgid ""
 "If enabled, Python source code will be analyzed\n"
 "using pyflakes, lines containing errors or \n"
 "warnings will be highlighted"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:229
+#: spyderlib\plugins\editor.py:230
 msgid "Code analysis requires pyflakes %s+"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:231
+#: spyderlib\plugins\editor.py:232
 msgid "Style analysis"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:233
+#: spyderlib\plugins\editor.py:234
 msgid ""
 "If enabled, Python source code will be analyzed\n"
 "using pep8, lines that are not following PEP8\n"
 "style guide will be highlighted"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:240
+#: spyderlib\plugins\editor.py:241
 msgid "Tasks (TODO, FIXME, XXX, HINT, TIP)"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:243
+#: spyderlib\plugins\editor.py:244
 msgid "Perform analysis when saving file and every"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:247
+#: spyderlib\plugins\editor.py:248
 msgid "Perform analysis only when saving file"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:293
+#: spyderlib\plugins\editor.py:294
 msgid "End-of-line characters"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:294
+#: spyderlib\plugins\editor.py:295
 msgid "When opening a text file containing mixed end-of-line characters (this may raise syntax errors in Python interpreter on Windows platforms), Spyder may fix the file automatically."
 msgstr ""
 
-#: spyderlib\plugins\editor.py:300
+#: spyderlib\plugins\editor.py:301
 msgid "Fix automatically and show warning message box"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:311 spyderlib\plugins\externalconsole.py:431
-#: spyderlib\plugins\ipythonconsole.py:354
+#: spyderlib\plugins\editor.py:312 spyderlib\plugins\externalconsole.py:431
+#: spyderlib\plugins\ipythonconsole.py:358
 #: spyderlib\plugins\variableexplorer.py:41
 msgid "Display"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:313
+#: spyderlib\plugins\editor.py:314
 msgid "Code Introspection/Analysis"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:316 spyderlib\plugins\externalconsole.py:436
+#: spyderlib\plugins\editor.py:317 spyderlib\plugins\externalconsole.py:436
 msgid "Advanced settings"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:565 spyderlib\widgets\editortools.py:467
+#: spyderlib\plugins\editor.py:566 spyderlib\widgets\editortools.py:467
 msgid "Show/hide outline explorer"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:571
+#: spyderlib\plugins\editor.py:572
 msgid "Show/hide project explorer"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:579
+#: spyderlib\plugins\editor.py:581
 msgid "&New file..."
 msgstr ""
 
-#: spyderlib\plugins\editor.py:580
-msgid "Create a new Python script"
+#: spyderlib\plugins\editor.py:582 spyderlib\plugins\workingdirectory.py:81
+#: spyderlib\widgets\explorer.py:611 spyderlib\widgets\explorer.py:618
+msgid "New file"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:584
+#: spyderlib\plugins\editor.py:589
 msgid "&Open..."
 msgstr ""
 
-#: spyderlib\plugins\editor.py:585
-msgid "Open text file"
+#: spyderlib\plugins\editor.py:590 spyderlib\plugins\editor.py:1615
+#: spyderlib\plugins\workingdirectory.py:68
+msgid "Open file"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:587
+#: spyderlib\plugins\editor.py:597
 msgid "&Revert"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:588
+#: spyderlib\plugins\editor.py:598
 msgid "Revert file from disk"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:592
+#: spyderlib\plugins\editor.py:601
 msgid "&Save"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:593
-msgid "Save current file"
+#: spyderlib\plugins\editor.py:602
+msgid "Save file"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:597
+#: spyderlib\plugins\editor.py:609
 msgid "Sav&e all"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:598
-msgid "Save all opened files"
+#: spyderlib\plugins\editor.py:610
+msgid "Save all files"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:602
+#: spyderlib\plugins\editor.py:617
 msgid "Save &as..."
 msgstr ""
 
-#: spyderlib\plugins\editor.py:603
+#: spyderlib\plugins\editor.py:618
 msgid "Save current file as..."
 msgstr ""
 
-#: spyderlib\plugins\editor.py:605 spyderlib\plugins\editor.py:606
+#: spyderlib\plugins\editor.py:620 spyderlib\plugins\editor.py:621
 msgid "Print preview..."
 msgstr ""
 
-#: spyderlib\plugins\editor.py:607
+#: spyderlib\plugins\editor.py:622
 msgid "&Print..."
 msgstr ""
 
-#: spyderlib\plugins\editor.py:608
+#: spyderlib\plugins\editor.py:623
 msgid "Print current file..."
 msgstr ""
 
-#: spyderlib\plugins\editor.py:612
+#: spyderlib\plugins\editor.py:627
 msgid "&Close"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:613
+#: spyderlib\plugins\editor.py:628
 msgid "Close current file"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:617
+#: spyderlib\plugins\editor.py:632
 msgid "C&lose all"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:618
+#: spyderlib\plugins\editor.py:633
 msgid "Close all opened files"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:624
+#: spyderlib\plugins\editor.py:640
 msgid "Set/Clear breakpoint"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:631
+#: spyderlib\plugins\editor.py:647
 msgid "Set/Edit conditional breakpoint"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:639
+#: spyderlib\plugins\editor.py:655
 msgid "Clear breakpoints in all files"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:641
+#: spyderlib\plugins\editor.py:657
 msgid "Breakpoints"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:647
+#: spyderlib\plugins\editor.py:661
+msgid "Debug with winpdb"
+msgstr ""
+
+#: spyderlib\plugins\editor.py:668 spyderlib\spyder.py:562
 msgid "&Debug"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:648
+#: spyderlib\plugins\editor.py:669
 msgid "Debug file"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:652
+#: spyderlib\plugins\editor.py:675
 msgid "Step"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:653
+#: spyderlib\plugins\editor.py:676
 msgid "Run current line"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:657
+#: spyderlib\plugins\editor.py:683
 msgid "Continue"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:658
-msgid ""
-"Continue execution until\n"
-"next breakpoint"
+#: spyderlib\plugins\editor.py:684
+msgid "Continue execution until next breakpoint"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:663
+#: spyderlib\plugins\editor.py:692
 msgid "Step Into"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:664
-msgid ""
-"Step into function, method\n"
-"or class of current line"
+#: spyderlib\plugins\editor.py:693
+msgid "Step into function or method of current line"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:669
+#: spyderlib\plugins\editor.py:701
 msgid "Step Return"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:670
-msgid ""
-"Run until current function\n"
-"or method returns"
+#: spyderlib\plugins\editor.py:702
+msgid "Run until current function or method returns"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:675
+#: spyderlib\plugins\editor.py:710
 msgid "Exit"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:676
+#: spyderlib\plugins\editor.py:711
 msgid "Exit Debug"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:685
+#: spyderlib\plugins\editor.py:723
 msgid "Debugging control"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:689 spyderlib\plugins\editor.py:1188
-#: spyderlib\spyder.py:555
+#: spyderlib\plugins\editor.py:727 spyderlib\plugins\editor.py:1226
+#: spyderlib\spyder.py:557
 msgid "&Run"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:690
+#: spyderlib\plugins\editor.py:728
 msgid "Run file"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:695
+#: spyderlib\plugins\editor.py:735
 msgid "&Configure..."
 msgstr ""
 
-#: spyderlib\plugins\editor.py:696
-#: spyderlib\widgets\externalshell\pythonshell.py:289
+#: spyderlib\plugins\editor.py:736
+#: spyderlib\widgets\externalshell\pythonshell.py:292
 msgid "Run settings"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:702
+#: spyderlib\plugins\editor.py:745
 msgid "Re-run &last script"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:703
+#: spyderlib\plugins\editor.py:746
 msgid "Run again last file"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:708
+#: spyderlib\plugins\editor.py:753
 #: spyderlib\widgets\sourcecode\codeeditor.py:2222
 msgid "Run &selection"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:710
+#: spyderlib\plugins\editor.py:755
 msgid "Run selection"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:715
+#: spyderlib\plugins\editor.py:761
 msgid "Run cell"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:717
+#: spyderlib\plugins\editor.py:763
 msgid ""
-"Run current cell \n"
-"(see Editor documentation \n"
-"for more details on cells)"
+"Run current cell (Ctrl+Enter)\n"
+"[Use #%% to create cells]"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:722
+#: spyderlib\plugins\editor.py:768
 msgid "Run cell and advance"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:725
-msgid ""
-"Run current cell and go to the next one\n"
-"(see Editor documentation \n"
-"for more details on cells)"
+#: spyderlib\plugins\editor.py:771
+msgid "Run current cell and go to the next one (Shift+Enter)"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:732
+#: spyderlib\plugins\editor.py:777
 msgid "Show todo list"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:733
+#: spyderlib\plugins\editor.py:778
 msgid "Show TODO/FIXME/XXX/HINT/TIP comments list"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:741
+#: spyderlib\plugins\editor.py:786
 msgid "Show warning/error list"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:742
+#: spyderlib\plugins\editor.py:787
 msgid "Show code analysis warnings/errors"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:749
+#: spyderlib\plugins\editor.py:794
 msgid "Previous warning/error"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:750
+#: spyderlib\plugins\editor.py:795
 msgid "Go to previous code analysis warning/error"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:753
+#: spyderlib\plugins\editor.py:798
 msgid "Next warning/error"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:754
+#: spyderlib\plugins\editor.py:799
 msgid "Go to next code analysis warning/error"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:758
+#: spyderlib\plugins\editor.py:803
 msgid "Last edit location"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:759
+#: spyderlib\plugins\editor.py:804
 msgid "Go to last edit location"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:766
+#: spyderlib\plugins\editor.py:811
 msgid "Previous cursor position"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:767
+#: spyderlib\plugins\editor.py:812
 msgid "Go to previous cursor position"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:774
+#: spyderlib\plugins\editor.py:819
 msgid "Next cursor position"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:775
+#: spyderlib\plugins\editor.py:820
 msgid "Go to next cursor position"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:783
+#: spyderlib\plugins\editor.py:828
 #: spyderlib\widgets\sourcecode\codeeditor.py:2216
 msgid "Comment"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:783
+#: spyderlib\plugins\editor.py:828
 #: spyderlib\widgets\sourcecode\codeeditor.py:2216
 msgid "Uncomment"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:784
+#: spyderlib\plugins\editor.py:829
 msgid "Comment current line or selection"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:788
+#: spyderlib\plugins\editor.py:833
 msgid "Add &block comment"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:789
+#: spyderlib\plugins\editor.py:834
 msgid "Add block comment around current line or selection"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:795
+#: spyderlib\plugins\editor.py:840
 msgid "R&emove block comment"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:796
+#: spyderlib\plugins\editor.py:841
 msgid "Remove comment block around current line or selection"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:807
+#: spyderlib\plugins\editor.py:852
 msgid "Indent"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:808
+#: spyderlib\plugins\editor.py:853
 msgid "Indent current line or selection"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:811
+#: spyderlib\plugins\editor.py:856
 msgid "Unindent"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:812
+#: spyderlib\plugins\editor.py:857
 msgid "Unindent current line or selection"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:816
-msgid "Debug with winpdb"
-msgstr ""
-
-#: spyderlib\plugins\editor.py:823
+#: spyderlib\plugins\editor.py:862
 msgid "Carriage return and line feed (Windows)"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:826
+#: spyderlib\plugins\editor.py:865
 msgid "Line feed (UNIX)"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:829
+#: spyderlib\plugins\editor.py:868
 msgid "Carriage return (Mac)"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:835
+#: spyderlib\plugins\editor.py:874
 msgid "Convert end-of-line characters"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:839
+#: spyderlib\plugins\editor.py:878
 msgid "Remove trailing spaces"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:841
+#: spyderlib\plugins\editor.py:880
 msgid "Fix indentation"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:842
+#: spyderlib\plugins\editor.py:881
 msgid "Replace tab characters by space characters"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:845
+#: spyderlib\plugins\editor.py:884
 msgid "Go to line..."
 msgstr ""
 
-#: spyderlib\plugins\editor.py:853
+#: spyderlib\plugins\editor.py:892
 msgid "Set console working directory"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:855
+#: spyderlib\plugins\editor.py:894
 msgid "Set current console (and file explorer) working directory to current script directory"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:860
+#: spyderlib\plugins\editor.py:899
 msgid "Maximum number of recent files..."
 msgstr ""
 
-#: spyderlib\plugins\editor.py:863
+#: spyderlib\plugins\editor.py:902
 msgid "Clear recent files list"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:863
+#: spyderlib\plugins\editor.py:902
 msgid "Clear this list"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:865
+#: spyderlib\plugins\editor.py:904
 msgid "Open &recent"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:1176 spyderlib\spyder.py:536
+#: spyderlib\plugins\editor.py:1214 spyderlib\spyder.py:538
 msgid "File toolbar"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:1177 spyderlib\spyder.py:546
+#: spyderlib\plugins\editor.py:1215 spyderlib\spyder.py:548
 msgid "Search toolbar"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:1178 spyderlib\spyder.py:551
+#: spyderlib\plugins\editor.py:1216 spyderlib\spyder.py:553
 msgid "Source toolbar"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:1179 spyderlib\spyder.py:556
+#: spyderlib\plugins\editor.py:1217 spyderlib\spyder.py:558
 msgid "Run toolbar"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:1180 spyderlib\spyder.py:560
+#: spyderlib\plugins\editor.py:1218 spyderlib\spyder.py:563
 msgid "Debug toolbar"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:1181 spyderlib\spyder.py:541
+#: spyderlib\plugins\editor.py:1219 spyderlib\spyder.py:543
 msgid "Edit toolbar"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:1184 spyderlib\spyder.py:533
+#: spyderlib\plugins\editor.py:1222 spyderlib\spyder.py:535
 msgid "&File"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:1185 spyderlib\spyder.py:540
+#: spyderlib\plugins\editor.py:1223 spyderlib\spyder.py:542
 msgid "&Edit"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:1186 spyderlib\spyder.py:545
+#: spyderlib\plugins\editor.py:1224 spyderlib\spyder.py:547
 msgid "&Search"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:1187 spyderlib\spyder.py:550
+#: spyderlib\plugins\editor.py:1225 spyderlib\spyder.py:552
 msgid "Sour&ce"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:1189 spyderlib\spyder.py:567
+#: spyderlib\plugins\editor.py:1227 spyderlib\spyder.py:570
 msgid "&Tools"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:1190
+#: spyderlib\plugins\editor.py:1228
 msgid "?"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:1404
+#: spyderlib\plugins\editor.py:1442
 msgid "Spyder Editor"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:1405
+#: spyderlib\plugins\editor.py:1443
 msgid "This temporary script file is located here:"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:1466
+#: spyderlib\plugins\editor.py:1504
 msgid "untitled"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:1537
+#: spyderlib\plugins\editor.py:1575
 msgid "Maximum number of recent files"
 msgstr ""
 
-#: spyderlib\plugins\editor.py:1577 spyderlib\plugins\workingdirectory.py:68
-msgid "Open file"
-msgstr ""
-
-#: spyderlib\plugins\editor.py:1659
+#: spyderlib\plugins\editor.py:1697
 msgid "Printing..."
 msgstr ""
 
@@ -1104,7 +1092,7 @@ msgstr ""
 msgid "File explorer"
 msgstr ""
 
-#: spyderlib\plugins\explorer.py:60 spyderlib\plugins\inspector.py:284
+#: spyderlib\plugins\explorer.py:60 spyderlib\plugins\inspector.py:285
 #: spyderlib\plugins\projectexplorer.py:58
 msgid "Set font style"
 msgstr ""
@@ -1114,9 +1102,9 @@ msgid "Interactive data plotting"
 msgstr ""
 
 #: spyderlib\plugins\externalconsole.py:69
-#: spyderlib\plugins\externalconsole.py:1049
-#: spyderlib\plugins\inspector.py:314 spyderlib\plugins\ipythonconsole.py:429
-#: spyderlib\plugins\ipythonconsole.py:1134
+#: spyderlib\plugins\externalconsole.py:1079
+#: spyderlib\plugins\inspector.py:315 spyderlib\plugins\ipythonconsole.py:433
+#: spyderlib\plugins\ipythonconsole.py:1176
 #: spyderlib\widgets\externalshell\baseshell.py:105
 msgid "Console"
 msgstr ""
@@ -1139,7 +1127,7 @@ msgid "Buffer: "
 msgstr ""
 
 #: spyderlib\plugins\externalconsole.py:101
-#: spyderlib\plugins\ipythonconsole.py:104
+#: spyderlib\plugins\ipythonconsole.py:107
 msgid " lines"
 msgstr ""
 
@@ -1178,7 +1166,7 @@ msgid "Light background (white color)"
 msgstr ""
 
 #: spyderlib\plugins\externalconsole.py:157
-#: spyderlib\plugins\ipythonconsole.py:87
+#: spyderlib\plugins\ipythonconsole.py:90
 msgid ""
 "If this option is enabled, object inspector\n"
 "will automatically show informations on functions\n"
@@ -1237,7 +1225,7 @@ msgid "Executables"
 msgstr ""
 
 #: spyderlib\plugins\externalconsole.py:243
-#: spyderlib\plugins\ipythonconsole.py:358
+#: spyderlib\plugins\ipythonconsole.py:362
 #: spyderlib\plugins\workingdirectory.py:41
 msgid "Startup"
 msgstr ""
@@ -1377,8 +1365,8 @@ msgid "You can't close this kernel because it has one or more consoles connected
 msgstr ""
 
 #: spyderlib\plugins\externalconsole.py:718
-#: spyderlib\plugins\ipythonconsole.py:722 spyderlib\spyder.py:1230
-#: spyderlib\spyder.py:1248 spyderlib\utils\environ.py:95
+#: spyderlib\plugins\ipythonconsole.py:730 spyderlib\spyder.py:1238
+#: spyderlib\spyder.py:1256 spyderlib\utils\environ.py:95
 #: spyderlib\utils\environ.py:108
 msgid "Warning"
 msgstr ""
@@ -1393,85 +1381,95 @@ msgid ""
 "Do you want to kill the process before starting a new one?"
 msgstr ""
 
-#: spyderlib\plugins\externalconsole.py:930
+#: spyderlib\plugins\externalconsole.py:948
 msgid "Kernel"
 msgstr ""
 
-#: spyderlib\plugins\externalconsole.py:950
+#: spyderlib\plugins\externalconsole.py:958
+#: spyderlib\plugins\ipythonconsole.py:1003
+msgid "Mismatch between kernel and frontend"
+msgstr ""
+
+#: spyderlib\plugins\externalconsole.py:959
+#: spyderlib\plugins\ipythonconsole.py:1004
+msgid "Your IPython frontend and kernel versions are <b>incompatible!!</b><br><br>We're sorry but we can't create an IPython console for you."
+msgstr ""
+
+#: spyderlib\plugins\externalconsole.py:980
 msgid "Command Window"
 msgstr ""
 
-#: spyderlib\plugins\externalconsole.py:952
+#: spyderlib\plugins\externalconsole.py:982
 msgid "Terminal"
 msgstr ""
 
-#: spyderlib\plugins\externalconsole.py:1071
+#: spyderlib\plugins\externalconsole.py:1101
 msgid "Open a Python &interpreter"
 msgstr ""
 
-#: spyderlib\plugins\externalconsole.py:1074
+#: spyderlib\plugins\externalconsole.py:1104
 msgid "Open &command prompt"
 msgstr ""
 
-#: spyderlib\plugins\externalconsole.py:1075
+#: spyderlib\plugins\externalconsole.py:1105
 msgid "Open a Windows command prompt"
 msgstr ""
 
-#: spyderlib\plugins\externalconsole.py:1077
+#: spyderlib\plugins\externalconsole.py:1107
 msgid "Open &terminal"
 msgstr ""
 
-#: spyderlib\plugins\externalconsole.py:1078
+#: spyderlib\plugins\externalconsole.py:1108
 msgid "Open a terminal window inside Spyder"
 msgstr ""
 
-#: spyderlib\plugins\externalconsole.py:1199
+#: spyderlib\plugins\externalconsole.py:1229
 #: spyderlib\widgets\projectexplorer.py:334
 msgid " and "
 msgstr ""
 
-#: spyderlib\plugins\externalconsole.py:1204
+#: spyderlib\plugins\externalconsole.py:1234
 msgid "<br><u>Installed version</u>: %s"
 msgstr ""
 
-#: spyderlib\plugins\externalconsole.py:1206
-#: spyderlib\plugins\ipythonconsole.py:56
-#: spyderlib\plugins\ipythonconsole.py:673
+#: spyderlib\plugins\externalconsole.py:1236
+#: spyderlib\plugins\ipythonconsole.py:59
+#: spyderlib\plugins\ipythonconsole.py:681
 msgid "IPython console"
 msgstr ""
 
-#: spyderlib\plugins\externalconsole.py:1207
+#: spyderlib\plugins\externalconsole.py:1237
 msgid "Unable to open IPython console because no supported IPython version was found.<br><br><u>Supported IPython versions</u>: %s"
 msgstr ""
 
-#: spyderlib\plugins\externalconsole.py:1228
-#: spyderlib\plugins\ipythonconsole.py:742
+#: spyderlib\plugins\externalconsole.py:1258
+#: spyderlib\plugins\ipythonconsole.py:750
 msgid "Open an IPython console"
 msgstr ""
 
-#: spyderlib\plugins\externalconsole.py:1229
+#: spyderlib\plugins\externalconsole.py:1259
 msgid "The console monitor was disabled: the IPython kernel will be started as expected, but an IPython console will have to be connected manually to the kernel."
 msgstr ""
 
-#: spyderlib\plugins\externalconsole.py:1265
-#: spyderlib\plugins\externalconsole.py:1278
-#: spyderlib\plugins\externalconsole.py:1282
+#: spyderlib\plugins\externalconsole.py:1295
+#: spyderlib\plugins\externalconsole.py:1308
+#: spyderlib\plugins\externalconsole.py:1312
 msgid "UMD"
 msgstr ""
 
-#: spyderlib\plugins\externalconsole.py:1266
+#: spyderlib\plugins\externalconsole.py:1296
 msgid ""
 "UMD excluded modules:\n"
 "(example: guidata, guiqwt)"
 msgstr ""
 
-#: spyderlib\plugins\externalconsole.py:1279
+#: spyderlib\plugins\externalconsole.py:1309
 msgid ""
 "The following modules are not installed on your machine:\n"
 "%s"
 msgstr ""
 
-#: spyderlib\plugins\externalconsole.py:1283
+#: spyderlib\plugins\externalconsole.py:1313
 msgid "Please note that these changes will be applied only to new Python/IPython interpreters"
 msgstr ""
 
@@ -1503,8 +1501,8 @@ msgstr ""
 msgid "Scroll automatically to last entry"
 msgstr ""
 
-#: spyderlib\plugins\history.py:98 spyderlib\plugins\inspector.py:367
-#: spyderlib\plugins\ipythonconsole.py:482 spyderlib\widgets\editor.py:653
+#: spyderlib\plugins\history.py:98 spyderlib\plugins\inspector.py:368
+#: spyderlib\plugins\ipythonconsole.py:486 spyderlib\widgets\editor.py:653
 #: spyderlib\widgets\explorer.py:985
 #: spyderlib\widgets\externalshell\baseshell.py:150
 #: spyderlib\widgets\externalshell\namespacebrowser.py:220
@@ -1531,146 +1529,146 @@ msgstr ""
 msgid "Maximum entries"
 msgstr ""
 
-#: spyderlib\plugins\inspector.py:52
+#: spyderlib\plugins\inspector.py:53
 msgid "Rich text help on the Object Inspector"
 msgstr ""
 
-#: spyderlib\plugins\inspector.py:107
+#: spyderlib\plugins\inspector.py:108
 msgid "Plain text font style"
 msgstr ""
 
-#: spyderlib\plugins\inspector.py:110
+#: spyderlib\plugins\inspector.py:111
 msgid "Rich text font style"
 msgstr ""
 
-#: spyderlib\plugins\inspector.py:112
+#: spyderlib\plugins\inspector.py:113
 msgid "Additional features"
 msgstr ""
 
-#: spyderlib\plugins\inspector.py:113
+#: spyderlib\plugins\inspector.py:114
 msgid "Render mathematical equations"
 msgstr ""
 
-#: spyderlib\plugins\inspector.py:119
+#: spyderlib\plugins\inspector.py:120
 msgid "This feature requires Sphinx 1.1 or superior."
 msgstr ""
 
-#: spyderlib\plugins\inspector.py:121
+#: spyderlib\plugins\inspector.py:122
 msgid "Sphinx %s is currently installed."
 msgstr ""
 
-#: spyderlib\plugins\inspector.py:268
+#: spyderlib\plugins\inspector.py:269
 msgid "No documentation available"
 msgstr ""
 
-#: spyderlib\plugins\inspector.py:307
+#: spyderlib\plugins\inspector.py:308
 msgid "Source"
 msgstr ""
 
-#: spyderlib\plugins\inspector.py:322 spyderlib\widgets\dicteditor.py:161
+#: spyderlib\plugins\inspector.py:323 spyderlib\widgets\dicteditor.py:161
 msgid "Object"
 msgstr ""
 
-#: spyderlib\plugins\inspector.py:337
+#: spyderlib\plugins\inspector.py:338
 msgid "Plain Text"
 msgstr ""
 
-#: spyderlib\plugins\inspector.py:341
+#: spyderlib\plugins\inspector.py:342
 msgid "Show Source"
 msgstr ""
 
-#: spyderlib\plugins\inspector.py:345
+#: spyderlib\plugins\inspector.py:346
 msgid "Rich Text"
 msgstr ""
 
-#: spyderlib\plugins\inspector.py:355
+#: spyderlib\plugins\inspector.py:356
 msgid "Automatic import"
 msgstr ""
 
-#: spyderlib\plugins\inspector.py:411 spyderlib\plugins\inspector.py:798
+#: spyderlib\plugins\inspector.py:412 spyderlib\plugins\inspector.py:799
 msgid "Object inspector"
 msgstr ""
 
-#: spyderlib\plugins\inspector.py:754
+#: spyderlib\plugins\inspector.py:755
 msgid "Lock"
 msgstr ""
 
-#: spyderlib\plugins\inspector.py:754
+#: spyderlib\plugins\inspector.py:755
 msgid "Unlock"
 msgstr ""
 
-#: spyderlib\plugins\inspector.py:799
+#: spyderlib\plugins\inspector.py:800
 msgid "The following error occured when calling <b>Sphinx %s</b>. <br>Incompatible Sphinx version or doc string decoding failed.<br><br>Error message:<br>%s"
 msgstr ""
 
-#: spyderlib\plugins\inspector.py:849
+#: spyderlib\plugins\inspector.py:850
 msgid "No source code available."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:49
+#: spyderlib\plugins\ipythonconsole.py:52
 msgid "Symbolic mathematics for the IPython Console"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:68
+#: spyderlib\plugins\ipythonconsole.py:71
 msgid "Display initial banner"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:69
+#: spyderlib\plugins\ipythonconsole.py:72
 msgid ""
 "This option lets you hide the message shown at\n"
 "the top of the console when it's opened."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:71
+#: spyderlib\plugins\ipythonconsole.py:74
 msgid "Use a completion widget"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:73
+#: spyderlib\plugins\ipythonconsole.py:76
 msgid "Use a widget instead of plain text output for tab completion"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:75
+#: spyderlib\plugins\ipythonconsole.py:78
 msgid "Use a pager to display additional text inside the console"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:77
+#: spyderlib\plugins\ipythonconsole.py:80
 msgid ""
 "Useful if you don't want to fill the console with long help or completion texts.\n"
 "Note: Use the Q key to get out of the pager."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:81
+#: spyderlib\plugins\ipythonconsole.py:84
 msgid "Display balloon tips"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:82
+#: spyderlib\plugins\ipythonconsole.py:85
 msgid "Ask for confirmation before closing"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:104
+#: spyderlib\plugins\ipythonconsole.py:107
 msgid "Buffer:  "
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:106
+#: spyderlib\plugins\ipythonconsole.py:109
 msgid ""
 "Set the maximum number of lines of text shown in the\n"
 "console before truncation. Specifying -1 disables it\n"
 "(not recommended!)"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:115
-msgid "Support for graphics (Pylab)"
+#: spyderlib\plugins\ipythonconsole.py:118
+msgid "Support for graphics (Matplotlib)"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:116
+#: spyderlib\plugins\ipythonconsole.py:119
 msgid "Activate support"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:117
-msgid "Automatically load Pylab and NumPy"
+#: spyderlib\plugins\ipythonconsole.py:120
+msgid "Automatically load Pylab and NumPy modules"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:119
+#: spyderlib\plugins\ipythonconsole.py:123
 msgid ""
 "This lets you load graphics support without importing \n"
 "the commands to do plots. Useful to work with other\n"
@@ -1678,300 +1676,300 @@ msgid ""
 "GUIs with Spyder."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:138
+#: spyderlib\plugins\ipythonconsole.py:142
 msgid ""
 "This feature requires the Matplotlib library.\n"
 "It seems you don't have it installed."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:143
+#: spyderlib\plugins\ipythonconsole.py:147
 msgid "Inline"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:144
+#: spyderlib\plugins\ipythonconsole.py:148
 msgid "Automatic"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:145
+#: spyderlib\plugins\ipythonconsole.py:149
 msgid "Graphics backend"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:146
+#: spyderlib\plugins\ipythonconsole.py:150
 msgid "Decide how graphics are going to be displayed in the console. If unsure, please select <b>%s</b> to put graphics inside the console or <b>%s</b> to interact with them (through zooming and panning) in a separate window."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:166
+#: spyderlib\plugins\ipythonconsole.py:170
 msgid "Backend:"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:168
+#: spyderlib\plugins\ipythonconsole.py:172
 msgid "This option will be applied the next time a console is opened."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:180
+#: spyderlib\plugins\ipythonconsole.py:184
 msgid "Inline backend"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:181
+#: spyderlib\plugins\ipythonconsole.py:185
 msgid "Decide how to render the figures created by this backend"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:185
+#: spyderlib\plugins\ipythonconsole.py:189
 msgid "Format:"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:188
+#: spyderlib\plugins\ipythonconsole.py:192
 msgid "Resolution:"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:188
+#: spyderlib\plugins\ipythonconsole.py:192
 msgid "dpi"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:190
+#: spyderlib\plugins\ipythonconsole.py:194
 msgid "Only used when the format is PNG. Default is 72"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:193
+#: spyderlib\plugins\ipythonconsole.py:197
 msgid "Width:"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:193
 #: spyderlib\plugins\ipythonconsole.py:197
+#: spyderlib\plugins\ipythonconsole.py:201
 msgid "inches"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:195
+#: spyderlib\plugins\ipythonconsole.py:199
 msgid "Default is 6"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:197
+#: spyderlib\plugins\ipythonconsole.py:201
 msgid "Height:"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:199
+#: spyderlib\plugins\ipythonconsole.py:203
 msgid "Default is 4"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:214
+#: spyderlib\plugins\ipythonconsole.py:218
 msgid "Run code"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:215
+#: spyderlib\plugins\ipythonconsole.py:219
 msgid "You can run several lines of code when a console is started. Please introduce each one separated by commas, for example:<br><i>import os, import sys</i>"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:221
+#: spyderlib\plugins\ipythonconsole.py:225
 msgid "Lines:"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:230
+#: spyderlib\plugins\ipythonconsole.py:234
 msgid "Run a file"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:231
+#: spyderlib\plugins\ipythonconsole.py:235
 msgid "You can also run a whole file at startup instead of just some lines (This is similar to have a PYTHONSTARTUP file)."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:235
+#: spyderlib\plugins\ipythonconsole.py:239
 msgid "Use the following file:"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:249
+#: spyderlib\plugins\ipythonconsole.py:253
 msgid "Spyder startup"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:250
+#: spyderlib\plugins\ipythonconsole.py:254
 msgid "Open an IPython console at startup"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:258
+#: spyderlib\plugins\ipythonconsole.py:262
 msgid "Greedy completion"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:259
+#: spyderlib\plugins\ipythonconsole.py:263
 msgid "Enable <tt>Tab</tt> completion on elements of lists, results of function calls, etc, <i>without</i> assigning them to a variable.<br>For example, you can get completions on things like <tt>li[0].<Tab></tt> or <tt>ins.meth().<Tab></tt>"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:267
+#: spyderlib\plugins\ipythonconsole.py:271
 msgid "Use the greedy completer"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:278
+#: spyderlib\plugins\ipythonconsole.py:282
 msgid "Autocall"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:279
+#: spyderlib\plugins\ipythonconsole.py:283
 msgid "Autocall makes IPython automatically call any callable object even if you didn't type explicit parentheses.<br>For example, if you type <i>str 43</i> it becomes <i>str(43)</i> automatically."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:286
+#: spyderlib\plugins\ipythonconsole.py:290
 msgid "Smart"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:287
+#: spyderlib\plugins\ipythonconsole.py:291
 msgid "Full"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:288
+#: spyderlib\plugins\ipythonconsole.py:292
 msgid "Off"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:290
+#: spyderlib\plugins\ipythonconsole.py:294
 msgid "Autocall:  "
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:291
+#: spyderlib\plugins\ipythonconsole.py:295
 msgid "On <b>%s</b> mode, Autocall is not applied if there are no arguments after the callable. On <b>%s</b> mode, all callable objects are automatically called (even if no arguments are present)."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:303
+#: spyderlib\plugins\ipythonconsole.py:307
 msgid "Symbolic Mathematics"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:304
+#: spyderlib\plugins\ipythonconsole.py:308
 msgid "Perfom symbolic operations in the console (e.g. integrals, derivatives, vector calculus, etc) and get the outputs in a beautifully printed style."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:309
+#: spyderlib\plugins\ipythonconsole.py:313
 msgid "Use symbolic math"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:310
+#: spyderlib\plugins\ipythonconsole.py:314
 msgid "This option loads the Sympy library to work with.<br>Please refer to its documentation to learn how to use it."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:323
+#: spyderlib\plugins\ipythonconsole.py:327
 msgid ""
 "This feature requires the Sympy library.\n"
 "It seems you don't have it installed."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:328
+#: spyderlib\plugins\ipythonconsole.py:332
 msgid "Prompts"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:329
+#: spyderlib\plugins\ipythonconsole.py:333
 msgid "Modify how Input and Output prompts are shown in the console."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:332
+#: spyderlib\plugins\ipythonconsole.py:336
 msgid "Input prompt:"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:334
+#: spyderlib\plugins\ipythonconsole.py:338
 msgid "Default is<br>In [<span class=\"in-prompt-number\">%i</span>]:"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:338
+#: spyderlib\plugins\ipythonconsole.py:342
 msgid "Output prompt:"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:340
+#: spyderlib\plugins\ipythonconsole.py:344
 msgid "Default is<br>Out[<span class=\"out-prompt-number\">%i</span>]:"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:356
+#: spyderlib\plugins\ipythonconsole.py:360
 msgid "Graphics"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:360
+#: spyderlib\plugins\ipythonconsole.py:364
 msgid "Advanced Settings"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:443
+#: spyderlib\plugins\ipythonconsole.py:447
 msgid "Interrupt kernel"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:446
+#: spyderlib\plugins\ipythonconsole.py:450
 msgid "Restart kernel"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:451
+#: spyderlib\plugins\ipythonconsole.py:455
 msgid "Intro to IPython"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:453
+#: spyderlib\plugins\ipythonconsole.py:457
 msgid "Quick Reference"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:455
+#: spyderlib\plugins\ipythonconsole.py:459
 msgid "Console help"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:457
+#: spyderlib\plugins\ipythonconsole.py:461
 #: spyderlib\widgets\internalshell.py:253
 msgid "Help"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:458
+#: spyderlib\plugins\ipythonconsole.py:462
 msgid "IPython Help"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:494
+#: spyderlib\plugins\ipythonconsole.py:498
 msgid "Inspect current object"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:498
+#: spyderlib\plugins\ipythonconsole.py:502
 msgid "Clear line or block"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:502
+#: spyderlib\plugins\ipythonconsole.py:506
 msgid "Clear console"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:541
+#: spyderlib\plugins\ipythonconsole.py:545
 msgid "It seems the kernel died unexpectedly. Use 'Restart kernel' to continue using this console."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:553
+#: spyderlib\plugins\ipythonconsole.py:557
 msgid "Kernel process is either remote or unspecified. Cannot interrupt"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:562
+#: spyderlib\plugins\ipythonconsole.py:566
 msgid "Kernel process is either remote or unspecified. Cannot restart."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:723
+#: spyderlib\plugins\ipythonconsole.py:731
 msgid "No IPython console is currently available to run <b>%s</b>.<br><br>Please open a new one and try again."
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:747
+#: spyderlib\plugins\ipythonconsole.py:755
 msgid "Connect to an existing kernel"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:749
+#: spyderlib\plugins\ipythonconsole.py:757
 msgid "Open a new IPython client connected to an external kernel"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:859
+#: spyderlib\plugins\ipythonconsole.py:891
 msgid "(for example: `kernel-3764.json`, or simply `3764`)"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:861
-#: spyderlib\plugins\ipythonconsole.py:901
+#: spyderlib\plugins\ipythonconsole.py:893
+#: spyderlib\plugins\ipythonconsole.py:933
 msgid "IPython"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:862
+#: spyderlib\plugins\ipythonconsole.py:894
 msgid "Provide an IPython kernel connection file:"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:902
+#: spyderlib\plugins\ipythonconsole.py:934
 msgid "Unable to connect to IPython kernel <b>`%s`"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:1096
+#: spyderlib\plugins\ipythonconsole.py:1138
 msgid ""
 "%s will be closed.\n"
 "Do you want to kill the associated kernel and all of its clients?"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:1142
+#: spyderlib\plugins\ipythonconsole.py:1184
 msgid "Are you sure you want to restart the kernel?"
 msgstr ""
 
-#: spyderlib\plugins\ipythonconsole.py:1144
+#: spyderlib\plugins\ipythonconsole.py:1186
 msgid "Restart kernel?"
 msgstr ""
 
@@ -2069,7 +2067,7 @@ msgid "The following are the default <i>%s</i>. These options may be overriden u
 msgstr ""
 
 #: spyderlib\plugins\runconfig.py:458
-#: spyderlib\widgets\externalshell\pythonshell.py:292
+#: spyderlib\widgets\externalshell\pythonshell.py:295
 msgid "Working directory"
 msgstr ""
 
@@ -2236,11 +2234,6 @@ msgstr ""
 msgid "the global working directory"
 msgstr ""
 
-#: spyderlib\plugins\workingdirectory.py:81 spyderlib\widgets\explorer.py:611
-#: spyderlib\widgets\explorer.py:618
-msgid "New file"
-msgstr ""
-
 #: spyderlib\plugins\workingdirectory.py:82
 msgid "Files are created in:"
 msgstr ""
@@ -2315,7 +2308,7 @@ msgstr ""
 msgid "Numpy and Scipy documentation"
 msgstr ""
 
-#: spyderlib\spyder.py:254 spyderlib\spyder.py:908
+#: spyderlib\spyder.py:254 spyderlib\spyder.py:915
 msgid "Matplotlib documentation"
 msgstr ""
 
@@ -2339,330 +2332,326 @@ msgstr ""
 msgid "Save current session and quit application"
 msgstr ""
 
-#: spyderlib\spyder.py:407
+#: spyderlib\spyder.py:409
 msgid "Initializing..."
 msgstr ""
 
-#: spyderlib\spyder.py:468
+#: spyderlib\spyder.py:470
 msgid "Close current dockwidget"
 msgstr ""
 
-#: spyderlib\spyder.py:474
+#: spyderlib\spyder.py:476
 msgid "&Find text"
 msgstr ""
 
-#: spyderlib\spyder.py:480
+#: spyderlib\spyder.py:482
 msgid "Find &next"
 msgstr ""
 
-#: spyderlib\spyder.py:486
+#: spyderlib\spyder.py:488
 msgid "Find &previous"
 msgstr ""
 
-#: spyderlib\spyder.py:491
+#: spyderlib\spyder.py:493
 msgid "&Replace text"
 msgstr ""
 
-#: spyderlib\spyder.py:506 spyderlib\widgets\sourcecode\codeeditor.py:2192
+#: spyderlib\spyder.py:508 spyderlib\widgets\sourcecode\codeeditor.py:2192
 msgid "Undo"
 msgstr ""
 
-#: spyderlib\spyder.py:508 spyderlib\widgets\sourcecode\codeeditor.py:2195
+#: spyderlib\spyder.py:510 spyderlib\widgets\sourcecode\codeeditor.py:2195
 msgid "Redo"
 msgstr ""
 
-#: spyderlib\spyder.py:509 spyderlib\widgets\arrayeditor.py:325
+#: spyderlib\spyder.py:511 spyderlib\widgets\arrayeditor.py:325
 #: spyderlib\widgets\dicteditor.py:562 spyderlib\widgets\shell.py:118
 #: spyderlib\widgets\sourcecode\codeeditor.py:2201
 msgid "Copy"
 msgstr ""
 
-#: spyderlib\spyder.py:511 spyderlib\widgets\shell.py:114
+#: spyderlib\spyder.py:513 spyderlib\widgets\shell.py:114
 #: spyderlib\widgets\sourcecode\codeeditor.py:2198
 msgid "Cut"
 msgstr ""
 
-#: spyderlib\spyder.py:512 spyderlib\widgets\dicteditor.py:559
+#: spyderlib\spyder.py:514 spyderlib\widgets\dicteditor.py:559
 #: spyderlib\widgets\shell.py:122
 #: spyderlib\widgets\sourcecode\codeeditor.py:2204
 msgid "Paste"
 msgstr ""
 
-#: spyderlib\spyder.py:514 spyderlib\widgets\explorer.py:452
+#: spyderlib\spyder.py:516 spyderlib\widgets\explorer.py:452
 #: spyderlib\widgets\projectexplorer.py:1000 spyderlib\widgets\shell.py:131
 #: spyderlib\widgets\sourcecode\codeeditor.py:2207
 msgid "Delete"
 msgstr ""
 
-#: spyderlib\spyder.py:517 spyderlib\widgets\shell.py:135
+#: spyderlib\spyder.py:519 spyderlib\widgets\shell.py:135
 #: spyderlib\widgets\sourcecode\codeeditor.py:2211
 msgid "Select All"
 msgstr ""
 
-#: spyderlib\spyder.py:564
+#: spyderlib\spyder.py:567
 msgid "&Interpreters"
 msgstr ""
 
-#: spyderlib\spyder.py:570
+#: spyderlib\spyder.py:573
 msgid "&View"
 msgstr ""
 
-#: spyderlib\spyder.py:578
+#: spyderlib\spyder.py:581
 msgid "Welcome to Spyder!"
 msgstr ""
 
-#: spyderlib\spyder.py:582
+#: spyderlib\spyder.py:585
 msgid "Pre&ferences"
 msgstr ""
 
-#: spyderlib\spyder.py:588 spyderlib\widgets\pathmanager.py:44
+#: spyderlib\spyder.py:593 spyderlib\widgets\pathmanager.py:44
 #: spyderlib\widgets\projectexplorer.py:593
 msgid "PYTHONPATH manager"
 msgstr ""
 
-#: spyderlib\spyder.py:591
-msgid "Open Spyder path manager"
+#: spyderlib\spyder.py:596
+msgid "Python Path Manager"
 msgstr ""
 
-#: spyderlib\spyder.py:594
+#: spyderlib\spyder.py:599
 msgid "Update module names list"
 msgstr ""
 
-#: spyderlib\spyder.py:597
+#: spyderlib\spyder.py:602
 msgid "Refresh list of module names available in PYTHONPATH"
 msgstr ""
 
-#: spyderlib\spyder.py:603
+#: spyderlib\spyder.py:608
 msgid "Current user environment variables..."
 msgstr ""
 
-#: spyderlib\spyder.py:605
+#: spyderlib\spyder.py:610
 msgid "Show and edit current user environment variables in Windows registry (i.e. for all sessions)"
 msgstr ""
 
-#: spyderlib\spyder.py:612 spyderlib\spyder.py:983
+#: spyderlib\spyder.py:617 spyderlib\spyder.py:990
 msgid "External Tools"
 msgstr ""
 
-#: spyderlib\spyder.py:616
+#: spyderlib\spyder.py:621
 msgid "Python(x,y) launcher"
 msgstr ""
 
-#: spyderlib\spyder.py:627
+#: spyderlib\spyder.py:632
 msgid "WinPython control panel"
 msgstr ""
 
-#: spyderlib\spyder.py:640
+#: spyderlib\spyder.py:645
 msgid "Qt Designer"
 msgstr ""
 
-#: spyderlib\spyder.py:645
+#: spyderlib\spyder.py:650
 msgid "Qt Linguist"
 msgstr ""
 
-#: spyderlib\spyder.py:651
+#: spyderlib\spyder.py:656
 msgid "Qt examples"
 msgstr ""
 
-#: spyderlib\spyder.py:667
+#: spyderlib\spyder.py:672
 msgid "guidata examples"
 msgstr ""
 
-#: spyderlib\spyder.py:675
+#: spyderlib\spyder.py:680
 msgid "guiqwt examples"
 msgstr ""
 
-#: spyderlib\spyder.py:680
+#: spyderlib\spyder.py:685
 msgid "Sift"
 msgstr ""
 
-#: spyderlib\spyder.py:688
+#: spyderlib\spyder.py:693
 msgid "ViTables"
 msgstr ""
 
-#: spyderlib\spyder.py:702
+#: spyderlib\spyder.py:707
 msgid "Fullscreen mode"
 msgstr ""
 
-#: spyderlib\spyder.py:712
+#: spyderlib\spyder.py:719
 msgid "Main toolbar"
 msgstr ""
 
-#: spyderlib\spyder.py:729
+#: spyderlib\spyder.py:736
 msgid "Loading object inspector..."
 msgstr ""
 
-#: spyderlib\spyder.py:735
+#: spyderlib\spyder.py:742
 msgid "Loading outline explorer..."
 msgstr ""
 
-#: spyderlib\spyder.py:742
+#: spyderlib\spyder.py:749
 msgid "Loading editor..."
 msgstr ""
 
-#: spyderlib\spyder.py:764
+#: spyderlib\spyder.py:771
 msgid "Loading file explorer..."
 msgstr ""
 
-#: spyderlib\spyder.py:770
+#: spyderlib\spyder.py:777
 msgid "Loading history plugin..."
 msgstr ""
 
-#: spyderlib\spyder.py:776
+#: spyderlib\spyder.py:783
 msgid "Loading online help..."
 msgstr ""
 
-#: spyderlib\spyder.py:782
+#: spyderlib\spyder.py:789
 msgid "Loading project explorer..."
 msgstr ""
 
-#: spyderlib\spyder.py:792
+#: spyderlib\spyder.py:799
 msgid "Loading external console..."
 msgstr ""
 
-#: spyderlib\spyder.py:800
+#: spyderlib\spyder.py:807
 msgid "Loading namespace browser..."
 msgstr ""
 
-#: spyderlib\spyder.py:809
+#: spyderlib\spyder.py:816
 msgid "Loading IPython console..."
 msgstr ""
 
-#: spyderlib\spyder.py:820
+#: spyderlib\spyder.py:827
 msgid "Setting up main window..."
 msgstr ""
 
-#: spyderlib\spyder.py:824
+#: spyderlib\spyder.py:831
 msgid "About %s..."
 msgstr ""
 
-#: spyderlib\spyder.py:827
+#: spyderlib\spyder.py:834
 msgid "Optional dependencies..."
 msgstr ""
 
-#: spyderlib\spyder.py:831
+#: spyderlib\spyder.py:838
 msgid "Report issue..."
 msgstr ""
 
-#: spyderlib\spyder.py:852
+#: spyderlib\spyder.py:859
 msgid "Spyder documentation"
 msgstr ""
 
-#: spyderlib\spyder.py:858
+#: spyderlib\spyder.py:865
 msgid "Python documentation"
 msgstr ""
 
-#: spyderlib\spyder.py:864
+#: spyderlib\spyder.py:871
 msgid "Qt Assistant"
 msgstr ""
 
-#: spyderlib\spyder.py:898
+#: spyderlib\spyder.py:905
 msgid "Python(x,y) documentation folder"
 msgstr ""
 
-#: spyderlib\spyder.py:900
+#: spyderlib\spyder.py:907
 msgid "IPython documentation"
 msgstr ""
 
-#: spyderlib\spyder.py:902
+#: spyderlib\spyder.py:909
 msgid "guidata documentation"
 msgstr ""
 
-#: spyderlib\spyder.py:905
+#: spyderlib\spyder.py:912
 msgid "guiqwt documentation"
 msgstr ""
 
-#: spyderlib\spyder.py:911
+#: spyderlib\spyder.py:918
 msgid "NumPy documentation"
 msgstr ""
 
-#: spyderlib\spyder.py:913
+#: spyderlib\spyder.py:920
 msgid "NumPy reference guide"
 msgstr ""
 
-#: spyderlib\spyder.py:915
+#: spyderlib\spyder.py:922
 msgid "NumPy user guide"
 msgstr ""
 
-#: spyderlib\spyder.py:917
+#: spyderlib\spyder.py:924
 msgid "SciPy documentation"
 msgstr ""
 
-#: spyderlib\spyder.py:924
+#: spyderlib\spyder.py:931
 msgid "Web Resources"
 msgstr ""
 
-#: spyderlib\spyder.py:945
+#: spyderlib\spyder.py:952
 msgid "Windows and toolbars"
 msgstr ""
 
-#: spyderlib\spyder.py:949
+#: spyderlib\spyder.py:956
 msgid "Reset window layout"
 msgstr ""
 
-#: spyderlib\spyder.py:951
+#: spyderlib\spyder.py:958
 msgid "Custom window layouts"
 msgstr ""
 
-#: spyderlib\spyder.py:957
+#: spyderlib\spyder.py:964
 msgid "Switch to/from layout %d"
 msgstr ""
 
-#: spyderlib\spyder.py:963
+#: spyderlib\spyder.py:970
 msgid "Set layout %d"
 msgstr ""
 
-#: spyderlib\spyder.py:973
+#: spyderlib\spyder.py:980
 msgid "Attached console window (debugging)"
 msgstr ""
 
-#: spyderlib\spyder.py:1231
+#: spyderlib\spyder.py:1239
 msgid ""
 "Window layout will be reset to default settings: this affects window position, size and dockwidgets.\n"
 "Do you want to continue?"
 msgstr ""
 
-#: spyderlib\spyder.py:1249
+#: spyderlib\spyder.py:1257
 msgid "Quick switch layout #%d has not yet been defined."
 msgstr ""
 
-#: spyderlib\spyder.py:1440
+#: spyderlib\spyder.py:1448 spyderlib\spyder.py:1449
 msgid "Maximize current plugin"
 msgstr ""
 
-#: spyderlib\spyder.py:1441
-msgid "Maximize current plugin to fit the whole application window"
-msgstr ""
-
-#: spyderlib\spyder.py:1445
+#: spyderlib\spyder.py:1452
 msgid "Restore current plugin"
 msgstr ""
 
-#: spyderlib\spyder.py:1446
-msgid "Restore current plugin to its original size and position within the application window"
+#: spyderlib\spyder.py:1453
+msgid "Restore plugin to its original size"
 msgstr ""
 
-#: spyderlib\spyder.py:1518
+#: spyderlib\spyder.py:1524
 msgid "(not installed)"
 msgstr ""
 
-#: spyderlib\spyder.py:1536
+#: spyderlib\spyder.py:1542
 msgid "About %s"
 msgstr ""
 
-#: spyderlib\spyder.py:1697
+#: spyderlib\spyder.py:1703
 msgid "Running an external system terminal is not supported on platform %s."
 msgstr ""
 
-#: spyderlib\spyder.py:1894
+#: spyderlib\spyder.py:1900
 msgid "Open session"
 msgstr ""
 
-#: spyderlib\spyder.py:1895 spyderlib\spyder.py:1906
+#: spyderlib\spyder.py:1901 spyderlib\spyder.py:1912
 msgid "Spyder sessions"
 msgstr ""
 
-#: spyderlib\spyder.py:1905
+#: spyderlib\spyder.py:1911
 msgid "Save session"
 msgstr ""
 
@@ -2756,7 +2745,7 @@ msgstr ""
 
 #: spyderlib\widgets\arrayeditor.py:426 spyderlib\widgets\explorer.py:548
 #: spyderlib\widgets\explorer.py:645
-#: spyderlib\widgets\externalshell\pythonshell.py:521
+#: spyderlib\widgets\externalshell\pythonshell.py:520
 #: spyderlib\widgets\externalshell\systemshell.py:91
 msgid "Error"
 msgstr ""
@@ -2862,27 +2851,27 @@ msgid ""
 "then press enter to validate"
 msgstr ""
 
-#: spyderlib\widgets\dependencies.py:59
+#: spyderlib\widgets\dependencies.py:60
 msgid " Required "
 msgstr ""
 
-#: spyderlib\widgets\dependencies.py:59
+#: spyderlib\widgets\dependencies.py:60
 msgid "Module"
 msgstr ""
 
-#: spyderlib\widgets\dependencies.py:60
+#: spyderlib\widgets\dependencies.py:61
 msgid " Installed "
 msgstr ""
 
-#: spyderlib\widgets\dependencies.py:60
+#: spyderlib\widgets\dependencies.py:61
 msgid "Provided features"
 msgstr ""
 
-#: spyderlib\widgets\dependencies.py:126
+#: spyderlib\widgets\dependencies.py:127
 msgid "Optional Dependencies"
 msgstr ""
 
-#: spyderlib\widgets\dependencies.py:131
+#: spyderlib\widgets\dependencies.py:134
 msgid "Spyder depends on several Python modules to provide additional functionality for its plugins. The table below shows the required and installed versions (if any) of all of them.<br><br>Although Spyder can work without any of these modules, it's strongly recommended that at least you try to install <b>%s</b> and <b>%s</b> to have a much better experience."
 msgstr ""
 
@@ -3130,11 +3119,11 @@ msgstr ""
 msgid "<b>%s</b> contains mixed end-of-line characters.<br>Spyder will fix this automatically."
 msgstr ""
 
-#: spyderlib\widgets\editor.py:2249
+#: spyderlib\widgets\editor.py:2250
 msgid "Close window"
 msgstr ""
 
-#: spyderlib\widgets\editor.py:2251
+#: spyderlib\widgets\editor.py:2252
 msgid "Close this window"
 msgstr ""
 
@@ -3414,59 +3403,59 @@ msgstr ""
 msgid "<b>Unable to save current workspace</b><br><br>Error message:<br>%s"
 msgstr ""
 
-#: spyderlib\widgets\externalshell\pythonshell.py:265
+#: spyderlib\widgets\externalshell\pythonshell.py:268
 msgid "Variables"
 msgstr ""
 
-#: spyderlib\widgets\externalshell\pythonshell.py:266
+#: spyderlib\widgets\externalshell\pythonshell.py:269
 msgid "Show/hide global variables explorer"
 msgstr ""
 
-#: spyderlib\widgets\externalshell\pythonshell.py:270
+#: spyderlib\widgets\externalshell\pythonshell.py:273
 msgid "Terminate"
 msgstr ""
 
-#: spyderlib\widgets\externalshell\pythonshell.py:271
+#: spyderlib\widgets\externalshell\pythonshell.py:274
 msgid ""
 "Attempts to terminate the process.\n"
 "The process may not exit as a result of clicking this button\n"
 "(it is given the chance to prompt the user for any unsaved files, etc)."
 msgstr ""
 
-#: spyderlib\widgets\externalshell\pythonshell.py:283
+#: spyderlib\widgets\externalshell\pythonshell.py:286
 msgid "Interact"
 msgstr ""
 
-#: spyderlib\widgets\externalshell\pythonshell.py:285
+#: spyderlib\widgets\externalshell\pythonshell.py:288
 msgid "Debug"
 msgstr ""
 
-#: spyderlib\widgets\externalshell\pythonshell.py:287
-#: spyderlib\widgets\externalshell\pythonshell.py:350
+#: spyderlib\widgets\externalshell\pythonshell.py:290
+#: spyderlib\widgets\externalshell\pythonshell.py:353
 msgid "Arguments..."
 msgstr ""
 
-#: spyderlib\widgets\externalshell\pythonshell.py:294
+#: spyderlib\widgets\externalshell\pythonshell.py:297
 msgid "Set current working directory"
 msgstr ""
 
-#: spyderlib\widgets\externalshell\pythonshell.py:296
+#: spyderlib\widgets\externalshell\pythonshell.py:299
 msgid "Environment variables"
 msgstr ""
 
-#: spyderlib\widgets\externalshell\pythonshell.py:300
+#: spyderlib\widgets\externalshell\pythonshell.py:303
 msgid "Show sys.path contents"
 msgstr ""
 
-#: spyderlib\widgets\externalshell\pythonshell.py:346
+#: spyderlib\widgets\externalshell\pythonshell.py:349
 msgid "Arguments: %s"
 msgstr ""
 
-#: spyderlib\widgets\externalshell\pythonshell.py:348
+#: spyderlib\widgets\externalshell\pythonshell.py:351
 msgid "No argument"
 msgstr ""
 
-#: spyderlib\widgets\externalshell\pythonshell.py:522
+#: spyderlib\widgets\externalshell\pythonshell.py:521
 #: spyderlib\widgets\externalshell\systemshell.py:92
 msgid "Process failed to start"
 msgstr ""
diff --git a/spyderlib/plugins/editor.py b/spyderlib/plugins/editor.py
index 1ee6fbe..88d3fc8 100644
--- a/spyderlib/plugins/editor.py
+++ b/spyderlib/plugins/editor.py
@@ -27,12 +27,13 @@ import os.path as osp
 
 # Local imports
 from spyderlib.utils import encoding, sourcecode, codeanalysis
-from spyderlib.baseconfig import get_conf_path, _, STDOUT
+from spyderlib.baseconfig import get_conf_path, _
 from spyderlib.config import CONF, EDIT_FILTERS, get_filter, EDIT_FILETYPES
 from spyderlib.guiconfig import get_color_scheme
 from spyderlib.utils import programs
 from spyderlib.utils.qthelpers import (get_icon, create_action, add_actions,
-                                       get_std_icon, get_filetype_icon)
+                                       get_std_icon, get_filetype_icon,
+                                       add_shortcut_to_tooltip)
 from spyderlib.widgets.findreplace import FindReplace
 from spyderlib.widgets.status import (ReadWriteStatus, EOLStatus,
                                       EncodingStatus, CursorPositionStatus)
@@ -576,29 +577,43 @@ class Editor(SpyderPluginWidget):
                                default="Ctrl+Alt+P")
         self.addActions([self.toggle_outline_action, self.toggle_project_action])
         
+        # ---- File menu and toolbar ----
         self.new_action = create_action(self, _("&New file..."),
-                icon='filenew.png', tip=_("Create a new Python script"),
+                icon='filenew.png', tip=_("New file"),
                 triggered=self.new)
         self.register_shortcut(self.new_action, context="Editor",
                                name="New file", default="Ctrl+N")
+        add_shortcut_to_tooltip(self.new_action, context="Editor",
+                                name="New file")
+        
         self.open_action = create_action(self, _("&Open..."),
-                icon='fileopen.png', tip=_("Open text file"),
+                icon='fileopen.png', tip=_("Open file"),
                 triggered=self.load)
+        self.register_shortcut(self.open_action, context="Editor",
+                               name="Open file", default="Ctrl+O")
+        add_shortcut_to_tooltip(self.open_action, context="Editor",
+                                name="Open file")
+        
         self.revert_action = create_action(self, _("&Revert"),
                 icon='revert.png', tip=_("Revert file from disk"),
                 triggered=self.revert)
-        self.register_shortcut(self.open_action, context="Editor",
-                               name="Open file", default="Ctrl+O")
+        
         self.save_action = create_action(self, _("&Save"),
-                icon='filesave.png', tip=_("Save current file"),
+                icon='filesave.png', tip=_("Save file"),
                 triggered=self.save)
         self.register_shortcut(self.save_action, context="Editor",
                                name="Save file", default="Ctrl+S")
+        add_shortcut_to_tooltip(self.save_action, context="Editor",
+                                name="Save file")
+        
         self.save_all_action = create_action(self, _("Sav&e all"),
-                icon='save_all.png', tip=_("Save all opened files"),
+                icon='save_all.png', tip=_("Save all files"),
                 triggered=self.save_all)
         self.register_shortcut(self.save_all_action, context="Editor",
                                name="Save all", default="Ctrl+Shift+S")
+        add_shortcut_to_tooltip(self.save_all_action, context="Editor",
+                                name="Save all")
+        
         save_as_action = create_action(self, _("Save &as..."), None,
                 'filesaveas.png', _("Save current file as..."),
                 triggered=self.save_as)
@@ -619,7 +634,8 @@ class Editor(SpyderPluginWidget):
                 triggered=self.close_all_files)
         self.register_shortcut(self.close_all_action, context="Editor",
                                name="Close all", default="Ctrl+Shift+W")
-        
+
+        # ---- Debug menu ----
         set_clear_breakpoint_action = create_action(self,
                                     _("Set/Clear breakpoint"),
                                     icon=get_icon("breakpoint_big.png"),
@@ -642,6 +658,11 @@ class Editor(SpyderPluginWidget):
         add_actions(breakpoints_menu, (set_clear_breakpoint_action,
                                        set_cond_breakpoint_action, None,
                                        clear_all_breakpoints_action))
+        self.winpdb_action = create_action(self, _("Debug with winpdb"),
+                                           triggered=self.run_winpdb)
+        self.winpdb_action.setEnabled(WINPDB_PATH is not None)
+        self.register_shortcut(self.winpdb_action, context="Editor",
+                               name="Debug with winpdb", default="F7")
         
         # --- Debug toolbar ---
         debug_action = create_action(self, _("&Debug"), icon='debug.png',
@@ -649,34 +670,51 @@ class Editor(SpyderPluginWidget):
                                      triggered=self.debug_file)
         self.register_shortcut(debug_action, context="Editor",
                                name="Debug", default="Ctrl+F5")
+        add_shortcut_to_tooltip(debug_action, context="Editor", name="Debug")
+        
         debug_next_action = create_action(self, _("Step"), 
                icon='arrow-step-over.png', tip=_("Run current line"), 
                triggered=lambda: self.debug_command("next")) 
         self.register_shortcut(debug_next_action, "_",
                    "Debug Step Over", "Ctrl+F10")
+        add_shortcut_to_tooltip(debug_next_action, context="_",
+                                name="Debug Step Over")
+
         debug_continue_action = create_action(self, _("Continue"),
-               icon='arrow-continue.png', tip=_("Continue execution until\n"
+               icon='arrow-continue.png', tip=_("Continue execution until "
                                                 "next breakpoint"), 
                triggered=lambda: self.debug_command("continue"))                                                 
         self.register_shortcut(debug_continue_action, "_",
                    "Debug Continue", "Ctrl+F12")
+        add_shortcut_to_tooltip(debug_continue_action, context="_",
+                                name="Debug Continue")
+
         debug_step_action = create_action(self, _("Step Into"), 
-               icon='arrow-step-in.png', tip=_("Step into function, method\n"
-                                               "or class of current line"), 
+               icon='arrow-step-in.png', tip=_("Step into function or method "
+                                               "of current line"), 
                triggered=lambda: self.debug_command("step"))                
         self.register_shortcut(debug_step_action, "_",
-                   "Debug Step Into", "Ctrl+F11")                             
+                   "Debug Step Into", "Ctrl+F11")
+        add_shortcut_to_tooltip(debug_step_action, context="_",
+                                name="Debug Step Into")
+
         debug_return_action = create_action(self, _("Step Return"), 
-               icon='arrow-step-out.png', tip=_("Run until current function\n"
+               icon='arrow-step-out.png', tip=_("Run until current function "
                                                 "or method returns"), 
                triggered=lambda: self.debug_command("return"))               
         self.register_shortcut(debug_return_action, "_",
                    "Debug Step Return", "Ctrl+Shift+F11")
+        add_shortcut_to_tooltip(debug_return_action, context="_",
+                                name="Debug Step Return")
+
         debug_exit_action = create_action(self, _("Exit"),
                icon='stop_debug.png', tip=_("Exit Debug"), 
                triggered=lambda: self.debug_command("exit"))                                       
         self.register_shortcut(debug_exit_action, "_",
-                   "Debug Exit", "Ctrl+Shift+F12")        
+                   "Debug Exit", "Ctrl+Shift+F12")
+        add_shortcut_to_tooltip(debug_exit_action, context="_",
+                                name="Debug Exit")
+
         debug_control_menu_actions = [debug_next_action,
                                       debug_step_action,
                                       debug_return_action,
@@ -691,6 +729,8 @@ class Editor(SpyderPluginWidget):
                                    triggered=self.run_file)
         self.register_shortcut(run_action, context="Editor",
                                name="Run", default="F5")
+        add_shortcut_to_tooltip(run_action, context="Editor", name="Run")
+
         configure_action = create_action(self,
                                _("&Configure..."), icon='run_settings.png',
                                tip=_("Run settings"),
@@ -698,33 +738,38 @@ class Editor(SpyderPluginWidget):
                                triggered=self.edit_run_configurations)
         self.register_shortcut(configure_action, context="Editor",
                                name="Configure", default="F6")
+        add_shortcut_to_tooltip(configure_action, context="Editor",
+                                name="Configure")
+        
         re_run_action = create_action(self,
                             _("Re-run &last script"), icon='run_again.png',
                             tip=_("Run again last file"),
                             triggered=self.re_run_file)
         self.register_shortcut(re_run_action, context="Editor",
                                name="Re-run last script", default="Ctrl+F6")
-        
+        add_shortcut_to_tooltip(re_run_action, context="Editor",
+                                name="Re-run last script")
+
         run_selected_action = create_action(self, _("Run &selection"),
                                             icon='run_selection.png',
                                             tip=_("Run selection"),
                                             triggered=self.run_selection)
         self.register_shortcut(run_selected_action, context="Editor",
                                name="Run selection", default="F9")
+
         run_cell_action = create_action(self,
                             _("Run cell"), icon='run_cell.png',
                             shortcut=QKeySequence("Ctrl+Enter"),
-                            tip=_("Run current cell \n"\
-                                  "(see Editor documentation \n"\
-                                  "for more details on cells)"),
+                            tip=_("Run current cell (Ctrl+Enter)\n"
+                                  "[Use #%% to create cells]"),
                             triggered=self.run_cell)
+
         run_cell_advance_action = create_action(self,
                             _("Run cell and advance"),
                             icon='run_cell_advance.png',
                             shortcut=QKeySequence("Shift+Enter"),
-                            tip=_("Run current cell and go to the next one\n"\
-                                  "(see Editor documentation \n"\
-                                  "for more details on cells)"),
+                            tip=_("Run current cell and go to "
+                                  "the next one (Shift+Enter)"),
                             triggered=self.run_cell_and_advance)
         
         # --- Source code Toolbar ---
@@ -813,12 +858,6 @@ class Editor(SpyderPluginWidget):
                 triggered=self.unindent, context=Qt.WidgetShortcut)
         # ----------------------------------------------------------------------
         
-        self.winpdb_action = create_action(self, _("Debug with winpdb"),
-                                           triggered=self.run_winpdb)
-        self.winpdb_action.setEnabled(WINPDB_PATH is not None)
-        self.register_shortcut(self.winpdb_action, context="Editor",
-                               name="Debug with winpdb", default="F7")
-        
         self.win_eol_action = create_action(self,
                            _("Carriage return and line feed (Windows)"),
                            toggled=lambda: self.toggle_eol_chars('nt'))
@@ -890,22 +929,24 @@ class Editor(SpyderPluginWidget):
         self.main.search_menu_actions += self.search_menu_actions
         self.main.search_toolbar_actions += [gotoline_action]
           
-        # The breakpoints plugin is expecting that
-        # breakpoints_menu will be the first QMenu in run_menu_actions
-        # If breakpoints_menu must be moved below another QMenu in the list 
-        # please update the breakpoints plugin accordingly.         
-        run_menu_actions = [run_action, debug_action, configure_action,
-                            breakpoints_menu, debug_control_menu, None,
-                            re_run_action, run_selected_action,
-                            run_cell_action,
-                            run_cell_advance_action, None,
-                            self.winpdb_action]
+        # ---- Run menu/toolbar construction ----
+        run_menu_actions = [run_action, run_cell_action,
+                            run_cell_advance_action, None, run_selected_action,
+                            re_run_action, configure_action, None]
         self.main.run_menu_actions += run_menu_actions
         run_toolbar_actions = [run_action, run_cell_action,
                                run_cell_advance_action, re_run_action,
                                configure_action]
         self.main.run_toolbar_actions += run_toolbar_actions
         
+        # ---- Debug menu/toolbar construction ----
+        # The breakpoints plugin is expecting that
+        # breakpoints_menu will be the first QMenu in debug_menu_actions
+        # If breakpoints_menu must be moved below another QMenu in the list 
+        # please update the breakpoints plugin accordingly.  
+        debug_menu_actions = [debug_action, breakpoints_menu,
+                              debug_control_menu, None, self.winpdb_action]
+        self.main.debug_menu_actions += debug_menu_actions
         debug_toolbar_actions = [debug_action, debug_next_action,
                                  debug_step_action, debug_return_action,
                                  debug_continue_action, debug_exit_action]
@@ -938,10 +979,7 @@ class Editor(SpyderPluginWidget):
                  workdir_action, self.close_action, self.close_all_action,
                  self.toggle_comment_action, self.revert_action,
                  self.indent_action, self.unindent_action]
-        self.stack_menu_actions = [self.save_action, save_as_action,
-                                   self.print_action, None, run_action, debug_action,
-                                   configure_action, None, gotoline_action,
-                                   workdir_action, None, self.close_action]
+        self.stack_menu_actions = [gotoline_action, workdir_action]
         
         return self.file_dependent_actions
     
diff --git a/spyderlib/plugins/externalconsole.py b/spyderlib/plugins/externalconsole.py
index b14a141..5e3b682 100644
--- a/spyderlib/plugins/externalconsole.py
+++ b/spyderlib/plugins/externalconsole.py
@@ -927,14 +927,44 @@ class ExternalConsole(SpyderPluginWidget):
                              self.open_file_in_spyder)
             if fname is None:
                 if ipykernel:
-                    tab_name = _("Kernel")
-                    tab_icon1 = get_icon('ipython_console.png')
-                    tab_icon2 = get_icon('ipython_console_t.png')
-                    if ipyclient:
-                        self.connect(shellwidget,
-                                 SIGNAL('create_ipython_client(QString)'),
-                                 lambda cf: self.create_ipyclient(
-                                         cf, kernel_widget=shellwidget))
+                    # Detect if kernel and frontend match or not
+                    if self.get_option('pythonexecutable/custom', False):
+                        frontend_ver = programs.get_module_version('IPython')
+                        if '0.13' in frontend_ver:
+                            frontend_ver = '<1.0'
+                        else:
+                            frontend_ver = '>=1.0'
+                        pyexec = self.get_option('pythonexecutable')
+                        kernel_and_frontend_match = \
+                          programs.is_module_installed('IPython',
+                                                       version=frontend_ver,
+                                                       interpreter=pyexec)
+                    else:
+                        kernel_and_frontend_match = True
+                    
+                    # Create a a kernel tab only if frontend and kernel
+                    # versions match
+                    if kernel_and_frontend_match:
+                        tab_name = _("Kernel")
+                        tab_icon1 = get_icon('ipython_console.png')
+                        tab_icon2 = get_icon('ipython_console_t.png')
+                        if ipyclient:
+                            self.connect(shellwidget,
+                                     SIGNAL('create_ipython_client(QString)'),
+                                     lambda cf: self.create_ipyclient(
+                                             cf, kernel_widget=shellwidget))
+                    else:
+                        QMessageBox.critical(self,
+                                     _("Mismatch between kernel and frontend"),
+                                     _("Your IPython frontend and kernel "
+                                       "versions are <b>incompatible!!</b>"
+                                       "<br><br>"
+                                       "We're sorry but we can't create an "
+                                       "IPython console for you."
+                                      ), QMessageBox.Ok)
+                        shellwidget.deleteLater()
+                        shellwidget = None
+                        return
                 else:
                     self.python_count += 1
                     tab_name = "Python %d" % self.python_count
diff --git a/spyderlib/plugins/history.py b/spyderlib/plugins/history.py
index 8dfa400..7faf394 100644
--- a/spyderlib/plugins/history.py
+++ b/spyderlib/plugins/history.py
@@ -155,6 +155,10 @@ class HistoryLog(SpyderPluginWidget):
         self.menu_actions = [history_action, font_action, self.wrap_action]
         return self.menu_actions
     
+    def on_first_registration(self):
+        """Action to be performed on first plugin registration"""
+        self.main.tabify_plugins(self.main.extconsole, self)
+    
     def register_plugin(self):
         """Register plugin in Spyder's main window"""
         self.connect(self, SIGNAL('focus_changed()'),
diff --git a/spyderlib/plugins/inspector.py b/spyderlib/plugins/inspector.py
index 5157b46..bc8f872 100644
--- a/spyderlib/plugins/inspector.py
+++ b/spyderlib/plugins/inspector.py
@@ -19,7 +19,8 @@ import sys
 
 # Local imports
 from spyderlib import dependencies
-from spyderlib.baseconfig import get_conf_path, _, SUPPORTED_IPYTHON
+from spyderlib.baseconfig import (get_conf_path, _, SUPPORTED_IPYTHON,
+                                  IPYTHON_QT_MODULE)
 from spyderlib.config import CONF
 from spyderlib.guiconfig import get_color_scheme, get_font, set_font
 from spyderlib.utils import programs
@@ -32,9 +33,9 @@ from spyderlib.widgets.browser import WebView
 from spyderlib.widgets.externalshell.pythonshell import ExtPythonShellWidget
 from spyderlib.plugins import SpyderPluginWidget, PluginConfigPage
 
-#XXX: hardcoded dependency on optional IPython plugin component
+#XXX: Hardcoded dependency on optional IPython plugin component
 #     that requires the hack to make this work without IPython
-if programs.is_module_installed('IPython.frontend.qt', SUPPORTED_IPYTHON):
+if programs.is_module_installed(IPYTHON_QT_MODULE, SUPPORTED_IPYTHON):
     from spyderlib.widgets.ipython import IPythonControlWidget
 else:
     IPythonControlWidget = None  # analysis:ignore
diff --git a/spyderlib/plugins/ipythonconsole.py b/spyderlib/plugins/ipythonconsole.py
index 8b69c00..40313f7 100644
--- a/spyderlib/plugins/ipythonconsole.py
+++ b/spyderlib/plugins/ipythonconsole.py
@@ -28,9 +28,12 @@ import time
 
 from IPython.config.loader import Config, load_pyconfig_files
 from IPython.core.application import get_ipython_dir
-from IPython.frontend.qt.kernelmanager import QtKernelManager
-from IPython.lib.kernel import find_connection_file
-
+from IPython.lib.kernel import find_connection_file, get_connection_info
+try:
+    from IPython.qt.manager import QtKernelManager # 1.0
+except ImportError:
+    from IPython.frontend.qt.kernelmanager import QtKernelManager # 0.13
+    
 # Local imports
 from spyderlib import dependencies
 from spyderlib.baseconfig import get_conf_path, _
@@ -112,9 +115,10 @@ class IPythonConsoleConfigPage(PluginConfigPage):
         
         # --- Graphics ---
         # Pylab Group
-        pylab_group = QGroupBox(_("Support for graphics (Pylab)"))
+        pylab_group = QGroupBox(_("Support for graphics (Matplotlib)"))
         pylab_box = newcb(_("Activate support"), 'pylab')
-        autoload_pylab_box = newcb(_("Automatically load Pylab and NumPy"),
+        autoload_pylab_box = newcb(_("Automatically load Pylab and NumPy "
+                                     "modules"),
                                'pylab/autoload',
                                tip=_("This lets you load graphics support "
                                      "without importing \nthe commands to do "
@@ -611,8 +615,12 @@ class IPythonClient(QWidget, SaveHistoryMixin):
     def closeEvent(self, event):
         """Reimplement Qt method to stop sending the custom_restart_kernel_died
         signal"""
-        self.ipywidget.custom_restart = False
-            
+        if programs.is_module_installed('IPython', '>=1.0'):
+            kc = self.ipywidget.kernel_client
+            kc.hb_channel.pause()
+        else:
+            self.ipywidget.custom_restart = False
+
 
 class IPythonConsole(SpyderPluginWidget):
     """
@@ -816,22 +824,46 @@ class IPythonConsole(SpyderPluginWidget):
         font = self.get_plugin_font()
         for client in self.clients:
             client.set_font(font)
+    
+    def kernel_and_frontend_match(self, connection_file):
+        # Determine kernel version
+        ci = get_connection_info(connection_file, unpack=True)
+        if ci.has_key(u'control_port'):
+            kernel_ver = '>=1.0'
+        else:
+            kernel_ver = '<1.0'
+        # is_module_installed checks if frontend version agrees with the
+        # kernel one
+        return programs.is_module_installed('IPython', version=kernel_ver)
 
-    def create_kernel_manager(self, connection_file=None):
-        """Create a kernel manager"""
+    def create_kernel_manager_and_client(self, connection_file=None):
+        """Create kernel manager and client"""
         cf = find_connection_file(connection_file, profile='default')
+        if not self.kernel_and_frontend_match(cf):
+            return None, None
         kernel_manager = QtKernelManager(connection_file=cf, config=None)
-        kernel_manager.load_connection_file()
-        kernel_manager.start_channels()
-        return kernel_manager
+        if programs.is_module_installed('IPython', '>=1.0'):
+            kernel_client = kernel_manager.client()
+            kernel_client.load_connection_file()
+            kernel_client.start_channels()
+            # To rely on kernel's heartbeat to know when a kernel has died
+            kernel_client.hb_channel.unpause()
+        else:
+            kernel_client = None
+            kernel_manager.load_connection_file()
+            kernel_manager.start_channels()
+        return kernel_manager, kernel_client
 
     def new_ipywidget(self, connection_file=None, config=None):
         """
         Create and return a new IPyhon widget from a connection file basename
         """
-        kernel_manager = self.create_kernel_manager(connection_file)
+        km, kc = self.create_kernel_manager_and_client(connection_file)
+        if (km, kc) == (None, None):
+            return None
         widget = SpyderIPythonWidget(config=config, local_kernel=False)
-        widget.kernel_manager = kernel_manager
+        widget.kernel_manager = km
+        widget.kernel_client = kc
         return widget
     
     #------ Public API --------------------------------------------------------
@@ -966,6 +998,16 @@ class IPythonConsole(SpyderPluginWidget):
 
         ipywidget = self.new_ipywidget(connection_file,
                                                 config=self.ipywidget_config())
+        if ipywidget is None:
+            QMessageBox.critical(self,
+                                 _("Mismatch between kernel and frontend"),
+                                 _("Your IPython frontend and kernel versions "
+                                   "are <b>incompatible!!</b>"
+                                   "<br><br>"
+                                   "We're sorry but we can't create an IPython "
+                                   "console for you."
+                                ), QMessageBox.Ok)
+            return
 
         client = IPythonClient(self, connection_file, kernel_widget_id,
                                client_name, ipywidget,
@@ -1165,8 +1207,9 @@ class IPythonConsole(SpyderPluginWidget):
         self.extconsole.set_ipykernel_attrs(connection_file, kernel_widget)
         
         # Connect client to new kernel
-        kernel_manager = self.create_kernel_manager(connection_file)        
-        client.ipywidget.kernel_manager = kernel_manager
+        km, kc = self.create_kernel_manager_and_client(connection_file)        
+        client.ipywidget.kernel_manager = km
+        client.ipywidget.kernel_client = kc
         client.kernel_widget_id = id(kernel_widget)
         client.get_control().setFocus()
         
diff --git a/spyderlib/spyder.py b/spyderlib/spyder.py
index 859fec0..b1b2489 100644
--- a/spyderlib/spyder.py
+++ b/spyderlib/spyder.py
@@ -31,11 +31,11 @@ ORIGINAL_SYS_EXIT = sys.exit
 
 # Test if IPython v0.13+ is installed to eventually switch to PyQt API #2
 from spyderlib.utils.programs import is_module_installed
-from spyderlib.baseconfig import SUPPORTED_IPYTHON, _
+from spyderlib.baseconfig import IPYTHON_QT_MODULE, SUPPORTED_IPYTHON, _
 from spyderlib import dependencies
 dependencies.add("IPython", _("IPython Console integration"),
                  required_version=SUPPORTED_IPYTHON)
-if is_module_installed('IPython.frontend.qt', SUPPORTED_IPYTHON):
+if is_module_installed(IPYTHON_QT_MODULE, SUPPORTED_IPYTHON):
     # Importing IPython will eventually set the QT_API environment variable
     import IPython  # analysis:ignore
     if os.environ.get('QT_API', 'pyqt') == 'pyqt':
@@ -109,7 +109,7 @@ except ImportError:
     OnlineHelp = None  # analysis:ignore
 from spyderlib.plugins.explorer import Explorer
 from spyderlib.plugins.externalconsole import ExternalConsole
-if is_module_installed('IPython.frontend.qt', SUPPORTED_IPYTHON):
+if is_module_installed(IPYTHON_QT_MODULE, SUPPORTED_IPYTHON):
     # TODO: add ability for plugins to disable themself if their
     #       requirements are not met before failing during import
     from spyderlib.plugins.ipythonconsole import IPythonConsole
@@ -118,7 +118,7 @@ from spyderlib.plugins.findinfiles import FindInFiles
 from spyderlib.plugins.projectexplorer import ProjectExplorer
 from spyderlib.plugins.outlineexplorer import OutlineExplorer
 from spyderlib.utils.qthelpers import (create_action, add_actions, get_icon,
-                                       get_std_icon,
+                                       get_std_icon, add_shortcut_to_tooltip,
                                        create_module_bookmark_actions,
                                        create_bookmark_action,
                                        create_program_action, DialogManager,
@@ -126,8 +126,8 @@ from spyderlib.utils.qthelpers import (create_action, add_actions, get_icon,
                                        create_python_script_action, file_uri)
 from spyderlib.baseconfig import (get_conf_path, _, get_module_data_path,
                                   get_module_source_path, STDOUT, STDERR,
-                                  DEBUG, get_image_path)
-from spyderlib.config import CONF, DEV, EDIT_EXT, IMPORT_EXT, OPEN_FILES_PORT
+                                  DEBUG, get_image_path, DEV)
+from spyderlib.config import CONF, EDIT_EXT, IMPORT_EXT, OPEN_FILES_PORT
 from spyderlib.guiconfig import get_shortcut, remove_deprecated_shortcuts
 from spyderlib.otherplugins import get_spyderplugins_mods
 from spyderlib.utils.iofuncs import load_session, save_session, reset_session
@@ -349,6 +349,8 @@ class MainWindow(QMainWindow):
         self.source_menu_actions = []
         self.run_menu = None
         self.run_menu_actions = []
+        self.debug_menu = None
+        self.debug_menu_actions = []
         self.interact_menu = None
         self.interact_menu_actions = []
         self.tools_menu = None
@@ -556,9 +558,10 @@ class MainWindow(QMainWindow):
             self.run_toolbar = self.create_toolbar(_("Run toolbar"),
                                                    "run_toolbar")
             
-            # Debug toolbar                                       
+            # Debug menu/toolbar
+            self.debug_menu = self.menuBar().addMenu(_("&Debug"))
             self.debug_toolbar = self.create_toolbar(_("Debug toolbar"),
-                                                   "debug_toolbar")
+                                                     "debug_toolbar")
                                                   
             # Interact menu/toolbar
             self.interact_menu = self.menuBar().addMenu(_("&Interpreters"))
@@ -584,11 +587,13 @@ class MainWindow(QMainWindow):
                                          triggered=self.edit_preferences)
             self.register_shortcut(prefs_action, "_", "Preferences",
                                    "Ctrl+Alt+Shift+P")
+            add_shortcut_to_tooltip(prefs_action, context="_",
+                                    name="Preferences")
             spyder_path_action = create_action(self,
                                     _("PYTHONPATH manager"),
                                     None, 'pythonpath_mgr.png',
                                     triggered=self.path_manager_callback,
-                                    tip=_("Open Spyder path manager"),
+                                    tip=_("Python Path Manager"),
                                     menurole=QAction.ApplicationSpecificRole)
             update_modules_action = create_action(self,
                                         _("Update module names list"),
@@ -692,7 +697,7 @@ class MainWindow(QMainWindow):
             
             # Maximize current plugin
             self.maximize_action = create_action(self, '',
-                                             triggered=self.maximize_dockwidget)
+                                            triggered=self.maximize_dockwidget)
             self.register_shortcut(self.maximize_action, "_",
                                    "Maximize dockwidget", "Ctrl+Alt+Shift+M")
             self.__update_maximize_action()
@@ -703,6 +708,8 @@ class MainWindow(QMainWindow):
                                             triggered=self.toggle_fullscreen)
             self.register_shortcut(self.fullscreen_action, "_",
                                    "Fullscreen mode", "F11")
+            add_shortcut_to_tooltip(self.fullscreen_action, context="_",
+                                    name="Fullscreen mode")
             
             # Main toolbar
             self.main_toolbar_actions = [self.maximize_action,
@@ -805,7 +812,7 @@ class MainWindow(QMainWindow):
         #XXX: we need to think of what to do with the light mode...
         #     ---> but for now, simply hiding the dockwidget like in standard 
         #          mode should be sufficient
-        if is_module_installed('IPython.frontend.qt', SUPPORTED_IPYTHON):
+        if is_module_installed(IPYTHON_QT_MODULE, SUPPORTED_IPYTHON):
             self.set_splash(_("Loading IPython console..."))
             self.ipyconsole = IPythonConsole(self)
             self.ipyconsole.register_plugin()
@@ -997,6 +1004,7 @@ class MainWindow(QMainWindow):
             add_actions(self.search_menu, self.search_menu_actions)
             add_actions(self.source_menu, self.source_menu_actions)
             add_actions(self.run_menu, self.run_menu_actions)
+            add_actions(self.debug_menu, self.debug_menu_actions)
             add_actions(self.interact_menu, self.interact_menu_actions)
             add_actions(self.tools_menu, self.tools_menu_actions)
             add_actions(self.external_tools_menu,
@@ -1438,13 +1446,11 @@ class MainWindow(QMainWindow):
     def __update_maximize_action(self):
         if self.state_before_maximizing is None:
             text = _("Maximize current plugin")
-            tip = _("Maximize current plugin to fit the whole "
-                    "application window")
+            tip = _("Maximize current plugin")
             icon = "maximize.png"
         else:
             text = _("Restore current plugin")
-            tip = _("Restore current plugin to its original size and "
-                    "position within the application window")
+            tip = _("Restore plugin to its original size")
             icon = "unmaximize.png"
         self.maximize_action.setText(text)
         self.maximize_action.setIcon(get_icon(icon))
diff --git a/spyderlib/utils/codeanalysis.py b/spyderlib/utils/codeanalysis.py
index a5ad51c..ab29b31 100644
--- a/spyderlib/utils/codeanalysis.py
+++ b/spyderlib/utils/codeanalysis.py
@@ -71,8 +71,8 @@ def check_with_pyflakes(source_code, filename=None):
         return results
 
 # Required versions
-# Why 0.5.0? Because it's based on _ast (thread-safe)
-PYFLAKES_REQVER = '0.5.0'
+# Why >=0.5.0? Because it's based on _ast (thread-safe)
+PYFLAKES_REQVER = '>=0.5.0'
 dependencies.add("pyflakes", _("Real-time code analysis on the Editor"),
                  required_version=PYFLAKES_REQVER)
 
@@ -83,7 +83,7 @@ dependencies.add("pep8", _("Real-time code style analysis on the Editor"),
 
 def is_pyflakes_installed():
     """Return True if pyflakes required version is installed"""
-    return programs.is_module_installed('pyflakes', '>='+PYFLAKES_REQVER)
+    return programs.is_module_installed('pyflakes', PYFLAKES_REQVER)
 
 
 def get_checker_executable(name):
diff --git a/spyderlib/utils/programs.py b/spyderlib/utils/programs.py
index 383baea..eae6850 100644
--- a/spyderlib/utils/programs.py
+++ b/spyderlib/utils/programs.py
@@ -18,8 +18,14 @@ import subprocess
 import sys
 import tempfile
 
+from spyderlib.utils import encoding
 
-TEMPDIR = tempfile.gettempdir() + osp.sep + 'spyder'
+
+if os.name == 'nt':
+    TEMPDIR = tempfile.gettempdir() + osp.sep + 'spyder'
+else:
+    username = encoding.to_unicode_from_fs(os.environ.get('USER'))
+    TEMPDIR = tempfile.gettempdir() + osp.sep + 'spyder-' + username
 
 
 def is_program_installed(basename):
diff --git a/spyderlib/utils/qthelpers.py b/spyderlib/utils/qthelpers.py
index cb6679b..460e401 100644
--- a/spyderlib/utils/qthelpers.py
+++ b/spyderlib/utils/qthelpers.py
@@ -21,6 +21,7 @@ import sys
 
 # Local import
 from spyderlib.baseconfig import get_image_path
+from spyderlib.guiconfig import get_shortcut
 from spyderlib.utils import programs
 
 # Note: How to redirect a signal from widget *a* to widget *b* ?
@@ -262,6 +263,12 @@ def create_action(parent, text, shortcut=None, icon=None, tip=None,
     return action
 
 
+def add_shortcut_to_tooltip(action, context, name):
+    """Add the shortcut associated with a given action to its tooltip"""
+    action.setToolTip(action.toolTip() + ' (%s)' %
+                      get_shortcut(context=context, name=name))
+
+
 def add_actions(target, actions, insert_before=None):
     """Add actions to a menu"""
     previous_action = None
diff --git a/spyderlib/widgets/externalshell/pythonshell.py b/spyderlib/widgets/externalshell/pythonshell.py
index b001d66..ae9d90b 100644
--- a/spyderlib/widgets/externalshell/pythonshell.py
+++ b/spyderlib/widgets/externalshell/pythonshell.py
@@ -204,7 +204,10 @@ class ExternalPythonShell(ExternalShellBase):
                                    menu_actions=menu_actions,
                                    show_buttons_inside=show_buttons_inside,
                                    show_elapsed_time=show_elapsed_time)
-        
+
+        if self.pythonexecutable is None:
+            self.pythonexecutable = get_python_executable()
+
         self.python_args = None
         if python_args:
             assert isinstance(python_args, basestring)
@@ -489,10 +492,6 @@ The process may not exit as a result of clicking this button
                      self.process.kill)
         
         #-------------------------Python specific-------------------------------
-        executable = self.pythonexecutable
-        if executable is None:
-            executable = get_python_executable()
-        
         # Fixes for our Mac app:
         # 1. PYTHONPATH and PYTHONHOME are set while bootstrapping the app,
         #    but their values are messing sys.path for external interpreters
@@ -502,8 +501,8 @@ The process may not exit as a result of clicking this button
         # 3. Remove PYTHONOPTIMIZE from env so that we can have assert
         #    statements working with our interpreters (See Issue 1281)
         if sys.platform == 'darwin' and 'Spyder.app' in __file__:
-            env.append('SPYDER_INTERPRETER=%s' % executable)
-            if 'Spyder.app' not in executable:
+            env.append('SPYDER_INTERPRETER=%s' % self.pythonexecutable)
+            if 'Spyder.app' not in self.pythonexecutable:
                 env = [p for p in env if not (p.startswith('PYTHONPATH') or \
                                               p.startswith('PYTHONHOME'))] # 1.
 
@@ -512,7 +511,7 @@ The process may not exit as a result of clicking this button
             env = [p for p in env if not p.startswith('PYTHONOPTIMIZE')]   # 3.
 
         self.process.setEnvironment(env)
-        self.process.start(executable, p_args)
+        self.process.start(self.pythonexecutable, p_args)
         #-------------------------Python specific-------------------------------
             
         running = self.process.waitForStarted()
diff --git a/spyderlib/widgets/externalshell/sitecustomize.py b/spyderlib/widgets/externalshell/sitecustomize.py
index 35358fc..d756dff 100644
--- a/spyderlib/widgets/externalshell/sitecustomize.py
+++ b/spyderlib/widgets/externalshell/sitecustomize.py
@@ -121,9 +121,11 @@ if mpl_backend:
     try:
         import matplotlib
         if os.environ.get('QT_API') == 'pyside':
-            # Just for precaution, since mpl is not working with PySide
-            # inside Qt apps, because of its lack of an input hook
-            matplotlib.rcParams['backend.qt4'] = 'PySide'
+            # Try to address PySide lack of an input hook on Mac by settting
+            # mpl_backend to always be MacOSX
+            # Fixes Issue 347
+            if mpl_backend == 'Qt4Agg' and sys.platform == 'darwin':
+                mpl_backend = 'MacOSX'
         matplotlib.rcParams['docstring.hardcopy'] = True
         matplotlib.use(mpl_backend)
     except ImportError:
diff --git a/spyderlib/widgets/externalshell/start_ipython_kernel.py b/spyderlib/widgets/externalshell/start_ipython_kernel.py
index 5287f3b..d1a2782 100644
--- a/spyderlib/widgets/externalshell/start_ipython_kernel.py
+++ b/spyderlib/widgets/externalshell/start_ipython_kernel.py
@@ -11,10 +11,16 @@ import sys
 import os.path as osp
 
 
-def sympy_config(version):
+def sympy_config():
     """Sympy configuration"""
+    from spyderlib.utils.programs import is_module_installed
     
-    lines = """
+    lines_new = """
+from sympy.interactive import init_session
+init_session()
+"""
+    
+    lines_old = """
 from __future__ import division
 from sympy import *
 x, y, z, t = symbols('x y z t')
@@ -22,12 +28,17 @@ k, m, n = symbols('k m n', integer=True)
 f, g, h = symbols('f g h', cls=Function)
 """
     
-    if version >= '0.7.2':
+    if is_module_installed('sympy', '>=0.7.3'):
+        extension = None
+        return lines_new, extension
+    elif is_module_installed('sympy', '=0.7.2'):
         extension = 'sympy.interactive.ipythonprinting'
-    else:
+        return lines_old, extension
+    elif is_module_installed('sympy', '>=0.7.0;<0.7.2'):
         extension = 'sympyprinting'
-    
-    return lines, extension
+        return lines_old, extension
+    else:
+        return None, None
 
 
 def kernel_config():
@@ -35,6 +46,7 @@ def kernel_config():
     from IPython.config.loader import Config, load_pyconfig_files
     from IPython.core.application import get_ipython_dir
     from spyderlib.config import CONF
+    from spyderlib.utils.programs import is_module_installed
     
     # ---- IPython config ----
     try:
@@ -52,20 +64,20 @@ def kernel_config():
     # http://code.google.com/p/spyderlib/issues/detail?id=1052
     spy_cfg.InteractiveShell.xmode = 'Plain'
     
-    # Pylab activation option
+    # Pylab configuration
+    mpl_installed = is_module_installed('matplotlib')
     pylab_o = CONF.get('ipython_console', 'pylab')
     
-    # Automatically load Pylab and Numpy
-    autoload_pylab_o = CONF.get('ipython_console', 'pylab/autoload')
-    spy_cfg.IPKernelApp.pylab_import_all = pylab_o and autoload_pylab_o
-    
-    # Pylab backend configuration
-    if pylab_o:
+    if mpl_installed and pylab_o:
         backend_o = CONF.get('ipython_console', 'pylab/backend', 0)
         backends = {0: 'inline', 1: 'auto', 2: 'qt', 3: 'osx', 4: 'gtk',
                     5: 'wx', 6: 'tk'}
         spy_cfg.IPKernelApp.pylab = backends[backend_o]
         
+        # Automatically load Pylab and Numpy
+        autoload_pylab_o = CONF.get('ipython_console', 'pylab/autoload')
+        spy_cfg.IPKernelApp.pylab_import_all = autoload_pylab_o
+        
         # Inline backend configuration
         if backends[backend_o] == 'inline':
            # Figure format
@@ -112,17 +124,15 @@ def kernel_config():
     # Sympy loading
     sympy_o = CONF.get('ipython_console', 'symbolic_math')
     if sympy_o:
-        try:
-            from sympy import __version__ as version
-            lines, extension = sympy_config(version)
+        lines, extension = sympy_config()
+        if lines is not None:
             if run_lines_o:
                 spy_cfg.IPKernelApp.exec_lines.append(lines)
             else:
                 spy_cfg.IPKernelApp.exec_lines = [lines]
-            spy_cfg.IPKernelApp.extra_extension = extension
-            spy_cfg.LaTeXTool.backends = ['dvipng', 'matplotlib']
-        except ImportError:
-            pass
+            if extension:
+                spy_cfg.IPKernelApp.extra_extension = extension
+                spy_cfg.LaTeXTool.backends = ['dvipng', 'matplotlib']
     
     # Merge IPython and Spyder configs. Spyder prefs will have prevalence
     # over IPython ones
@@ -133,8 +143,9 @@ def kernel_config():
 def set_edit_magic(shell):
     """Use %edit to open files in Spyder"""
     from spyderlib.utils import programs
+    from spyderlib.baseconfig import IPYTHON_QT_MODULE, SUPPORTED_IPYTHON
     
-    if programs.is_module_installed('IPython.frontend.qt', '>=0.13'):
+    if programs.is_module_installed(IPYTHON_QT_MODULE, SUPPORTED_IPYTHON):
         # For some users, trying to replace %edit with open_in_spyder could
         # give a crash when starting a kernel. I've seen it after updating
         # from 2.1
@@ -165,10 +176,10 @@ sys.path.insert(0, '')
 
 # Fire up the kernel instance.
 try:
-    from IPython.zmq.ipkernel import IPKernelApp  # 0.13
+    from IPython.kernel.zmq.kernelapp import IPKernelApp  # 1.0
 except ImportError:
-    from IPython.kernel.zmq.kernelapp import IPKernelApp  # 0.14
-
+    from IPython.zmq.ipkernel import IPKernelApp  # 0.13  (analysis:ignore)
+    
 ipk_temp = IPKernelApp.instance()
 ipk_temp.config = kernel_config()
 ipk_temp.initialize()
diff --git a/spyderlib/widgets/ipython.py b/spyderlib/widgets/ipython.py
index 8bd6e2e..8585065 100644
--- a/spyderlib/widgets/ipython.py
+++ b/spyderlib/widgets/ipython.py
@@ -9,7 +9,10 @@ IPython v0.13+ client's widget
 """
 
 # IPython imports
-from IPython.frontend.qt.console.rich_ipython_widget import RichIPythonWidget
+try:  # 1.0
+    from IPython.qt.console.rich_ipython_widget import RichIPythonWidget
+except ImportError: # 0.13
+    from IPython.frontend.qt.console.rich_ipython_widget import RichIPythonWidget
 
 # Qt imports
 from spyderlib.qt.QtGui import QTextEdit, QKeySequence, QShortcut
@@ -18,6 +21,7 @@ from spyderlib.utils.qthelpers import restore_keyevent
 
 # Local imports
 from spyderlib.config import CONF
+from spyderlib.utils import programs
 from spyderlib.widgets.mixins import (BaseEditMixin, InspectObjectMixin,
                                       TracebackLinksMixin)
 
@@ -153,7 +157,9 @@ class SpyderIPythonWidget(RichIPythonWidget):
         banner = default_gui_banner
         
         pylab_o = CONF.get('ipython_console', 'pylab', True)
-        if pylab_o:
+        autoload_pylab_o = CONF.get('ipython_console', 'pylab/autoload', True)
+        mpl_installed = programs.is_module_installed('matplotlib')
+        if mpl_installed and (pylab_o and autoload_pylab_o):
             backend_o = CONF.get('ipython_console', 'pylab/backend', 0)
             backends = {0: 'module://IPython.zmq.pylab.backend_inline',
                         1: 'Qt4Agg', 2: 'Qt4Agg', 3: 'MacOSX', 4: 'GTKAgg',
@@ -167,11 +173,11 @@ For more information, type 'help(pylab)'.\n""" % backends[backend_o]
         if sympy_o:
             lines = """
 These commands were executed:
-from __future__ import division
-from sympy import *
-x, y, z, t = symbols('x y z t')
-k, m, n = symbols('k m n', integer=True)
-f, g, h = symbols('f g h', cls=Function)
+>>> from __future__ import division
+>>> from sympy import *
+>>> x, y, z, t = symbols('x y z t')
+>>> k, m, n = symbols('k m n', integer=True)
+>>> f, g, h = symbols('f g h', cls=Function)
 """
             banner = banner + lines
         return banner
@@ -185,7 +191,10 @@ f, g, h = symbols('f g h', cls=Function)
         but only if the kernel is currently looking for raw input.
         """
         if self._reading:
-            self.kernel_manager.stdin_channel.input(line)
+            if programs.is_module_installed('IPython', '>=1.0'):
+                self.kernel_client.stdin_channel.input(line)
+            else:
+                self.kernel_manager.stdin_channel.input(line)
 
     #---- IPython private methods ---------------------------------------------
     def _context_menu_make(self, pos):
diff --git a/spyderlib/widgets/projectexplorer.py b/spyderlib/widgets/projectexplorer.py
index 2dfd61d..76a5bbb 100644
--- a/spyderlib/widgets/projectexplorer.py
+++ b/spyderlib/widgets/projectexplorer.py
@@ -123,7 +123,7 @@ class Project(object):
             # Old format (Spyder 2.0-2.1 for Python 2)
             with open(fname, 'U') as fdesc:
                 data = cPickle.loads(fdesc.read())
-        except cPickle.PickleError:
+        except TypeError, cPickle.PickleError:
             try:
                 # New format (Spyder >=2.2 for Python 2 and Python 3)
                 with open(fname, 'rb') as fdesc:
diff --git a/spyderlib/windows/spyder.ico b/spyderlib/windows/spyder.ico
deleted file mode 100644
index 05d7007..0000000
Binary files a/spyderlib/windows/spyder.ico and /dev/null differ
diff --git a/spyderlib/windows/spyder_light.ico b/spyderlib/windows/spyder_light.ico
deleted file mode 100644
index 960a66d..0000000
Binary files a/spyderlib/windows/spyder_light.ico and /dev/null differ
diff --git a/spyderplugins/locale/es/LC_MESSAGES/p_breakpoints.mo b/spyderplugins/locale/es/LC_MESSAGES/p_breakpoints.mo
index 58b551d..4193606 100644
Binary files a/spyderplugins/locale/es/LC_MESSAGES/p_breakpoints.mo and b/spyderplugins/locale/es/LC_MESSAGES/p_breakpoints.mo differ
diff --git a/spyderplugins/locale/es/LC_MESSAGES/p_profiler.mo b/spyderplugins/locale/es/LC_MESSAGES/p_profiler.mo
index 653783c..8c1e28b 100644
Binary files a/spyderplugins/locale/es/LC_MESSAGES/p_profiler.mo and b/spyderplugins/locale/es/LC_MESSAGES/p_profiler.mo differ
diff --git a/spyderplugins/locale/es/LC_MESSAGES/p_pylint.mo b/spyderplugins/locale/es/LC_MESSAGES/p_pylint.mo
index f2c2736..e65141d 100644
Binary files a/spyderplugins/locale/es/LC_MESSAGES/p_pylint.mo and b/spyderplugins/locale/es/LC_MESSAGES/p_pylint.mo differ
diff --git a/spyderplugins/locale/fr/LC_MESSAGES/p_breakpoints.mo b/spyderplugins/locale/fr/LC_MESSAGES/p_breakpoints.mo
index cdd499e..e7b5e47 100644
Binary files a/spyderplugins/locale/fr/LC_MESSAGES/p_breakpoints.mo and b/spyderplugins/locale/fr/LC_MESSAGES/p_breakpoints.mo differ
diff --git a/spyderplugins/locale/fr/LC_MESSAGES/p_profiler.mo b/spyderplugins/locale/fr/LC_MESSAGES/p_profiler.mo
index 1edae40..8d4f720 100644
Binary files a/spyderplugins/locale/fr/LC_MESSAGES/p_profiler.mo and b/spyderplugins/locale/fr/LC_MESSAGES/p_profiler.mo differ
diff --git a/spyderplugins/locale/fr/LC_MESSAGES/p_pylint.mo b/spyderplugins/locale/fr/LC_MESSAGES/p_pylint.mo
index a96d46b..cfe4efb 100644
Binary files a/spyderplugins/locale/fr/LC_MESSAGES/p_pylint.mo and b/spyderplugins/locale/fr/LC_MESSAGES/p_pylint.mo differ
diff --git a/spyderplugins/p_breakpoints.py b/spyderplugins/p_breakpoints.py
index 84c1e72..bc8bff7 100644
--- a/spyderplugins/p_breakpoints.py
+++ b/spyderplugins/p_breakpoints.py
@@ -82,7 +82,7 @@ class Breakpoints(BreakpointWidget, SpyderPluginMixin):
         
         # A fancy way to insert the action into the Breakpoints menu under
         # the assumption that Breakpoints is the first QMenu in the list.
-        for item in self.main.run_menu_actions:
+        for item in self.main.debug_menu_actions:
             try:
                 menu_title = item.title()
             except AttributeError:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/spyder.git



More information about the debian-science-commits mailing list